diff --git a/0.73_My_PuTTY/config.c b/0.73_My_PuTTY/config.c index d993738..afbad6a 100644 --- a/0.73_My_PuTTY/config.c +++ b/0.73_My_PuTTY/config.c @@ -2693,7 +2693,11 @@ s = ctrl_getset(b, "Terminal/Bell", "overload", ctrl_checkbox(s, "Disable bidirectional text display", 'd', HELPCTX(features_bidi), conf_checkbox_handler, I(CONF_no_bidi)); - +#ifdef MOD_PERSO + ctrl_checkbox(s, "Disable focus reporting", + NO_SHORTCUT, HELPCTX(no_help), conf_checkbox_handler, + I(CONF_no_focus_rep)); +#endif /* * The Window panel. */ diff --git a/0.73_My_PuTTY/settings.c b/0.73_My_PuTTY/settings.c index cfa27cc..2ab56ff 100644 --- a/0.73_My_PuTTY/settings.c +++ b/0.73_My_PuTTY/settings.c @@ -1577,7 +1577,7 @@ void load_open_settings(settings_r *sesskey, Conf *conf) gppi(sesskey, "CtrlTabSwitch", 0, conf, CONF_ctrl_tab_switch); gpps(sesskey, "Comment", "", conf, CONF_comment ); gppi(sesskey, "SCPAutoPwd", 0, conf, CONF_scp_auto_pwd); - gppb(sesskey, "NoFocusReporting", false, conf, CONF_no_focus_rep); + gppb(sesskey, "NoFocusReporting", true, conf, CONF_no_focus_rep); #endif #ifdef MOD_PORTKNOCKING gpps(sesskey, "PortKnocking", "", conf, CONF_portknockingoptions ); diff --git a/0.73_My_PuTTY/terminal.c b/0.73_My_PuTTY/terminal.c index a0c7db5..989cb31 100644 --- a/0.73_My_PuTTY/terminal.c +++ b/0.73_My_PuTTY/terminal.c @@ -7053,7 +7053,7 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked, input[1] = y + 33; l = sprintf(abuf, "\033[M%c", encstate); - l += charset_from_unicode(&inputp, &inputlen, + l += charset_from_unicode((const wchar_t **)&inputp, &inputlen, abuf + l, 4, CS_UTF8, NULL, NULL, 0); ldisc_send(term->ldisc, abuf, l, 0); @@ -7507,7 +7507,6 @@ int format_small_keypad_key(char *buf, Terminal *term, SmallKeypadKey key) sprintf(prefix, "["); else sprintf(prefix, "O"); - sprintf(suffix, ""); } diff --git a/0.73_My_PuTTY/version.h b/0.73_My_PuTTY/version.h index 371fe25..b30b3f7 100644 --- a/0.73_My_PuTTY/version.h +++ b/0.73_My_PuTTY/version.h @@ -1,5 +1,5 @@ #define RELEASE 0.73 #define TEXTVER "Release 0.73" #define SSHVER "-Release-0.73" -#define BINARY_VERSION 0,73,2,7 +#define BINARY_VERSION 0,73,2,8 #define SOURCE_COMMIT "unavailable" diff --git a/0.73_My_PuTTY/windows/version_minor.txt b/0.73_My_PuTTY/windows/version_minor.txt index 7f8f011..45a4fb7 100644 --- a/0.73_My_PuTTY/windows/version_minor.txt +++ b/0.73_My_PuTTY/windows/version_minor.txt @@ -1 +1 @@ -7 +8 diff --git a/kitty.c b/kitty.c index f4046a9..46cb29d 100644 --- a/kitty.c +++ b/kitty.c @@ -3665,7 +3665,7 @@ int InternalCommand( HWND hwnd, char * st ) { else if( !strcmp( st, "/redraw" ) ) { InvalidateRect( MainHwnd, NULL, TRUE ) ; return 1 ; } else if( !strcmp( st, "/refresh" ) ) { RefreshBackground( MainHwnd ) ; return 1 ; } else if( strstr( st, "/PrintCharSize " ) == st ) { PrintCharSize=atoi( st+15 ) ; return 1 ; } - else if( strstr( st, "/PrintMaxLinePerPage " ) == st ) { PrintMaxLinePerPage=atoi( st+21) ; return 1 ; } + else if( strstr( st, "/PrintMaxLinePerPage " ) == st ) { PrintMaxLinePerPage=atoi( st+21 ) ; return 1 ; } else if( strstr( st, "/PrintMaxCharPerLine " ) == st ) { PrintMaxCharPerLine=atoi( st+21 ) ; return 1 ; } #ifdef MOD_LAUNCHER else if( !strcmp( st, "/initlauncher" ) ) { InitLauncherRegistry() ; return 1 ; } diff --git a/kitty_ini.txt b/kitty_ini.txt index 45a3a72..8d9a1db 100644 --- a/kitty_ini.txt +++ b/kitty_ini.txt @@ -45,11 +45,14 @@ adb=yes ; antiidledelay: time delay between two sending ;antiidledelay=60 +; autoreconnect: enable/disable the automatic reconnection feature +autoreconnect=yes + ; autostoresshkey: enable/disable the automatic ssh key store freature (no confirmation window) ;autostoresshkey=no ; backgroundimage: enable/disable the background image feature -backgroundimage=yes +backgroundimage=no ; bcdelay: time delay between each character in automatic features (autocommand, login script, user function ...) ;bcdelay=0 @@ -57,6 +60,9 @@ backgroundimage=yes ; capslock: force upper case capslock=no +; commanddelay: delay in milliseconds between two lines of the automatic start command script (Connection/Data/Command setting) +;commanddelay=0.05 + ; conf: enable/disable the automatic creation of default configuration file conf=yes @@ -65,10 +71,10 @@ conf=yes ; Usually it the same directory where kitty.exe is ;configdir= -; CtHelperPath: The full path to the cthelper.exe binary (Wrapper for Cygwin feature) +; CtHelperPath: the full path to the cthelper.exe binary (Wrapper for Cygwin feature) ;CtHelperPath= -; ctrltab: Switch between PuTTY windows with CTRL+Tab +; ctrltab: switch between PuTTY windows with CTRL+Tab ctrltab=yes ; cygterm: enable/disable then cygterm feature @@ -89,6 +95,15 @@ icon=yes ; iconfile: point a file where internal icons are located ;iconfile=kitty.exe +;initdelay: initial delay in seconds before automatic sending of password, or auto command +;initdelay=2.0 + +; KiClassName: change the internal software name to be the same as PuTTY +;KiClassName=PuTTY + +; maxblinkingtime: maximum blinks (in system tray) where receiving bell signal +maxblinkingtime=5 + ; mouseshortcuts: enable/disable mouse shortcuts mouseshortcuts=yes @@ -108,9 +123,15 @@ paste=no ; default settings are -scp -r (force scp mode, and recursive mode) ;PSCPOptions=-scp -r +; ReconnectDelay: the delay before trying to reconnect automatically (in seconds) +ReconnectDelay=5 + ; remotedir: the default remote directory where files will be uploaded with pscp integration (drag 'n drop in the KiTTY window) ;remotedir=. +; sav: path to the save file of the KiTTY registry +; + ; savemode: specify the save mode for sessions settings ; Allowed values are: ; - registry : to save sessions into windows regitry @@ -122,12 +143,19 @@ savemode=registry ; Default value is (*.ksh,*.sh)|*.ksh;*.sh|SQL files (*.sql)|*.sql|All files (*.*)|*.*| ;scriptfilefilter=All files (*.*)|*.*| +; scriptmode: enable/disable RuTTY scripting mode +;scriptmode=yes + ; shortcuts: enable/disable keybord shortcuts shortcuts=yes ; size: enable/disable window size in the window title size=no +; slidedelay: delay in seconds before automatic image switching in slideshow mode +; 0 means no automatic slide, waiting for keyboard event +;slidedelay=0 + ; sshversion: Force the SSH version title. ; Default value: PuTTY-KiTTY ; KiTTY claims it is PuTTY-KiTTY. But sometimes there are servers that does not allow non standard values. @@ -143,8 +171,8 @@ transparency=yes ; userpasssshnosave: if yes, SSH password will not be save internaly (and can't be reuse automatically) userpasssshnosave=no -; zmodem: enable/disable zmodem feature (to send/receive files with sz/rz commands) -zmodem=yes +; winrol: enable/disable the rolling feature (rolling into the title bar) +winrol=yes ; WinSCPPath: the full path to the winscp.exe binary ;WinSCPPath= @@ -154,6 +182,12 @@ zmodem=yes ; Default value is: sftp ;WinSCPProtocol=sftp +; wintitle: enable/disable the enhanced title feature (for protected mode and window size) +wintitle=yes + +; zmodem: enable/disable zmodem feature (to send/receive files with sz/rz commands) +zmodem=yes + [Shortcuts] @@ -231,26 +265,15 @@ winscp= - -;KiClassName=PuTTY -maxblinkingtime=5 -;autoreconnect=yes -;ReconnectDelay=5 -;scriptmode=yes -sav=C:\Users\cyril\AppData\Roaming\KiTTY\kitty.sav -;bcdelay=0 -;commanddelay=0.05 -;initdelay=2.0 -;internaldelay=10 -slidedelay=0 -wintitle=yes -winrol=yes - - - [Print] + +; height: characters size (Printing) height=100 -maxline=60s + +; maxline: maximum number of lines per page +maxline=60 + +; maxchar: maximum number of characters per line maxchar=85 diff --git a/kitty_settings.c b/kitty_settings.c index c00782d..6c3d63f 100644 --- a/kitty_settings.c +++ b/kitty_settings.c @@ -1076,7 +1076,7 @@ void load_open_settings_forced(char *filename, Conf *conf) { gppi_forced(sesskey, "CtrlTabSwitch", 0, conf, CONF_ctrl_tab_switch); gpps_forced(sesskey, "Comment", "", conf, CONF_comment ); gppi_forced(sesskey, "SCPAutoPwd", 0, conf, CONF_scp_auto_pwd); - gppb_forced(sesskey, "NoFocusReporting", false, conf, CONF_no_focus_rep); + gppb_forced(sesskey, "NoFocusReporting", true, conf, CONF_no_focus_rep); #endif #ifdef MOD_PORTKNOCKING gpps_forced(sesskey, "PortKnocking", "", conf, CONF_portknockingoptions );