simplify version format.

[st.git] / st.c

diff --git a/st.c b/st.c
index 7ac02b9..6594aa3 100644 (file)
--- a/st.c
+++ b/st.c
@@ -34,7 +34,7 @@
 #endif
 
 #define USAGE \
 #endif
 
 #define USAGE \

-       "st-" VERSION ", (c) 2010-2011 st engineers\n" \
+       "st " VERSION " (c) 2010-2011 st engineers\n" \

        "usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n"
 
 /* XEMBED messages */
        "usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n"
 
 /* XEMBED messages */


@@ -47,6 +47,8 @@
 #define ESC_ARG_SIZ   16
 #define DRAW_BUF_SIZ  1024
 #define UTF_SIZ       4
 #define ESC_ARG_SIZ   16
 #define DRAW_BUF_SIZ  1024
 #define UTF_SIZ       4

+#define XK_NO_MOD     UINT_MAX
+#define XK_ANY_MOD    0

 
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))


@@ -235,6 +237,7 @@ static void selinit(void);
 static inline int selected(int, int);
 static void selcopy(void);
 static void selpaste();
 static inline int selected(int, int);
 static void selcopy(void);
 static void selpaste();

+static void selscroll(int, int);

 
 static int utf8decode(char *, long *);
 static int utf8encode(long *, char *);
 
 static int utf8decode(char *, long *);
 static int utf8encode(long *, char *);


@@ -804,6 +807,8 @@ tscrolldown(int orig, int n) {
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;
        }
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;
        }

+
+       selscroll(orig, n);

 }
 
 void
 }
 
 void


@@ -819,6 +824,31 @@ tscrollup(int orig, int n) {
                 term.line[i] = term.line[i+n];
                 term.line[i+n] = temp;
        }
                 term.line[i] = term.line[i+n];
                 term.line[i+n] = temp;
        }

+
+       selscroll(orig, -n);
+}
+
+void
+selscroll(int orig, int n) {
+       if(sel.bx == -1)
+               return;
+       
+       if(BETWEEN(sel.by, orig, term.bot) || BETWEEN(sel.ey, orig, term.bot)) {
+               if((sel.by += n) > term.bot || (sel.ey += n) < term.top) {
+                       sel.bx = -1;
+                       return;
+               }
+               if(sel.by < term.top) {
+                       sel.by = term.top;
+                       sel.bx = 0;
+               }
+               if(sel.ey > term.bot) {
+                       sel.ey = term.bot;
+                       sel.ex = term.col;
+               }
+               sel.b.y = sel.by, sel.b.x = sel.bx;
+               sel.e.y = sel.ey, sel.e.x = sel.ex;
+       }

 }
 
 void
 }
 
 void


@@ -1075,6 +1105,7 @@ csihandle(void) {
                break;
        /* XXX: (CSI n I) CHT -- Cursor Forward Tabulation <n> tab stops */
        case 'J': /* ED -- Clear screen */
                break;
        /* XXX: (CSI n I) CHT -- Cursor Forward Tabulation <n> tab stops */
        case 'J': /* ED -- Clear screen */

+               sel.bx = -1;

                switch(escseq.arg[0]) {
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                switch(escseq.arg[0]) {
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);


@@ -1380,6 +1411,7 @@ tputc(char *c) {
                        }
                }
        } else {
                        }
                }
        } else {

+               if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey)) sel.bx = -1;

                switch(ascii) {
                case '\t':
                        tputtab();
                switch(ascii) {
                case '\t':
                        tputtab();


@@ -1840,9 +1872,12 @@ focus(XEvent *ev) {
 char*
 kmap(KeySym k, unsigned int state) {
        int i;
 char*
 kmap(KeySym k, unsigned int state) {
        int i;

-       for(i = 0; i < LEN(key); i++)
-               if(key[i].k == k && (key[i].mask == 0 || key[i].mask & state))
+       state &= ~Mod2Mask;
+       for(i = 0; i < LEN(key); i++) {
+               unsigned int mask = key[i].mask;
+               if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state)))

                        return (char*)key[i].s;
                        return (char*)key[i].s;

+       }

        return NULL;
 }
 
        return NULL;
 }