[Qemacs-commit] qemacs qe.h qe.c shell.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        14/01/07 14:44:23

Modified files:
        .              : qe.h qe.c shell.c 

Log message:
        add support for CTRL('c') as command prefix
        
        * add KEY_CTRLC(x) as compressed key combination
        * bind shell-interrupt to C-c C-c

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/qemacs/shell.c?cvsroot=qemacs&r1=1.74&r2=1.75

Patches:
Index: qe.h
===================================================================
RCS file: /sources/qemacs/qemacs/qe.h,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- qe.h        6 Jan 2014 10:24:26 -0000       1.110
+++ qe.h        7 Jan 2014 14:44:23 -0000       1.111
@@ -549,6 +549,7 @@
 #define KEY_CTRLX(c)    ((c) | 0xe200)
 #define KEY_CTRLXRET(c) ((c) | 0xe300)
 #define KEY_CTRLH(c)    ((c) | 0xe500)
+#define KEY_CTRLC(c)    ((c) | 0xe600)
 #define KEY_SPECIAL(c)  (((c) >= 0xe000 && (c) < 0xf000) || ((c) >= 0 && (c) < 
32) || (c) == 127)
 
 #define KEY_NONE        0xffff

Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- qe.c        7 Jan 2014 14:34:17 -0000       1.113
+++ qe.c        7 Jan 2014 14:44:23 -0000       1.114
@@ -228,6 +228,10 @@
     if (key >= KEY_CTRLH(0) && key <= KEY_CTRLH(0xff)) {
         keys[nb_keys++] = KEY_CTRL('h');
         keys[nb_keys++] = key & 0xff;
+    } else
+    if (key >= KEY_CTRLC(0) && key <= KEY_CTRLC(0xff)) {
+        keys[nb_keys++] = KEY_CTRL('c');
+        keys[nb_keys++] = key & 0xff;
     } else {
         keys[nb_keys++] = key;
     }
@@ -262,7 +266,8 @@
 
     /* add default bindings */
     for (d = cmds; d->name != NULL; d++) {
-        if (d->key == KEY_CTRL('x') || d->key == KEY_ESC) {
+        if (d->key == KEY_CTRL('x') || d->key == KEY_CTRL('c')
+        ||  d->key == KEY_ESC) {
             unsigned int keys[2];
             keys[0] = d->key;
             keys[1] = d->alt_key;

Index: shell.c
===================================================================
RCS file: /sources/qemacs/qemacs/shell.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- shell.c     6 Jan 2014 09:40:21 -0000       1.74
+++ shell.c     7 Jan 2014 14:44:23 -0000       1.75
@@ -1830,7 +1830,7 @@
     /* CG: should send s->kbs */
     CMD1( KEY_DEL, KEY_NONE,
           "shell-backward-delete-char", shell_write_char, KEY_DEL)
-    CMD1( KEY_CTRL('c'), KEY_NONE,
+    CMD1( KEY_CTRLC(KEY_CTRL('c')), KEY_NONE,   /* C-c C-c */
           "shell-intr", shell_write_char, 3)
     CMD1( KEY_CTRL('d'), KEY_DELETE,
           "shell-delete-char", shell_write_char, 4)