From 355c1dab8e52f0788aa5f9068b7e1a9da8717f0b Mon Sep 17 00:00:00 2001 From: mogami Date: Mon, 29 Mar 2004 15:45:19 +0000 Subject: [PATCH] =?utf8?q?revision=201.27=E3=81=AE=E5=A4=89=E6=9B=B4?= =?utf8?q?=E3=82=92=E5=8F=96=E3=82=8A=E6=B6=88=E3=81=97=E3=81=9F=E3=80=82?= =?utf8?q?=20=E3=83=9E=E3=82=AF=E3=83=AD=E3=83=88=E3=83=AA=E3=82=AC?= =?utf8?q?=E3=81=AEmod2-=E3=81=AFLinux=E3=81=A7=E3=81=AFNumlock=E3=81=A0?= =?utf8?q?=E3=81=8B=E3=82=89=E9=82=AA=E9=AD=94=E3=81=AA=E3=81=A0=E3=81=91?= =?utf8?q?=E3=81=A0=E3=81=8C=E3=80=81=20MacOSX=E3=81=A7=E3=81=AFalt(?= =?utf8?q?=E3=81=82=E3=82=8B=E3=81=84=E3=81=AFoption,command=E7=AD=89)?= =?utf8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E7=82=BA?= =?utf8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/main-x11.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main-x11.c b/src/main-x11.c index fb6b9ecfb..3fccd1cc4 100644 --- a/src/main-x11.c +++ b/src/main-x11.c @@ -1830,7 +1830,7 @@ static x11_selection_type s_ptr[1]; */ static void react_keypress(XKeyEvent *xev) { - int i, n, mc, ms, mo; + int i, n, mc, ms, mo, mx; uint ks1; @@ -1888,10 +1888,11 @@ static void react_keypress(XKeyEvent *xev) mc = (ev->state & ControlMask) ? TRUE : FALSE; ms = (ev->state & ShiftMask) ? TRUE : FALSE; mo = (ev->state & Mod1Mask) ? TRUE : FALSE; + mx = (ev->state & Mod2Mask) ? TRUE : FALSE; /* Normal keys with no modifiers */ - if (n && !mo && !IsSpecialKey(ks)) + if (n && !mo && !mx && !IsSpecialKey(ks)) { /* Enqueue the normal key(s) */ for (i = 0; buf[i]; i++) Term_keypress(buf[i]); @@ -1938,18 +1939,18 @@ static void react_keypress(XKeyEvent *xev) /* Hack -- Use the KeySym */ if (ks) { - sprintf(msg, "%c%s%s%s_%lX%c", 31, + sprintf(msg, "%c%s%s%s%s_%lX%c", 31, mc ? "N" : "", ms ? "S" : "", - mo ? "O" : "", + mo ? "O" : "", mx ? "M" : "", (unsigned long)(ks), 13); } /* Hack -- Use the Keycode */ else { - sprintf(msg, "%c%s%s%sK_%X%c", 31, + sprintf(msg, "%c%s%s%s%sK_%X%c", 31, mc ? "N" : "", ms ? "S" : "", - mo ? "O" : "", + mo ? "O" : "", mx ? "M" : "", ev->keycode, 13); } -- 2.11.0