Tmux wants this to be mutually exclusive.

[st.git] / st.c

diff --git a/st.c b/st.c
index 6749dbd..8206001 100644 (file)
--- a/st.c
+++ b/st.c
@@ -117,7 +117,8 @@ enum term_mode {
        MODE_KBDLOCK     = 256,
        MODE_HIDE        = 512,
        MODE_ECHO        = 1024,
        MODE_KBDLOCK     = 256,
        MODE_HIDE        = 512,
        MODE_ECHO        = 1024,

-       MODE_APPCURSOR   = 2048
+       MODE_APPCURSOR   = 2048,
+       MODE_MOUSESGR    = 4096,

 };
 
 enum escape_state {
 };
 
 enum escape_state {


@@ -666,11 +667,10 @@ getbuttoninfo(XEvent *e) {
 
 void
 mousereport(XEvent *e) {
 
 void
 mousereport(XEvent *e) {

-       int x = x2col(e->xbutton.x);
-       int y = y2row(e->xbutton.y);
-       int button = e->xbutton.button;
-       int state = e->xbutton.state;
-       char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 };
+       int x = x2col(e->xbutton.x), y = y2row(e->xbutton.y),
+           button = e->xbutton.button, state = e->xbutton.state,
+           len;
+       char buf[40];

        static int ob, ox, oy;
 
        /* from urxvt */
        static int ob, ox, oy;
 
        /* from urxvt */


@@ -679,7 +679,9 @@ mousereport(XEvent *e) {
                        return;
                button = ob + 32;
                ox = x, oy = y;
                        return;
                button = ob + 32;
                ox = x, oy = y;

-       } else if(e->xbutton.type == ButtonRelease || button == AnyButton) {
+       } else if(!IS_SET(MODE_MOUSESGR)
+                       && (e->xbutton.type == ButtonRelease
+                               || button == AnyButton)) {

                button = 3;
        } else {
                button -= Button1;
                button = 3;
        } else {
                button -= Button1;


@@ -691,11 +693,23 @@ mousereport(XEvent *e) {
                }
        }
 
                }
        }
 

-       buf[3] = 32 + button + (state & ShiftMask ? 4 : 0)
+       button += (state & ShiftMask   ? 4  : 0)

                + (state & Mod4Mask    ? 8  : 0)
                + (state & ControlMask ? 16 : 0);
 
                + (state & Mod4Mask    ? 8  : 0)
                + (state & ControlMask ? 16 : 0);
 

-       ttywrite(buf, sizeof(buf));
+       len = 0;
+       if(IS_SET(MODE_MOUSESGR)) {
+               len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
+                               button, x+1, y+1,
+                               e->xbutton.type == ButtonRelease ? 'm' : 'M');
+       } else if(x < 223 && y < 223) {
+               len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
+                               32+button, 32+x+1, 32+y+1);
+       } else {
+               return;
+       }
+
+       ttywrite(buf, len);

 }
 
 void
 }
 
 void


