[Qemacs-commit] qemacs x11.c Makefile

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        16/06/11 15:55:46

Modified files:
        .              : x11.c Makefile 

Log message:
        x11 patches
        
        - merged patches by Clemmit Sigler
        - handle shifted keys in x11 mode
        - install xqe if CONFIG_X11

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/x11.c?cvsroot=qemacs&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/qemacs/Makefile?cvsroot=qemacs&r1=1.88&r2=1.89

Patches:
Index: x11.c
===================================================================
RCS file: /sources/qemacs/qemacs/x11.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- x11.c       7 Mar 2016 10:35:23 -0000       1.40
+++ x11.c       11 Jun 2016 15:55:46 -0000      1.41
@@ -1419,8 +1419,14 @@
 #endif
             if (shift) {
                 switch (keysym) {
-                case XK_ISO_Left_Tab: key = KEY_SHIFT_TAB; goto got_key;
+                case XK_ISO_Left_Tab:
+                    key = KEY_SHIFT_TAB; 
+                    goto got_key;
                 default:
+                    if (len > 0) {
+                        key = buf[0] & 0xff;
+                        goto got_key;
+                    }
                     break;
                 }
             } else

Index: Makefile
===================================================================
RCS file: /sources/qemacs/qemacs/Makefile,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- Makefile    8 Jun 2016 00:35:04 -0000       1.88
+++ Makefile    11 Jun 2016 15:55:46 -0000      1.89
@@ -166,7 +166,7 @@
   ifdef CONFIG_XSHM
     XLIBS += -lXext
   endif
-  XLIBS += -lX11
+  XLIBS += -lX11 -ldl
   XLDFLAGS := $(LDFLAGS)
   ifdef CONFIG_DARWIN
     XLDFLAGS += -L/opt/X11/lib/
@@ -460,8 +460,16 @@
        $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin
        $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
        $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/qe
+ifdef CONFIG_X11
+       $(INSTALL) -m 755 -s xqe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
+else
+  ifdef CONFIG_TINY
+       $(INSTALL) -m 755 -s tqe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
+  else
        $(INSTALL) -m 755 -s qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
-       ln -sf qemacs $(DESTDIR)$(prefix)/bin/qe$(EXE)
+  endif
+endif
+       ln -sf qemacs$(EXE) $(DESTDIR)$(prefix)/bin/qe$(EXE)
 ifdef CONFIG_FFMPEG
        ln -sf qemacs$(EXE) $(DESTDIR)$(prefix)/bin/ffplay$(EXE)
 endif