bugfix: issue with the new term_keyinputw funtion usage. Replaced by term_keyinput for one-character sending

This commit is contained in:
cyd01
2020-02-01 23:27:00 +01:00
parent 03445ed68f
commit 8acae386c9
6 changed files with 16 additions and 14 deletions
+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,3
#define BINARY_VERSION 0,73,2,2
#define SOURCE_COMMIT "unavailable"
+1 -1
View File
@@ -142,7 +142,7 @@ RCFLAGS += -I ../../ -DMOD_PERSO -D$(FDJFLAG)
CFLAGS += -DNO_SECUREZEROMEMORY -DCOVERITY -DNO_HTMLHELP
CFLAGS += -D$(FDJFLAG)
CFLAGS += -D__WINE__ \
CFLAGS += \
-DMOD_PERSO \
-DMOD_STARTBUTTON \
-DMOD_SAVEDUMP \
+3 -4
View File
@@ -11,10 +11,8 @@
#include <assert.h>
#ifdef __WINE__
#ifndef NO_MULTIMON
#define NO_MULTIMON /* winelib doesn't have this */
#endif
#endif
#ifndef NO_MULTIMON
#define COMPILE_MULTIMON_STUBS
@@ -263,9 +261,10 @@ void SendStrToTerminal( const char * str, const int len ) {
if( len <= 0 ) return ;
// if( term!=NULL ) term_seen_key_event(term) ;
for( i=0 ; i<len ; i++ ) {
c=(unsigned char)str[i] ;
c = (unsigned char)str[i] ;
if (ldisc)
term_keyinputw(term, (const wchar_t *) &c, 1); //lpage_send(ldisc, CP_ACP, &c, 1, 1);
//term_keyinputw(term, (const wchar_t *) &c, 1); //lpage_send(ldisc, CP_ACP, &c, 1, 1);
term_keyinput(term, -1, &c, 1) ;
}
}
// resize en convertissant en nombre de lignes et colonnes
BIN
View File
Binary file not shown.
+2 -2
View File
@@ -119,8 +119,9 @@ void license_form( char * license, char sep, int size ) {
int license_test( char * license, char sep, int modulo, int result ) {
if( (int)(license_modulo( license, modulo, sep )) == result ) return 1 ;
return 0 ;
}
}
#ifdef MAIN
void license_usage( char * progname ) {
fprintf( stderr, "%s - License generator\n", basename(progname) ) ;
fprintf( stderr, "Usage: %s [-b begining] [-g groupsize] [-l] [-m modulo] [-s size] [-t]\n", basename(progname) ) ;
@@ -194,7 +195,6 @@ int license_main( int argc, char *argv[], char *arge[] ){
return return_code ;
}
#ifdef MAIN
int main( int argc, char *argv[], char *arge[] ) {
return license_main( argc, argv, arge ) ;
}
+9 -6
View File
@@ -1701,16 +1701,19 @@ void SendAutoCommand( HWND hwnd, const char * cmd ) {
if( debug_flag ) { strcat( buf, ": ") ; strcat( buf, cmd ) ; }
if( conf_get_int(conf,CONF_protocol) != PROT_TELNET ) debug_logevent( buf ) ; // On logue que si on est pas en telnet (à cause du password envoyé en clair)
free(buf);
if( existfile( cmd ) ) RunScriptFile( hwnd, cmd ) ;
else if( (toupper(cmd[0])=='C')&&(toupper(cmd[1])==':')&&(toupper(cmd[2])=='\\') ) {
if( existfile( cmd ) ) {
RunScriptFile( hwnd, cmd ) ;
} else if( (toupper(cmd[0])=='C')&&(toupper(cmd[1])==':')&&(toupper(cmd[2])=='\\') ) {
//MessageBox( NULL, cmd,"Info", MB_OK );
return ;
}
else { SendKeyboardPlus( hwnd, cmd ) ; }
} else {
SendKeyboardPlus( hwnd, cmd ) ;
}
else { if( debug_flag ) debug_logevent( "No automatic command !" ) ; }
} else {
if( debug_flag ) debug_logevent( "No automatic command !" ) ;
}
}
// Command sender (envoi d'une meme commande a toutes les fenetres)
BOOL CALLBACK SendCommandProc( HWND hwnd, LPARAM lParam ) {
char buffer[256] ;