@@ -1405,7 +1419,8 @@ tsetattr(int *attr, int l) {
                case 4:
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
                case 4:
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;

-               case 5:
+               case 5: /* slow blink */
+               case 6: /* rapid blink */

                        term.c.attr.mode |= ATTR_BLINK;
                        break;
                case 7:
                        term.c.attr.mode |= ATTR_BLINK;
                        break;
                case 7:


@@ -1422,6 +1437,7 @@ tsetattr(int *attr, int l) {
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
                case 25:
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
                case 25:

+               case 26:

                        term.c.attr.mode &= ~ATTR_BLINK;
                        break;
                case 27:
                        term.c.attr.mode &= ~ATTR_BLINK;
                        break;
                case 27:


@@ -1541,9 +1557,14 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                break;
                        case 1000: /* 1000,1002: enable xterm mouse report */
                                MODBIT(term.mode, set, MODE_MOUSEBTN);
                                break;
                        case 1000: /* 1000,1002: enable xterm mouse report */
                                MODBIT(term.mode, set, MODE_MOUSEBTN);

+                               MODBIT(term.mode, 0, MODE_MOUSEMOTION);

                                break;
                        case 1002:
                                MODBIT(term.mode, set, MODE_MOUSEMOTION);
                                break;
                        case 1002:
                                MODBIT(term.mode, set, MODE_MOUSEMOTION);

+                               MODBIT(term.mode, 0, MODE_MOUSEBTN);
+                               break;
+                       case 1006:
+                               MODBIT(term.mode, set, MODE_MOUSESGR);

                                break;
                        case 1049: /* = 1047 and 1048 */
                        case 47:
                                break;
                        case 1049: /* = 1047 and 1048 */
                        case 47:


@@ -1724,8 +1745,8 @@ csihandle(void) {
                break;
        case 'X': /* ECH -- Erase <n> char */
                DEFAULT(csiescseq.arg[0], 1);
                break;
        case 'X': /* ECH -- Erase <n> char */
                DEFAULT(csiescseq.arg[0], 1);

-               tclearregion(term.c.x, term.c.y, term.c.x + csiescseq.arg[0],
-                               term.c.y, 0);
+               tclearregion(term.c.x, term.c.y,
+                               term.c.x + csiescseq.arg[0] - 1, term.c.y, 1);

                break;
        case 'P': /* DCH -- Delete <n> char */
                DEFAULT(csiescseq.arg[0], 1);
                break;
        case 'P': /* DCH -- Delete <n> char */
                DEFAULT(csiescseq.arg[0], 1);


@@ -2187,9 +2208,11 @@ tresize(int col, int row) {
        /* free unneeded rows */
        i = 0;
        if(slide > 0) {
        /* free unneeded rows */
        i = 0;
        if(slide > 0) {

-               /* slide screen to keep cursor where we expect it -
+               /*
+                * slide screen to keep cursor where we expect it -

                 * tscrollup would work here, but we can optimize to
                 * tscrollup would work here, but we can optimize to

-                * memmove because we're freeing the earlier lines */
+                * memmove because we're freeing the earlier lines
+                */

                for(/* i = 0 */; i < slide; i++) {
                        free(term.line[i]);
                        free(term.alt[i]);
                for(/* i = 0 */; i < slide; i++) {
                        free(term.line[i]);
                        free(term.alt[i]);


@@ -2254,7 +2277,7 @@ xresize(int col, int row) {
                XFreePixmap(xw.dpy, xw.buf);
                xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
                                DefaultDepth(xw.dpy, xw.scr));
                XFreePixmap(xw.dpy, xw.buf);
                xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
                                DefaultDepth(xw.dpy, xw.scr));

-               XSetForeground(xw.dpy, dc.gc, 0);
+               XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg].pixel);

                XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
        }
 
                XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
        }
 


@@ -2419,7 +2442,9 @@ xloadfonts(char *fontstr, int fontsize) {
        xw.cw = dc.font.width;
        xw.ch = dc.font.height;
 
        xw.cw = dc.font.width;
        xw.ch = dc.font.height;
 

+       FcPatternDel(pattern, FC_SLANT);

        FcPatternDel(pattern, FC_WEIGHT);
        FcPatternDel(pattern, FC_WEIGHT);

+       FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);

        FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
        if(xloadfont(&dc.bfont, pattern))
                die("st: can't open font %s\n", fontstr);
        FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
        if(xloadfont(&dc.bfont, pattern))
                die("st: can't open font %s\n", fontstr);


@@ -2430,6 +2455,7 @@ xloadfonts(char *fontstr, int fontsize) {
                die("st: can't open font %s\n", fontstr);
 
        FcPatternDel(pattern, FC_WEIGHT);
                die("st: can't open font %s\n", fontstr);
 
        FcPatternDel(pattern, FC_WEIGHT);

+       FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_MEDIUM);

        if(xloadfont(&dc.ifont, pattern))
                die("st: can't open font %s\n", fontstr);
 
        if(xloadfont(&dc.ifont, pattern))
                die("st: can't open font %s\n", fontstr);
 


@@ -2437,8 +2463,7 @@ xloadfonts(char *fontstr, int fontsize) {
 }
 
 void
 }
 
 void

-xunloadfonts(void)
-{
+xunloadfonts(void) {

        int i, ip;
 
        /*
        int i, ip;
 
        /*


@@ -2468,8 +2493,7 @@ xunloadfonts(void)
 }
 
 void
 }
 
 void

-xzoom(const Arg *arg)
-{
+xzoom(const Arg *arg) {

        xunloadfonts();
        xloadfonts(usedfont, usedfontsize + arg->i);
        cresize(0, 0);
        xunloadfonts();
        xloadfonts(usedfont, usedfontsize + arg->i);
        cresize(0, 0);


@@ -2479,6 +2503,7 @@ xzoom(const Arg *arg)
 void
 xinit(void) {
        XSetWindowAttributes attrs;
 void
 xinit(void) {
        XSetWindowAttributes attrs;

+       XGCValues gcvalues;

        Cursor cursor;
        Window parent;
        int sw, sh, major, minor;
        Cursor cursor;
        Window parent;
        int sw, sh, major, minor;


@@ -2544,10 +2569,13 @@ xinit(void) {
                usedbe = True;
        } else {
        */
                usedbe = True;
        } else {
        */

-               dc.gc = XCreateGC(xw.dpy, parent, 0, 0);
+               memset(&gcvalues, 0, sizeof(gcvalues));
+               gcvalues.graphics_exposures = False;
+               dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
+                               &gcvalues);

                xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
                                DefaultDepth(xw.dpy, xw.scr));
                xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
                                DefaultDepth(xw.dpy, xw.scr));

-               XSetForeground(xw.dpy, dc.gc, 0);
+               XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);

                XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
                //xw.buf = xw.win;
        /*
                XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
                //xw.buf = xw.win;
        /*


@@ -2871,8 +2899,7 @@ draw(void) {
        } else {
                XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w,
                                xw.h, 0, 0);
        } else {
                XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w,
                                xw.h, 0, 0);

-               XSetForeground(xw.dpy, dc.gc, 0);
-               XSync(xw.dpy, False);
+               XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg].pixel);

        }
 }
 
        }
 }
 


@@ -2964,6 +2991,11 @@ xseturgency(int add) {
 
 void
 focus(XEvent *ev) {
 
 void
 focus(XEvent *ev) {

+       XFocusChangeEvent *e = &ev->xfocus;
+
+       if(e->mode == NotifyGrab)
+               return;
+

        if(ev->type == FocusIn) {
                XSetICFocus(xw.xic);
                xw.state |= WIN_FOCUSED;
        if(ev->type == FocusIn) {
                XSetICFocus(xw.xic);
                xw.state |= WIN_FOCUSED;


@@ -3087,8 +3119,10 @@ kpress(XEvent *ev) {
 
 void
 cmessage(XEvent *e) {
 
 void
 cmessage(XEvent *e) {

-       /* See xembed specs
-          http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html */
+       /*
+        * See xembed specs
+        *  http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html
+        */

        if(e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
                if(e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
                        xw.state |= WIN_FOCUSED;
        if(e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
                if(e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
                        xw.state |= WIN_FOCUSED;


@@ -3104,8 +3138,7 @@ cmessage(XEvent *e) {
 }
 
 void
 }
 
 void

-cresize(int width, int height)
-{
+cresize(int width, int height) {

        int col, row;
 
        if(width != 0)
        int col, row;
 
        if(width != 0)