diff options
| author | Jim Blandy <[email protected]> | 1993-06-19 21:01:38 +0000 |
|---|---|---|
| committer | Jim Blandy <[email protected]> | 1993-06-19 21:01:38 +0000 |
| commit | 64a072198028d6394000f7a9edec306aa23812b8 (patch) | |
| tree | d9b630b732320649d6894a93f7b9361cf03c258e | |
| parent | 8f53e1ee6ef0881cde5f78d92839407943957b58 (diff) | |
* xterm.c (XTread_socket): Never treat a modifier key as a
non_ascii_keystroke.
| -rw-r--r-- | src/xterm.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/xterm.c b/src/xterm.c index 8dd20f542c..f64b2fa83d 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -2893,22 +2893,22 @@ XTread_socket (sd, bufp, numchars, waitp, expected) if (numchars > 1) { - if ((keysym >= XK_BackSpace && keysym <= XK_Escape) - || keysym == XK_Delete - || IsCursorKey (keysym) /* 0xff50 <= x < 0xff60 */ - || IsMiscFunctionKey (keysym) /* 0xff60 <= x < VARIES */ + if (((keysym >= XK_BackSpace && keysym <= XK_Escape) + || keysym == XK_Delete + || IsCursorKey (keysym) /* 0xff50 <= x < 0xff60 */ + || IsMiscFunctionKey (keysym) /* 0xff60 <= x < VARIES */ #ifdef HPUX - /* This recognizes the "extended function keys". - It seems there's no cleaner way. - Test IsModifierKey to avoid handling mode_switch - incorrectly. */ - || (!IsModifierKey (orig_keysym) - && (unsigned) (keysym) >= XK_Select - && (unsigned)(keysym) < XK_KP_Space) + /* This recognizes the "extended function keys". + It seems there's no cleaner way. + Test IsModifierKey to avoid handling mode_switch + incorrectly. */ + || ((unsigned) (keysym) >= XK_Select + && (unsigned)(keysym) < XK_KP_Space) #endif - || IsKeypadKey (keysym) /* 0xff80 <= x < 0xffbe */ - || IsFunctionKey (keysym) /* 0xffbe <= x < 0xffe1 */ - || x_is_vendor_fkey (orig_keysym)) /* wherever */ + || IsKeypadKey (keysym) /* 0xff80 <= x < 0xffbe */ + || IsFunctionKey (keysym) /* 0xffbe <= x < 0xffe1 */ + || x_is_vendor_fkey (orig_keysym)) + && ! IsModifierKey (orig_keysym)) /* wherever */ { if (temp_index == sizeof temp_buffer / sizeof (short)) temp_index = 0; |