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

Tagging the 0.73.2.11 release of the kitty project.

Browse Source
This commit is contained in:
cyd01
2020-04-18 18:05:32 +02:00
parent bfb8f844eb
commit b7c2e56163
9 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
0.73_My_PuTTY/config.c
+7 -1
View File
@@ -1128,7 +1128,13 @@ static void sessionsaver_handler(union control *ctrl, dlgparam *dlg,
MASKPASS( buffer ) ;
conf_set_str( conf, CONF_password, buffer ) ;
memset( buffer, 0, strlen(buffer) ) ;
}
}
if( GetDblClickFlag()==1 ) {
sessionsaver_handler( ssd->startbutton, dlg, data, EVENT_ACTION ) ;
sessionsaver_handler( ssd->clearbutton, dlg, data, EVENT_ACTION ) ;
sessionsaver_handler( ctrlSessionList, dlg, data, EVENT_REFRESH ) ;
}
else
dlg_end(dlg, 1); /* it's all over, and succeeded */
}
if( conf_get_int(conf, CONF_protocol) != PROT_SERIAL ) {
0.73_My_PuTTY/settings.c
+10 -1
View File
@@ -21,6 +21,7 @@
#endif
#ifdef MOD_PERSO
extern char FileExtension[15] ;
extern char PassKey[1024] ;
extern int cryptstring( char * st, const char * key ) ;
extern int decryptstring( char * st, const char * key ) ;
@@ -1668,9 +1669,17 @@ void get_sesslist(struct sesslist *list, bool allocate)
#ifdef MOD_PERSO
/* Fonction de creation d'une session */
void create_settings( const char * name ) {
char *nname = NULL ;
Conf *cfg = conf_new() ;
do_defaults(name,cfg);
save_settings(name, cfg);
nname = (char*)malloc( strlen(name)+6 ) ;
if( !strcmp(FileExtension,"") ) {
strcpy(nname,name);
} else {
sprintf(nname,"%s%s",name,FileExtension);
}
save_settings(nname, cfg);
free(nname) ;
conf_free(cfg);
}
#include "../kitty_settings.c"
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,10
#define BINARY_VERSION 0,73,2,11
#define SOURCE_COMMIT "unavailable"
0.73_My_PuTTY/windows/MAKEFILE.MINGW
+3
View File
@@ -143,6 +143,9 @@ FDJFLAG = FDJ1
RCFLAGS += -I ../../ -DMOD_PERSO -D$(FDJFLAG)
# Flag pour éviter les crashes sur processeurs AMD
CFLAGS += -mms-bitfields -march=i386
CFLAGS += -DNO_SECUREZEROMEMORY -DCOVERITY -DNO_HTMLHELP
CFLAGS += -D$(FDJFLAG)
CFLAGS += \
0.73_My_PuTTY/windows/version_minor.txt
+1 -1
View File
@@ -1 +1 @@
10
11
kitty.c
+12 -3
View File
@@ -313,6 +313,12 @@ static int DefaultSettingsFlag = 1 ;
int GetDefaultSettingsFlag(void) { return DefaultSettingsFlag ; }
void SetDefaultSettingsFlag( const int flag ) { DefaultSettingsFlag = flag ; }
// Flag pour définir l'action a executer sur un double clic sur une session de la liste des sessions
// [ConfigBox] dblclick=open
static int DblClickFlag = 0 ;
int GetDblClickFlag(void) { return DblClickFlag ; }
void SetDblClickFlag( const int flag ) { DblClickFlag = flag ; }
// Flag pour inhiber le filtre sur la liste des sessions de la boite de configuration
static int SessionFilterFlag = 1 ;
int GetSessionFilterFlag(void) { return SessionFilterFlag ; }
@@ -1417,10 +1423,10 @@ void GetSaveMode( void ) {
if( !stricmp( buffer, "registry" ) ) IniFileFlag = SAVEMODE_REG ;
else if( !stricmp( buffer, "file" ) ) IniFileFlag = SAVEMODE_FILE ;
else if( !stricmp( buffer, "dir" ) ) { IniFileFlag = SAVEMODE_DIR ; DirectoryBrowseFlag = 1 ; }
}
}
#endif
if( IniFileFlag!=SAVEMODE_DIR ) DirectoryBrowseFlag = 0 ;
}
}
// Sauvegarde de la cle de registre
void SaveRegistryKeyEx( HKEY hMainKey, LPCTSTR lpSubKey, const char * filename ) {
@@ -5208,7 +5214,10 @@ void LoadParameters( void ) {
if( ReadParameter( INIT_SECTION, "shrinkbitmap", buffer ) ) { if( !stricmp( buffer, "YES" ) ) SetShrinkBitmapEnable(1) ; else SetShrinkBitmapEnable(0) ; }
#endif
if( readINI( KittyIniFile, "ConfigBox", "dblclick", buffer ) ) {
if( !strcmp(buffer,"open") ) { SetDblClickFlag(0) ; }
if( !strcmp(buffer,"start") ) { SetDblClickFlag(1) ; }
}
if( readINI( KittyIniFile, "ConfigBox", "height", buffer ) ) {
ConfigBoxHeight = atoi( buffer ) ;
}
kitty.h
+5
View File
@@ -199,6 +199,11 @@ void SetSessionsInDefaultFlag( const int flag ) ;
int GetDefaultSettingsFlag(void) ;
void SetDefaultSettingsFlag( const int flag ) ;
// Flag pour définir l'action a executer sur un double clic sur une session de la liste des sessions
// [ConfigBox] dblclick=open
int GetDblClickFlag(void) ;
void SetDblClickFlag( const int flag ) ;
#ifdef MOD_ADB
// Flag pour inhiber le support d'ADB
int GetADBFlag(void) ;
kitty_ini.txt
+7 -1
View File
@@ -14,6 +14,12 @@
[ConfigBox]
; dblclick: define the default action when double click on a session in session list
; Allowed values are:
; - open: press open button
; - start: press start button
dblclick=open
; default: if yes all the sessions belong to their own folder and the default folder too
;default=yes
@@ -140,7 +146,7 @@ ReconnectDelay=5
; - 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
;savemode=registry
; scriptfilefilter: specify the the local script files extension
; Default value is (*.ksh,*.sh)|*.ksh;*.sh|SQL files (*.sql)|*.sql|All files (*.*)|*.*|
kitty_savedump.c
+2 -2
View File
@@ -634,8 +634,8 @@ void SaveDumpConfig( FILE *fp, Conf * conf ) {
fprintf( fp,"ADBFlag=%d\n",GetADBFlag() );
#endif
if( PasswordConf!= NULL ) fprintf( fp, "PasswordConf=%s\n", PasswordConf ) ;
fprintf( fp, "SessionFilterFlag=%d\nSessionsInDefaultFlag=%d\nDefaultSettingsFlag=%d\nImageViewerFlag=%d\nImageSlideDelay=%d\nMaxBlinkingTime=%d\nPrintCharSize=%d\nPrintMaxLinePerPage=%d\nPrintMaxCharPerLine=%d\nReadOnlyFlag=%d\nScrumbleKeyFlag=%d\n"
,SessionFilterFlag,SessionsInDefaultFlag,DefaultSettingsFlag,ImageViewerFlag,ImageSlideDelay,MaxBlinkingTime,PrintCharSize,PrintMaxLinePerPage,PrintMaxCharPerLine,GetReadOnlyFlag(),GetScrumbleKeyFlag());
fprintf( fp, "SessionFilterFlag=%d\nSessionsInDefaultFlag=%d\nDefaultSettingsFlag=%d\nDblClickFlag=%d\nImageViewerFlag=%d\nImageSlideDelay=%d\nMaxBlinkingTime=%d\nPrintCharSize=%d\nPrintMaxLinePerPage=%d\nPrintMaxCharPerLine=%d\nReadOnlyFlag=%d\nScrumbleKeyFlag=%d\n"
,SessionFilterFlag,SessionsInDefaultFlag,DefaultSettingsFlag,DblClickFlag,ImageViewerFlag,ImageSlideDelay,MaxBlinkingTime,PrintCharSize,PrintMaxLinePerPage,PrintMaxCharPerLine,GetReadOnlyFlag(),GetScrumbleKeyFlag());
fprintf( fp, "AntiIdleCount=%d\nAntiIdleCountMax=%d\nIconeNum=%d\n"
,AntiIdleCount,AntiIdleCountMax,IconeNum);
fprintf( fp, "AntiIdleStr=%s\nInitialDirectory=%s\nFileExtension=%s\nConfigDirectory=%s\nBuildVersionTime=%s\n",AntiIdleStr,InitialDirectory,FileExtension,ConfigDirectory,BuildVersionTime);