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

Tagging the 0.71.0.6 release of the kitty project.

Browse Source
This commit is contained in:
cyd01
2019-07-16 19:24:27 +02:00
parent 829b3f1f71
commit 4d0d98687b
7 changed files with 62 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
0.71_My_PuTTY/config.c
+3
View File
@@ -1148,6 +1148,9 @@ static void sessionsaver_handler(union control *ctrl, dlgparam *dlg,
get_sesslist(&ssd->sesslist, true);
dlg_refresh(ssd->editbox, dlg);
dlg_refresh(ssd->listbox, dlg);
#ifdef PERSOPORT
RepliqueToPuTTY( PUTTY_REG_POS ) ;
#endif
} else if (!ssd->midsession &&
ssd->delbutton && ctrl == ssd->delbutton) {
int i = dlg_listbox_index(ssd->listbox, dlg);
0.71_My_PuTTY/ssh2userauth.c
+1
View File
@@ -863,6 +863,7 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl)
s->publickey_comment),
false);
#ifdef PERSOPORT
SetSSHConnected(1);
if( strlen(ManagePassPhrase(NULL))>0 ) {
char *p = ManagePassPhrase(NULL) ;
bufchain bc;
0.71_My_PuTTY/windows/version_minor.txt
+1 -1
View File
@@ -1 +1 @@
5
6
0.71_My_PuTTY/windows/window.c
+1 -5
View File
@@ -1806,10 +1806,6 @@ void cleanup_exit(int code)
if( IniFileFlag == SAVEMODE_REG ) { // Mode de sauvegarde registry
//SaveRegistryKey() ;
#ifndef FDJ
if( RegTestKey( HKEY_CURRENT_USER, "Software\\SimonTatham\\PuTTY" ) )
RepliqueToPuTTY( PUTTY_REG_POS ) ; // Sauvegarde la conf dans Putty (uniquement si elle existe)
#endif
}
else if( IniFileFlag == SAVEMODE_FILE ) { // Mode de sauvegarde fichier
int nb ;
@@ -5150,7 +5146,7 @@ else if((UINT_PTR)wParam == TIMER_LOGROTATION) { // log rotation
#endif
#ifdef RECONNECTPORT
//if( !back && GetAutoreconnectFlag() && is_backend_first_connected && (WM_COMMAND==WM_KEYDOWN) && !(GetKeyState(VK_CONTROL)&0x8000) && !(GetKeyState(VK_SHIFT)&0x8000) && !(GetKeyState(VK_MENU)&0x8000) && (wParam!=VK_TAB) && (wParam!=VK_LEFT) && (wParam!=VK_UP) && (wParam!=VK_RIGHT) && (wParam!=VK_DOWN) && !((wParam>=VK_F1)&&(wParam<=VK_F16)) ) {
if( (!backend || !is_backend_connected) && (message==WM_KEYDOWN) && GetAutoreconnectFlag() && is_backend_first_connected && (wParam!=VK_CONTROL) && (wParam!=VK_SHIFT) && (wParam!=VK_MENU) && (wParam!=VK_TAB) && (wParam!=VK_LEFT) && (wParam!=VK_UP) && (wParam!=VK_RIGHT) && (wParam!=VK_DOWN) && !((wParam>=VK_F1)&&(wParam<=VK_F16)) ) {
if( (!backend || !is_backend_connected) && (message==WM_KEYDOWN) && GetAutoreconnectFlag() && is_backend_first_connected && (wParam!=VK_CONTROL) && (wParam!=VK_SHIFT) && (wParam!=VK_MENU) && (wParam!=VK_TAB) && (wParam!=VK_LEFT) && (wParam!=VK_UP) && (wParam!=VK_RIGHT) && (wParam!=VK_DOWN) && !((wParam>=VK_F1)&&(wParam<=VK_F16)) ) {
lp_eventlog(default_logpolicy, "No connection on key pressed, trying to reconnect...") ;
PostMessage( hwnd, WM_COMMAND, IDM_RESTART, 0 ) ;
break ;
kitty.c
+1 -50
View File
@@ -43,45 +43,6 @@
// La structure de configuration est instanciee dans window.c
extern Conf *conf ;
/*************************************************
** DEFINITION DES DEFINES
*************************************************/
#define IDM_QUIT 0x0100
#define IDM_VISIBLE 0x0120
#define IDM_PROTECT 0x0210
#define IDM_PRINT 0x0220
#define IDM_TRANSPARUP 0x0230
#define IDM_TRANSPARDOWN 0x0240
#define IDM_WINROL 0x0250
#define IDM_PSCP 0x0260
#define IDM_WINSCP 0x0270
#define IDM_TOTRAY 0x0280
#define IDM_FROMTRAY 0x0290
#define IDM_SHOWPORTFWD 0x0300
#define IDM_HIDE 0x0310
#define IDM_UNHIDE 0x0320
#define IDM_SWITCH_HIDE 0x0330
#define IDM_GONEXT 0x0340
#define IDM_GOPREVIOUS 0x0350
#define IDM_SCRIPTFILE 0x0360
#define IDM_RESIZE 0x0370
#define IDM_REPOS 0x0380
#define IDM_EXPORTSETTINGS 0x0390
#define IDM_PORTKNOCK 0x0440
#define IDM_CLEARLOGFILE 0x0610
// Doit etre le dernier
#define IDM_LAUNCHER 0x1000
// USERCMD doit etre la plus grande valeur pour permettre d'avoir autant de raccourcis qu'on le souhaite
#define IDM_USERCMD 0x8000
// Idem USERCMD
#define IDM_GOHIDE 0x9000
#define IDB_OK 1098
#ifndef SAVEMODE_REG
#define SAVEMODE_REG 0
#endif
@@ -100,17 +61,6 @@ extern int DirectoryBrowseFlag ;
int GetDirectoryBrowseFlag(void) { return DirectoryBrowseFlag ; }
void SetDirectoryBrowseFlag( const int flag ) { DirectoryBrowseFlag = flag ; }
#ifdef ZMODEMPORT
#define IDM_XYZSTART 0x0810
#define IDM_XYZUPLOAD 0x0820
#define IDM_XYZABORT 0x0830
int xyz_Process(Backend *back, void *backhandle, Terminal *term);
void xyz_ReceiveInit(Terminal *term);
void xyz_StartSending(Terminal *term);
void xyz_Cancel(Terminal *term);
void xyz_updateMenuItems(Terminal *term);
#endif
#define SI_INIT 0
#define SI_NEXT 1
@@ -1204,6 +1154,7 @@ void RepliqueToPuTTY( LPCTSTR Key ) {
#ifdef FDJ
return ;
#endif
if( IniFileFlag == SAVEMODE_REG )
if( readINI( KittyIniFile, "PuTTY", "keys", buffer ) ) {
while( (buffer[strlen(buffer)-1]=='\n')||(buffer[strlen(buffer)-1]=='\r')||(buffer[strlen(buffer)-1]==' ')||(buffer[strlen(buffer)-1]=='\t') ) buffer[strlen(buffer)-1]='\0';
if( !stricmp( buffer, "load" ) ) {
kitty.h
+54 -46
View File
@@ -265,23 +265,6 @@ void SethInstIcons( const HINSTANCE h ) ;
extern int debug_flag ;
#ifdef ZMODEMPORT
#ifndef IDM_XYZSTART
#define IDM_XYZSTART 0x0810
#endif
#ifndef IDM_XYZUPLOAD
#define IDM_XYZUPLOAD 0x0820
#endif
#ifndef IDM_XYZABORT
#define IDM_XYZABORT 0x0830
#endif
int xyz_Process(Backend *back, void *backhandle, Terminal *term) ;
void xyz_ReceiveInit(Terminal *term) ;
void xyz_StartSending(Terminal *term) ;
void xyz_Cancel(Terminal *term) ;
void xyz_updateMenuItems(Terminal *term) ;
#endif
extern int PORT ;
// Declaration de prototypes de fonction
@@ -495,100 +478,119 @@ int getpid(void) ;
#define VISIBLE_TRAY -1
#endif
/*************************************************
** DEFINITION DES DEFINES
*************************************************/
#ifdef ZMODEMPORT
#ifndef IDM_XYZSTART
#define IDM_XYZSTART 0xA810
#endif
#ifndef IDM_XYZUPLOAD
#define IDM_XYZUPLOAD 0xA820
#endif
#ifndef IDM_XYZABORT
#define IDM_XYZABORT 0xA830
#endif
int xyz_Process(Backend *back, void *backhandle, Terminal *term) ;
void xyz_ReceiveInit(Terminal *term) ;
void xyz_StartSending(Terminal *term) ;
void xyz_Cancel(Terminal *term) ;
void xyz_updateMenuItems(Terminal *term) ;
#endif
#ifndef IDM_QUIT
#define IDM_QUIT 0x0100
#define IDM_QUIT 0xA840
#endif
#ifndef IDM_VISIBLE
#define IDM_VISIBLE 0x0120
#define IDM_VISIBLE 0xA850
#endif
#ifndef IDM_PROTECT
#define IDM_PROTECT 0x0210
#define IDM_PROTECT 0xA860
#endif
#ifndef IDM_PRINT
#define IDM_PRINT 0x0220
#define IDM_PRINT 0xA870
#endif
#ifndef IDM_TRANSPARUP
#define IDM_TRANSPARUP 0x0230
#define IDM_TRANSPARUP 0xA880
#endif
#ifndef IDM_TRANSPARDOWN
#define IDM_TRANSPARDOWN 0x0240
#define IDM_TRANSPARDOWN 0xA890
#endif
#ifndef IDM_WINROL
#define IDM_WINROL 0x0250
#define IDM_WINROL 0xA900
#endif
#ifndef IDM_PSCP
#define IDM_PSCP 0x0260
#define IDM_PSCP 0xA910
#endif
#ifndef IDM_WINSCP
#define IDM_WINSCP 0x0270
#define IDM_WINSCP 0xA920
#endif
#ifndef IDM_TOTRAY
#define IDM_TOTRAY 0x0280
#define IDM_TOTRAY 0xA930
#endif
#ifndef IDM_FROMTRAY
#define IDM_FROMTRAY 0x0290
#define IDM_FROMTRAY 0xA940
#endif
#ifndef IDM_SHOWPORTFWD
#define IDM_SHOWPORTFWD 0x0300
#define IDM_SHOWPORTFWD 0xA950
#endif
#ifndef IDM_HIDE
#define IDM_HIDE 0x0310
#define IDM_HIDE 0xA960
#endif
#ifndef IDM_UNHIDE
#define IDM_UNHIDE 0x0320
#define IDM_UNHIDE 0xA970
#endif
#ifndef IDM_SWITCH_HIDE
#define IDM_SWITCH_HIDE 0x0330
#define IDM_SWITCH_HIDE 0xA980
#endif
#ifndef IDM_GONEXT
#define IDM_GONEXT 0x0340
#define IDM_GONEXT 0xA990
#endif
#ifndef IDM_GOPREVIOUS
#define IDM_GOPREVIOUS 0x0350
#define IDM_GOPREVIOUS 0xB000
#endif
#ifndef IDM_SCRIPTFILE
#define IDM_SCRIPTFILE 0x0360
#define IDM_SCRIPTFILE 0xB010
#endif
#ifndef IDM_RESIZE
#define IDM_RESIZE 0x0370
#define IDM_RESIZE 0xB020
#endif
#ifndef IDM_REPOS
#define IDM_REPOS 0x0380
#define IDM_REPOS 0xB030
#endif
#ifndef IDM_EXPORTSETTINGS
#define IDM_EXPORTSETTINGS 0x0390
#define IDM_EXPORTSETTINGS 0xB040
#endif
#ifndef IDM_FONTUP
#define IDM_FONTUP 0x0400
#define IDM_FONTUP 0xB050
#endif
#ifndef IDM_FONTDOWN
#define IDM_FONTDOWN 0x0410
#define IDM_FONTDOWN 0xB060
#endif
#ifndef IDM_FONTBLACKANDWHITE
#define IDM_FONTBLACKANDWHITE 0x0420
#define IDM_FONTBLACKANDWHITE 0xB070
#endif
#ifndef IDM_FONTNEGATIVE
#define IDM_FONTNEGATIVE 0x0430
#define IDM_FONTNEGATIVE 0xB080
#endif
#ifndef IDM_PORTKNOCK
#define IDM_PORTKNOCK 0x0440
#define IDM_PORTKNOCK 0xB090
#endif
#ifndef IDM_CLEARLOGFILE
#define IDM_CLEARLOGFILE 0x0610
#define IDM_CLEARLOGFILE 0xB100
#endif
#ifdef RECONNECTPORT
#ifndef IDM_RESTARTSESSION
#define IDM_RESTARTSESSION 0x0450
#define IDM_RESTARTSESSION 0xB110
#endif
#endif
// Doit etre le dernier
#ifndef IDM_LAUNCHER
#define IDM_LAUNCHER 0x1000
#define IDM_LAUNCHER 0xB120
#endif
// USERCMD doit etre la plus grande valeur pour permettre d'avoir autant de raccourcis qu'on le souhaite
@@ -601,6 +603,12 @@ int getpid(void) ;
#define IDM_GOHIDE 0x9000
#endif
/*************************************************
** FIN DE DEFINITION DES DEFINES
*************************************************/
#ifndef IDB_OK
#define IDB_OK 1098
#endif
kitty_commun.c
+1 -1
View File
@@ -251,7 +251,7 @@ int is_backend_connected = 0 ;
#ifdef RECONNECTPORT
int is_backend_first_connected = 0 ;
void SetSSHConnected( int flag ) {
void SetSSHConnected( int flag ) {
is_backend_connected = flag ;
if( flag ) is_backend_first_connected = 1 ;
}