From: mogami <mogami@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Mon, 29 Mar 2004 15:45:19 +0000 (+0000)
Subject: revision 1.27の変更を取り消した。
X-Git-Tag: v2.1.2~524
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=355c1dab8e52f0788aa5f9068b7e1a9da8717f0b;p=hengbandforosx%2Fhengbandosx.git

revision 1.27の変更を取り消した。
マクロトリガのmod2-はLinuxではNumlockだから邪魔なだけだが、
MacOSXではalt(あるいはoption,command等)になっていた為。
---

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);
 	}