The style inquisition was here again.

[st.git] / st.c

diff --git a/st.c b/st.c
index 8bf9337..dbbc1f6 100644 (file)
--- a/st.c
+++ b/st.c
@@ -121,7 +121,8 @@ enum term_mode {
        MODE_REVERSE     = 128,
        MODE_KBDLOCK     = 256,
        MODE_HIDE        = 512,
-       MODE_ECHO        = 1024
+       MODE_ECHO        = 1024,
+       MODE_APPCURSOR   = 2048
 };
 
 enum escape_state {
@@ -227,6 +228,10 @@ typedef struct {
        KeySym k;
        uint mask;
        char s[ESC_BUF_SIZ];
+       /* three valued logic variables: 0 indifferent, 1 on, -1 off */
+       signed char appkey;             /* application keypad */
+       signed char appcursor;          /* application cursor */
+       signed char crlf;               /* crlf mode          */
 } Key;
 
 /* TODO: use better name for vars... */
@@ -260,6 +265,7 @@ typedef struct {
 
 /* function definitions used in config.h */
 static void xzoom(const Arg *);
+static void selpaste(const Arg *);
 
 /* Config.h for applying patches and the configuration. */
 #include "config.h"
@@ -359,7 +365,6 @@ static void selrequest(XEvent *);
 static void selinit(void);
 static inline bool selected(int, int);
 static void selcopy(void);
-static void selpaste(void);
 static void selscroll(int, int);
 
 static int utf8decode(char *, long *);
@@ -749,7 +754,7 @@ selnotify(XEvent *e) {
 }
 
 void
-selpaste(void) {
+selpaste(const Arg *dummy) {
        XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY,
                        xw.win, CurrentTime);
 }
@@ -820,7 +825,7 @@ brelease(XEvent *e) {
        }
 
        if(e->xbutton.button == Button2) {
-               selpaste();
+               selpaste(NULL);
        } else if(e->xbutton.button == Button1) {
                sel.mode = 0;
                getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
@@ -1471,7 +1476,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        switch(*args) {
                                break;
                        case 1: /* DECCKM -- Cursor key */
-                               MODBIT(term.mode, set, MODE_APPKEYPAD);
+                               MODBIT(term.mode, set, MODE_APPCURSOR);
                                break;
                        case 5: /* DECSCNM -- Reverse video */
                                mode = term.mode;
@@ -2685,17 +2690,33 @@ focus(XEvent *ev) {
 
 char*
 kmap(KeySym k, uint state) {
-       int i;
        uint mask;
+       Key *kp;
 
        state &= ~Mod2Mask;
-       for(i = 0; i < LEN(key); i++) {
-               mask = key[i].mask;
+       for(kp = key; kp < key + LEN(key); kp++) {
+               mask = kp->mask;
 
-               if(key[i].k == k && ((state & mask) == mask
-                               || (mask == XK_NO_MOD && !state))) {
-                       return (char*)key[i].s;
+               if(kp->k != k)
+                       continue;
+               if((state & mask) != mask &&
+                               (mask == XK_NO_MOD && state)) {
+                       continue;
                }
+               if((kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) ||
+                               (kp->appkey > 0 && !IS_SET(MODE_APPKEYPAD))) {
+                       continue;
+               }
+               if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
+                               (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))) {
+                       continue;
+               }
+               if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
+                               (kp->crlf > 0 && !IS_SET(MODE_CRLF))) {
+                       continue;
+               }
+
+               return kp->s;
        }
        return NULL;
 }
@@ -2705,14 +2726,12 @@ kpress(XEvent *ev) {
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;
        char xstr[31], buf[32], *customkey, *cp = buf;
-       int len, meta, shift, i;
+       int len, i;
        Status status;
 
        if (IS_SET(MODE_KBDLOCK))
                return;
 
-       meta = e->state & Mod1Mask;
-       shift = e->state & ShiftMask;
        len = XmbLookupString(xw.xic, e, xstr, sizeof(xstr), &ksym, &status);
 
        /* 1. shortcuts */
@@ -2731,47 +2750,16 @@ kpress(XEvent *ev) {
                memcpy(buf, customkey, len);
        /* 2. hardcoded (overrides X lookup) */
        } else {
-               switch(ksym) {
-               case XK_Up:
-               case XK_Down:
-               case XK_Left:
-               case XK_Right:
-                       /* XXX: shift up/down doesn't work */
-                       sprintf(buf, "\033%c%c",
-                               IS_SET(MODE_APPKEYPAD) ? 'O' : '[',
-                               (shift ? "dacb":"DACB")[ksym - XK_Left]);
-                       len = 3;
-                       break;
-               case XK_Insert:
-                       if(shift) {
-                               selpaste();
-                               return;
-                       }
-                       memcpy(buf, xstr, len);
-                       break;
-               case XK_Return:
-                       len = 0;
-                       if(meta)
-                               *cp++ = '\033', len++;
-
-                       *cp++ = '\r', len++;
-
-                       if(IS_SET(MODE_CRLF))
-                               *cp = '\n', len++;
-                       break;
-                       /* 3. X lookup  */
-               default:
-                       if(len == 0)
-                               return;
+               if(len == 0)
+                       return;
 
-                       if (len == 1 && meta)
-                               *cp++ = '\033';
+               if (len == 1 && e->state & Mod1Mask)
+                       *cp++ = '\033';
 
-                       memcpy(cp, xstr, len);
-                       len = cp - buf + len;
-                       break;
-               }
+               memcpy(cp, xstr, len);
+               len = cp - buf + len;
        }
+
        ttywrite(buf, len);
        if(IS_SET(MODE_ECHO))
                techo(buf, len);
@@ -2886,7 +2874,7 @@ main(int argc, char *argv[]) {
                                opt_class = argv[i];
                        break;
                case 'e':
-                       /* eat every remaining arguments */
+                       /* eat all remaining arguments */
                        if(++i < argc)
                                opt_cmd = &argv[i];
                        goto run;
@@ -2941,6 +2929,7 @@ run:
        ttynew();
        selinit();
        run();
+
        return 0;
 }