haeaeae/KiTTY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tagging the 0.73.2.7 release of the kitty project.

Browse Source
This commit is contained in:
cyd01
2020-03-14 22:54:56 +01:00
parent 6b8133a347
commit 0d8a80b528
13 changed files with 313 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
0.73_My_PuTTY/putty.h
+5 -2
View File
@@ -1178,8 +1178,9 @@ struct TermWinVtable {
void (*set_cursor_pos)(TermWin *, int x, int y);
void (*set_raw_mouse_mode)(TermWin *, bool enable);
#ifdef MOD_PERSO
void (*set_focus_reporting_mode)(TermWin *, bool enable);
#endif
void (*set_scrollbar)(TermWin *, int total, int start, int page);
void (*bell)(TermWin *, int mode);
@@ -1235,8 +1236,10 @@ static inline void win_set_cursor_pos(TermWin *win, int x, int y)
{ win->vt->set_cursor_pos(win, x, y); }
static inline void win_set_raw_mouse_mode(TermWin *win, bool enable)
{ win->vt->set_raw_mouse_mode(win, enable); }
#ifdef MOD_PERSO
static inline void win_set_focus_reporting_mode(TermWin *win, bool enable)
{ win->vt->set_focus_reporting_mode(win, enable); }
#endif
static inline void win_set_scrollbar(TermWin *win, int t, int s, int p)
{ win->vt->set_scrollbar(win, t, s, p); }
static inline void win_bell(TermWin *win, int mode)
@@ -1387,7 +1390,6 @@ NORETURN void cleanup_exit(int);
X(BOOL, NONE, no_applic_c) /* totally disable app cursor keys */ \
X(BOOL, NONE, no_applic_k) /* totally disable app keypad */ \
X(BOOL, NONE, no_mouse_rep) /* totally disable mouse reporting */ \
X(BOOL, NONE, no_focus_rep) /* totally disable mouse reporting */ \
X(BOOL, NONE, no_remote_resize) /* disable remote resizing */ \
X(BOOL, NONE, no_alt_screen) /* disable alternate screen */ \
X(BOOL, NONE, no_remote_wintitle) /* disable remote retitling */ \
@@ -1572,6 +1574,7 @@ NORETURN void cleanup_exit(int);
X(INT, NONE, ctrl_tab_switch) /* switch PuTTY windows with CtrlTab */ \
X(STR, NONE, comment) \
X(INT, NONE, scp_auto_pwd) \
X(BOOL, NONE, no_focus_rep) /* totally disable mouse reporting */ \
/* #endif */ \
/* #ifdef MOD_PRINTCLIP */ \
X(INT, NONE, printclip) \
0.73_My_PuTTY/settings.c
+2 -2
View File
@@ -649,7 +649,6 @@ void save_open_settings(settings_w *sesskey, Conf *conf)
write_setting_b(sesskey, "NoApplicationKeys", conf_get_bool(conf, CONF_no_applic_k));
write_setting_b(sesskey, "NoApplicationCursors", conf_get_bool(conf, CONF_no_applic_c));
write_setting_b(sesskey, "NoMouseReporting", conf_get_bool(conf, CONF_no_mouse_rep));
write_setting_b(sesskey, "NoFocusReporting", conf_get_bool(conf, CONF_no_focus_rep));
write_setting_b(sesskey, "NoRemoteResize", conf_get_bool(conf, CONF_no_remote_resize));
write_setting_b(sesskey, "NoAltScreen", conf_get_bool(conf, CONF_no_alt_screen));
write_setting_b(sesskey, "NoRemoteWinTitle", conf_get_bool(conf, CONF_no_remote_wintitle));
@@ -918,6 +917,7 @@ void save_open_settings(settings_w *sesskey, Conf *conf)
write_setting_i(sesskey, "CtrlTabSwitch", conf_get_int(conf, CONF_ctrl_tab_switch));
write_setting_s(sesskey, "Comment", conf_get_str(conf, CONF_comment) );
write_setting_i(sesskey, "SCPAutoPwd", conf_get_int(conf, CONF_scp_auto_pwd));
write_setting_b(sesskey, "NoFocusReporting", conf_get_bool(conf, CONF_no_focus_rep));
#endif
#ifdef MOD_PORTKNOCKING
write_setting_s(sesskey, "PortKnocking", conf_get_str(conf, CONF_portknockingoptions) );
@@ -1192,7 +1192,6 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
gppb(sesskey, "NoApplicationKeys", false, conf, CONF_no_applic_k);
gppb(sesskey, "NoApplicationCursors", false, conf, CONF_no_applic_c);
gppb(sesskey, "NoMouseReporting", false, conf, CONF_no_mouse_rep);
gppb(sesskey, "NoFocusReporting", false, conf, CONF_no_focus_rep);
gppb(sesskey, "NoRemoteResize", false, conf, CONF_no_remote_resize);
gppb(sesskey, "NoAltScreen", false, conf, CONF_no_alt_screen);
gppb(sesskey, "NoRemoteWinTitle", false, conf, CONF_no_remote_wintitle);
@@ -1578,6 +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);
#endif
#ifdef MOD_PORTKNOCKING
gpps(sesskey, "PortKnocking", "", conf, CONF_portknockingoptions );
0.73_My_PuTTY/terminal.c
+6
View File
@@ -1530,7 +1530,9 @@ void term_copy_stuff_from_conf(Terminal *term)
term->no_applic_k = conf_get_bool(term->conf, CONF_no_applic_k);
term->no_dbackspace = conf_get_bool(term->conf, CONF_no_dbackspace);
term->no_mouse_rep = conf_get_bool(term->conf, CONF_no_mouse_rep);
#ifdef MOD_PERSO
term->no_focus_rep = conf_get_bool(term->conf, CONF_no_focus_rep);
#endif
term->no_remote_charset = conf_get_bool(term->conf, CONF_no_remote_charset);
term->no_remote_resize = conf_get_bool(term->conf, CONF_no_remote_resize);
term->no_remote_wintitle = conf_get_bool(term->conf, CONF_no_remote_wintitle);
@@ -7768,6 +7770,7 @@ void term_provide_logctx(Terminal *term, LogContext *logctx)
void term_set_focus(Terminal *term, bool has_focus)
{
#ifdef MOD_PERSO
if( term->has_focus != has_focus) {
term->has_focus = has_focus;
@@ -7778,6 +7781,9 @@ void term_set_focus(Terminal *term, bool has_focus)
ldisc_send(term->ldisc, "\033[O", 3,false);
}
}
#else
term->has_focus = has_focus;
#endif
term_schedule_cblink(term);
}
0.73_My_PuTTY/terminal.h
+2
View File
@@ -331,8 +331,10 @@ struct terminal_tag {
bool no_applic_k;
bool no_dbackspace;
bool no_mouse_rep;
#ifdef MOD_PERSO
bool no_focus_rep;
bool report_focus;
#endif
bool no_remote_charset;
bool no_remote_resize;
bool no_remote_wintitle;
0.73_My_PuTTY/version.h
+1 -1
View File
@@ -1,5 +1,5 @@
#define RELEASE 0.73
#define TEXTVER "Release 0.73"
#define SSHVER "-Release-0.73"
#define BINARY_VERSION 0,73,2,6
#define BINARY_VERSION 0,73,2,7
#define SOURCE_COMMIT "unavailable"
0.73_My_PuTTY/windows/MAKEFILE.MINGW
+4 -1
View File
@@ -1851,7 +1851,7 @@ winpgnt_integrated.o: ../windows/winpgnt.c ../putty.h ../ssh.h ../misc.h ../tree
adb.o: ../putty.h ../../adb/adb.c
$(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../../adb/adb.c -I../../adb -I../../
kitty.o: ../../kitty.c ../../kitty.h ../../kitty_savedump.c ../../kitty_launcher.c ../../kitty_launcher.h ../windows/window.c
kitty.o: ../../kitty.c ../../kitty.h ../../kitty_savedump.c ../../kitty_launcher.c ../../kitty_launcher.h ../windows/window.c ../../kitty_ini.h
$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../../kitty.c \
-DBUILD_TIME=`date +'"%d/%m/%Y-%H:%M:%S(%Z)"'` \
-DBUILD_VERSION=`cat version_major.txt` \
@@ -1979,6 +1979,9 @@ kitty.dll: ../../kitty_dll.c kitty_dll.res.o
-DBUILD_DLL -static-libgcc -lcomdlg32 -lgdi32
upx --best --compress-icons=2 kitty.dll
../../kitty_ini.h: ../../kitty_ini.txt
( printf 'static char *default_init_file_content = "' ; sed 's/\\/\\\\/g' ../../kitty_ini.txt | sed 's/$$/\\n\\/' ; printf '" ;\n' ) > ../../kitty_ini.h
nohyperlink: putty_nohyperlink.exe
notrans: putty_notrans.exe
0.73_My_PuTTY/windows/version_minor.txt
+1 -1
View File
@@ -1 +1 @@
6
7
0.73_My_PuTTY/windows/window.c
+10 -2
View File
@@ -382,7 +382,9 @@ static int wintw_char_width(TermWin *, int uc);
static void wintw_free_draw_ctx(TermWin *);
static void wintw_set_cursor_pos(TermWin *, int x, int y);
static void wintw_set_raw_mouse_mode(TermWin *, bool enable);
#ifdef MOD_PERSO
static void wintw_set_focus_reporting_mode(TermWin *, bool enable);
#endif
static void wintw_set_scrollbar(TermWin *, int total, int start, int page);
static void wintw_bell(TermWin *, int mode);
static void wintw_clip_write(
@@ -415,7 +417,9 @@ static const TermWinVtable windows_termwin_vt = {
wintw_free_draw_ctx,
wintw_set_cursor_pos,
wintw_set_raw_mouse_mode,
wintw_set_focus_reporting_mode,
#ifdef MOD_PERSO
wintw_set_focus_reporting_mode,
#endif
wintw_set_scrollbar,
wintw_bell,
wintw_clip_write,
@@ -2023,6 +2027,7 @@ static void wintw_set_raw_mouse_mode(TermWin *tw, bool activate)
update_mouse_pointer();
}
#ifdef MOD_PERSO
/*
* set or clear the "window focus messages" mode
*/
@@ -2040,6 +2045,7 @@ static void wintw_set_focus_reporting_mode(TermWin *tw, bool activate)
}
}
}
#endif
/*
* Print a message box and close the connection.
@@ -5265,10 +5271,12 @@ else if((UINT_PTR)wParam == TIMER_LOGROTATION) { // log rotation
return 0 ;
}
}
if( (GetKeyState(VK_MENU)&0x8000) && (wParam==VK_SPACE) ) {
/*
if( (GetKeyState(VK_MENU)&0x8000) && (wParam==VK_SPACE) ) {
PopUpSystemMenu( hwnd, 0 ) ;
return 0;
}
*/
#endif
/*
kitty.c
+16
View File
@@ -1233,7 +1233,23 @@ void CountUp( void ) {
}
// Si le fichier kitty.ini n'existe pas => creation du fichier par defaut
#include "kitty_ini.h"
void CreateDefaultIniFile( void ) {
if( !NoKittyFileFlag ) if( !GetReadOnlyFlag() ) {
if( KittyIniFile==NULL ) return ;
if( strlen(KittyIniFile)==0 ) return ;
if( !existfile( KittyIniFile ) ) {
FILE *fp;
if( (fp=fopen(KittyIniFile,"w")) != NULL ) {
fputs(default_init_file_content,fp);
fclose(fp);
}
}
if( !existfile( KittyIniFile ) ) { MessageBox( NULL, "Unable to create configuration file !", "Error", MB_OK|MB_ICONERROR ) ; }
}
}
void CreateDefaultIniFile_old( void ) {
char buffer[4096] ;
if( !NoKittyFileFlag ) if( !GetReadOnlyFlag() ) {
if( KittyIniFile==NULL ) return ;
kitty_ini.txt
+262
View File
@@ -0,0 +1,262 @@
[Agent]
; askconfirmation: ask for confirmation on private key usage
; See http://people.mpi-klsb.mpg.de/~pcernko/pageant.html for information
; - yes : always
; - no : never
; - auto: only is private key comment contains 'needs confirm'
;askconfirmation=auto
; messageonkeyusage: allow notification bullet on private key usage
;messageonkeyusage=no
[ConfigBox]
; default: if yes all the sessions belong to their own folder and the default folder too
;default=yes
; defaultsettings: enable/disable the automatic creation of the 'Default Settings' session
;defaultsettings=yes
; filter: enable/disable filter in saved sessions selection box
filter=yes
; height: the number of visible lines into the saved sessions selection box (in main window)
height=21
; noexit: if set to yes, return to the configuration box at main program exit
;noexit=no
; windowheight: the size of the configuration box
;windowheight=800
[KiTTY]
; adb: enable/disable adb support
adb=yes
; antiidle: character string regularly sent to maintain the connection alive
;antiidle== \k08\
; antiidledelay: time delay between two sending
;antiidledelay=60
; autostoresshkey: enable/disable the automatic ssh key store freature (no confirmation window)
;autostoresshkey=no
; backgroundimage: enable/disable the background image feature
backgroundimage=yes
; bcdelay: time delay between each character in automatic features (autocommand, login script, user function ...)
;bcdelay=0
; capslock: force upper case
capslock=no
; conf: enable/disable the automatic creation of default configuration file
conf=yes
; configdir: set the configuration directory
; In portable mode it the place where to find settings files directories: Sessions, SshHostKeys, ...
; Usually it the same directory where kitty.exe is
;configdir=
; CtHelperPath: The full path to the cthelper.exe binary (Wrapper for Cygwin feature)
;CtHelperPath=
; ctrltab: Switch between PuTTY windows with CTRL+Tab
ctrltab=yes
; cygterm: enable/disable then cygterm feature
cygterm=no
; debug: for debug purpose only
;debug=no
; downloaddir: this is the local directory where files are downloaded with the pscp integration
;downloaddir=
; hyperlink: enable/disable the hyperlink feature
hyperlink=yes
; icon: enable/disable the icon managment feature (a particular icon for specific session)
icon=yes
; iconfile: point a file where internal icons are located
;iconfile=kitty.exe
; mouseshortcuts: enable/disable mouse shortcuts
mouseshortcuts=yes
; numberoficons: total number of internal icons
;numberoficons=45
; paste: enable/disable one line at a time feature in paste action (useful on slow servers only)
paste=no
; PlinkPath: the full path to the plink.exe (or klink.exe) binary
;PlinkPath=
; PSCPPath: the full path to the pscp.exe (or kscp.exe) binary
;PSCPPath=
; PSCPOptions: the additionnal options to pass to the pscp command (for download or upload file)
; default settings are -scp -r (force scp mode, and recursive mode)
;PSCPOptions=-scp -r
; remotedir: the default remote directory where files will be uploaded with pscp integration (drag 'n drop in the KiTTY window)
;remotedir=.
; savemode: specify the save mode for sessions settings
; Allowed values are:
; - registry : to save sessions into windows regitry
; - file : to save sessions into one unique file (currently not maintained)
; - dir : to save sessions into files in the directory structure
savemode=registry
; scriptfilefilter: specify the the local script files extension
; Default value is (*.ksh,*.sh)|*.ksh;*.sh|SQL files (*.sql)|*.sql|All files (*.*)|*.*|
;scriptfilefilter=All files (*.*)|*.*|
; shortcuts: enable/disable keybord shortcuts
shortcuts=yes
; size: enable/disable window size in the window title
size=no
; 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.
; So it is possible to redefine it
;sshversion=OpenSSH_5.5
; transparency: enable/disable the transparency feature
transparency=yes
; uploaddir: the default remote directory where files will be uploaded with pscp integration (drag 'n drop in the KiTTY window)
;uploaddir=.
; 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
; WinSCPPath: the full path to the winscp.exe binary
;WinSCPPath=
; WinSCPProtocol: force the protocol for WinSCP integration
; Allowed values are: scp, sftp, ftp
; Default value is: sftp
;WinSCPProtocol=sftp
[Shortcuts]
; Shortcuts: definition for the menu shortcuts keys
; (re)send automatic command (default is SHIFT+F12)
autocommand=
; Change settings ...
changesettings=
; Clear scrollback
clearscrollback=
; Close and restart current session
closerestart=
; run a local command (default is CONTROL+F5)
command=
; Copy all window buffer to clipboard
copyall=
; Open a duplicate window (with same session settings)
duplicate=
; open text editor connected to the main window (default is SHIFT+F2)
editor=
; open text editor with clipboard content, connected to the main window (default is CONTROL+SHIFT+F2)
editorclipboard=
; Show event log
eventlog=
; Switch font to black on white colors
fontblackandwhite=
; Decrease font size
fontdown=
; Switch font to negative colors
fontnegative=
; Increase fonr size
fontup=
; Switch to full screen
fullscreen=
; receive a remote file with pscp.exe: the full path must be selected in clipboard (default is CONTROL+F4)
getfile=
; change the background image (default is CONTROL+F11)
imagechange=
; special command box (default is CONTROL+F8)
input=
; special command with multi-line editor (default is SHIFT+F8)
inputm=
; Repeat key exchange
keyexchange=
; New session ...
opennew=
; Print current clipboard content (default if SHIFT+F7)
print=
; Print all window buffer content (default is F7)
printall=
; Protect the window, disable keyboard and mouse input (default is CONTROL+F9)
protect=
; Reset terminal
resetterminal=
; Roll-up the window into the title bar (default is CONTROL+F12)
rollup=
; Load a local script and run it remotely (default is CONTROL+F2)
script=
; Send a local file with pscp.exe (default is CONTROL+F3)
sendfile=
; Show current port forwarding definition (default is SHIFT+F6)
showportforward=
; Enable or disable logging (default is SHIFT+F5)
switchlogmode=
; Send the window to the system tray (default is CONTROL+F6)
tray=
; Switch to embedded image viewer (default SHIFT+F11)
viewer=
; Switch to always visible (default is CONTROL+F7)
visible=
; Start WinSCP (default is SHIFT+F3)
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=100
maxline=60s
maxchar=85
[Launcher]
; reload: enable session list reload on each menu respawn
reload=yes
kitty_savedump.c
+1 -1
View File
@@ -331,7 +331,6 @@ void SaveDumpConfig( FILE *fp, Conf * conf ) {
fprintf( fp, "no_applic_c=%d\n", conf_get_bool(conf,CONF_no_applic_c) ) ;
fprintf( fp, "no_applic_k=%d\n", conf_get_bool(conf,CONF_no_applic_k) ) ;
fprintf( fp, "no_mouse_rep=%d\n", conf_get_bool(conf,CONF_no_mouse_rep) ) ;
fprintf( fp, "no_focus_rep=%d\n", conf_get_bool(conf,CONF_no_focus_rep) ) ;
fprintf( fp, "no_remote_resize=%d\n", conf_get_bool(conf,CONF_no_remote_resize) ) ;
fprintf( fp, "no_alt_screen=%d\n", conf_get_bool(conf,CONF_no_alt_screen) ) ;
fprintf( fp, "no_remote_wintitle=%d\n", conf_get_bool(conf,CONF_no_remote_wintitle) ) ;
@@ -525,6 +524,7 @@ void SaveDumpConfig( FILE *fp, Conf * conf ) {
fprintf( fp, "ctrl_tab_switch=%d\n", conf_get_int(conf, CONF_ctrl_tab_switch));
fprintf( fp, "comment=%s\n", conf_get_str(conf,CONF_comment) ) ;
fprintf( fp, "scp_auto_pwd=%d\n", conf_get_int(conf, CONF_scp_auto_pwd));
fprintf( fp, "no_focus_rep=%d\n", conf_get_bool(conf,CONF_no_focus_rep) ) ;
#endif
#ifdef MOD_PRINTCLIP
fprintf( fp, "printclip=%d\n", conf_get_int(conf,CONF_printclip) ) ;
kitty_settings.c
+2 -2
View File
@@ -155,7 +155,6 @@ void save_open_settings_forced(char *filename, Conf *conf) {
write_setting_b_forced(sesskey, "NoApplicationKeys", conf_get_bool(conf, CONF_no_applic_k));
write_setting_b_forced(sesskey, "NoApplicationCursors", conf_get_bool(conf, CONF_no_applic_c));
write_setting_b_forced(sesskey, "NoMouseReporting", conf_get_bool(conf, CONF_no_mouse_rep));
write_setting_b_forced(sesskey, "NoFocusReporting", conf_get_bool(conf, CONF_no_focus_rep));
write_setting_b_forced(sesskey, "NoRemoteResize", conf_get_bool(conf, CONF_no_remote_resize));
write_setting_b_forced(sesskey, "NoAltScreen", conf_get_bool(conf, CONF_no_alt_screen));
write_setting_b_forced(sesskey, "NoRemoteWinTitle", conf_get_bool(conf, CONF_no_remote_wintitle));
@@ -426,6 +425,7 @@ void save_open_settings_forced(char *filename, Conf *conf) {
write_setting_i_forced(sesskey, "CtrlTabSwitch", conf_get_int(conf, CONF_ctrl_tab_switch));
write_setting_s_forced(sesskey, "Comment", conf_get_str(conf, CONF_comment) );
write_setting_i_forced(sesskey, "SCPAutoPwd", conf_get_int(conf, CONF_scp_auto_pwd));
write_setting_b_forced(sesskey, "NoFocusReporting", conf_get_bool(conf, CONF_no_focus_rep));
#endif
#ifdef MOD_PORTKNOCKING
write_setting_s_forced(sesskey, "PortKnocking", conf_get_str(conf, CONF_portknockingoptions) );
@@ -691,7 +691,6 @@ void load_open_settings_forced(char *filename, Conf *conf) {
gppb_forced(sesskey, "NoApplicationKeys", false, conf, CONF_no_applic_k);
gppb_forced(sesskey, "NoApplicationCursors", false, conf, CONF_no_applic_c);
gppb_forced(sesskey, "NoMouseReporting", false, conf, CONF_no_mouse_rep);
gppb_forced(sesskey, "NoFocusReporting", false, conf, CONF_no_focus_rep);
gppb_forced(sesskey, "NoRemoteResize", false, conf, CONF_no_remote_resize);
gppb_forced(sesskey, "NoAltScreen", false, conf, CONF_no_alt_screen);
gppb_forced(sesskey, "NoRemoteWinTitle", false, conf, CONF_no_remote_wintitle);
@@ -1077,6 +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);
#endif
#ifdef MOD_PORTKNOCKING
gpps_forced(sesskey, "PortKnocking", "", conf, CONF_portknockingoptions );
kitty_win.h
+1
View File
@@ -39,4 +39,5 @@ void debug_logevent( const char *fmt, ... ) ;
// Affiche le menu system de l'application
void PopUpSystemMenu( HWND hwnd, int npos ) ;
#endif