[Qemacs-commit] qemacs x11.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        14/02/10 01:57:36

Modified files:
        .              : x11.c 

Log message:
        use Command key as Meta in Darwin/X11

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/x11.c?cvsroot=qemacs&r1=1.34&r2=1.35

Patches:
Index: x11.c
===================================================================
RCS file: /sources/qemacs/qemacs/x11.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- x11.c       7 Feb 2014 15:56:20 -0000       1.34
+++ x11.c       10 Feb 2014 01:57:35 -0000      1.35
@@ -1400,9 +1400,11 @@
             shift = (xev.xkey.state & ShiftMask);
             ctrl = (xev.xkey.state & ControlMask);
             meta = (xev.xkey.state & Mod1Mask);
+            /* Also interpret Darwin's Command key as Meta */
+            meta |= (xev.xkey.state & Mod2Mask);
 #if 0
-            put_error(NULL, "keysym=%d %s%s%s len=%d buf[0]=%d",
-                      (int)keysym,
+            put_error(NULL, "keysym=%d %d %s%s%s len=%d buf[0]=%d",
+                      (int)keysym, (int)xev.xkey.state,
                       shift ? "shft " : "",
                       ctrl ? "ctrl " : "",
                       meta ? "meta " : "",