rfivet/uemacs
1
0
Fork 0
mirror of https://github.com/rfivet/uemacs.git synced 2025-11-23 11:41:15 -05:00
Code Releases Activity

Fix regression on key command input for M-^X and ^X^X.

Browse Source
This commit is contained in:
Renaud
2021-08-07 13:46:14 +08:00
parent c55a72ad26
commit 1cdc889f6f
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
input.c
View File

@@ -371,11 +371,10 @@ int get1key( void) {
}
/* GETCMD: Get a command from the keyboard. Process all applicable prefix
keys. Handle alted and controlled FNx, not shifted. Allow double
prefix M-^X.
keys. Handle alted and controlled FNx, not shifted.
*/
int getcmd( void) {
int cmask = 0 ; /* prefixes M- & ^X */
int prefix = 0 ; /* prefixes M- or ^X */
int keyread[ STACKSIZE] ; /* room to process sequences like ^[[24;2~ */
int *kptr = keyread ;
int c ;
@@ -390,7 +389,7 @@ int getcmd( void) {
if( c == 'O') { /* F1 .. F4 */
c = *(kptr++) = get1key() ;
if( c >= 'P' && c <= 'S')
return c | SPEC | cmask ;
return c | SPEC | prefix ;
} else if( c == '[') {
int v1, v ; /* ^[[v1;v~ or ^[[v~ */
@@ -398,14 +397,17 @@ int getcmd( void) {
v1 = v = 0 ;
while( kptr < &keyread[ STACKSIZE]) {
c = *(kptr++) = get1key() ;
if( (c == '~') || (c >= 'A' && c <= 'Z')) {
if( (c == '~')
|| (c >= 'A' && c <= 'Z')
|| (c >= 'a' && c <= 'z')) {
/* Found end of sequence */
int mask = prefix ;
if( v1) { /* Handle ALT/CTL, not SHFT */
if( (v - 1) & 4)
cmask |= CTRL ;
if( (v - 1) & 2)
cmask |= META ;
mask = META ;
if( (v - 1) & 4)
mask |= CTRL ;
v = v1 ;
}
@@ -417,7 +419,7 @@ int getcmd( void) {
break ;
}
return c | SPEC | cmask ;
return c | SPEC | mask ;
} else if( c == ';') { /* Start of SHFT/ALT/CTL state */
v1 = v ;
v = 0 ;
@@ -433,20 +435,24 @@ int getcmd( void) {
KPUSH( *(--kptr)) ;
c = get1key() ;
}
} else
kptr-- ;
if( c == metac) {
cmask |= META ;
prefix = META ;
} else if( c == ctlxc) {
cmask |= CTLX ;
if( prefix)
break ; /* ^X^X or M-^X */
else
prefix = CTLX ;
} else
break ;
}
if( cmask && islower( c))
if( prefix && islower( c))
c = flipcase( c) ;
return c | cmask ;
return c | prefix ;
}
/* A more generalized prompt/reply function allowing the caller