Fix selecting clearing and BCE

[st.git] / st.c

diff --git a/st.c b/st.c
index 71e5b83..92854b4 100644 (file)
--- a/st.c
+++ b/st.c
@@ -36,6 +36,7 @@ char *argv0;
 #define Draw XftDraw *
 #define Colour XftColor
 #define Colourmap Colormap
 #define Draw XftDraw *
 #define Colour XftColor
 #define Colourmap Colormap

+#define Rectangle XRectangle

 
 #if   defined(__linux)
  #include <pty.h>
 
 #if   defined(__linux)
  #include <pty.h>


@@ -114,6 +115,7 @@ enum term_mode {
        MODE_ECHO        = 1024,
        MODE_APPCURSOR   = 2048,
        MODE_MOUSESGR    = 4096,
        MODE_ECHO        = 1024,
        MODE_APPCURSOR   = 2048,
        MODE_MOUSESGR    = 4096,

+       MODE_8BIT        = 8192,

 };
 
 enum escape_state {
 };
 
 enum escape_state {


@@ -1408,7 +1410,7 @@ tsetchar(char *c, Glyph *attr, int x, int y) {
 
 void
 tclearregion(int x1, int y1, int x2, int y2) {
 
 void
 tclearregion(int x1, int y1, int x2, int y2) {

-       int x, y, temp;
+       int x, y, temp, mask;

 
        if(x1 > x2)
                temp = x1, x1 = x2, x2 = temp;
 
        if(x1 > x2)
                temp = x1, x1 = x2, x2 = temp;


@@ -1423,7 +1425,9 @@ tclearregion(int x1, int y1, int x2, int y2) {
        for(y = y1; y <= y2; y++) {
                term.dirty[y] = 1;
                for(x = x1; x <= x2; x++) {
        for(y = y1; y <= y2; y++) {
                term.dirty[y] = 1;
                for(x = x1; x <= x2; x++) {

+                       mask = selected(x, y) ? ATTR_REVERSE : 0;

                        term.line[y][x] = term.c.attr;
                        term.line[y][x] = term.c.attr;

+                       term.line[y][x].mode ^= mask;

                        memcpy(term.line[y][x].c, " ", 2);
                }
        }
                        memcpy(term.line[y][x].c, " ", 2);
                }
        }


@@ -1650,6 +1654,9 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        case 1006:
                                MODBIT(term.mode, set, MODE_MOUSESGR);
                                break;
                        case 1006:
                                MODBIT(term.mode, set, MODE_MOUSESGR);
                                break;

+                       case 1034:
+                               MODBIT(term.mode, set, MODE_8BIT);
+                               break;

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


@@ -2760,6 +2767,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        FcCharSet *fccharset;
        Colour *fg, *bg, *temp, revfg, revbg;
        XRenderColor colfg, colbg;
        FcCharSet *fccharset;
        Colour *fg, *bg, *temp, revfg, revbg;
        XRenderColor colfg, colbg;

+       Rectangle r;

 
        frcflags = FRC_NORMAL;
 
 
        frcflags = FRC_NORMAL;
 


@@ -2848,6 +2856,13 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        /* Clean up the region we want to draw to. */
        XftDrawRect(xw.draw, bg, winx, winy, width, xw.ch);
 
        /* Clean up the region we want to draw to. */
        XftDrawRect(xw.draw, bg, winx, winy, width, xw.ch);
 

+       /* Set the clip region because Xft is sometimes dirty. */
+       r.x = 0;
+       r.y = 0;
+       r.height = xw.ch;
+       r.width = width;
+       XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
+

        fcsets[0] = font->set;
        for(xp = winx; bytelen > 0;) {
                /*
        fcsets[0] = font->set;
        for(xp = winx; bytelen > 0;) {
                /*


@@ -2881,6 +2896,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                                                        (FcChar8 *)u8fs,
                                                        u8fblen);
                                        xp += font->width * u8fl;
                                                        (FcChar8 *)u8fs,
                                                        u8fblen);
                                        xp += font->width * u8fl;

+

                                }
                                break;
                        }
                                }
                                break;
                        }


@@ -2965,6 +2981,9 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,
                                width, 1);
        }
                XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,
                                width, 1);
        }

+
+       /* Reset clip to none. */
+       XftDrawSetClip(xw.draw, 0);

 }
 
 void
 }
 
 void


@@ -3228,7 +3247,8 @@ kpress(XEvent *ev) {
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;
        char xstr[31], buf[32], *customkey, *cp = buf;
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;
        char xstr[31], buf[32], *customkey, *cp = buf;

-       int len;
+       int len, ret;
+       long c;

        Status status;
        Shortcut *bp;
 
        Status status;
        Shortcut *bp;
 


@@ -3249,13 +3269,23 @@ kpress(XEvent *ev) {
        if((customkey = kmap(ksym, e->state))) {
                len = strlen(customkey);
                memcpy(buf, customkey, len);
        if((customkey = kmap(ksym, e->state))) {
                len = strlen(customkey);
                memcpy(buf, customkey, len);

-       /* 2. hardcoded (overrides X lookup) */
+       /* 3. hardcoded (overrides X lookup) */

        } else {
                if(len == 0)
                        return;
 
        } else {
                if(len == 0)
                        return;
 

-               if(len == 1 && e->state & Mod1Mask)
-                       *cp++ = '\033';
+               if(len == 1 && e->state & Mod1Mask) {
+                       if(IS_SET(MODE_8BIT)) {
+                               if(*xstr < 0177) {
+                                       c = *xstr | B7;
+                                       ret = utf8encode(&c, cp);
+                                       cp += ret;
+                                       len = 0;
+                               }
+                       } else {
+                               *cp++ = '\033';
+                       }
+               }

 
                memcpy(cp, xstr, len);
                len = cp - buf + len;
 
                memcpy(cp, xstr, len);
                len = cp - buf + len;