Xinqi Bao's Git

projects / st.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
Refactor xsetcolorname()
[st.git] / st.c
diff --git a/st.c b/st.c
index 3ed77e1..beae9bc 100644 (file)
--- a/st.c
+++ b/st.c
@@ -340,7 +340,7 @@ typedef struct {
 
 /* Drawing Context */
 typedef struct {
 
 /* Drawing Context */
 typedef struct {
-       Colour col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
+       Colour col[MAX(LEN(colorname), 256)];
        Font font, bfont, ifont, ibfont;
        GC gc;
 } DC;
        Font font, bfont, ifont, ibfont;
        GC gc;
 } DC;
@@ -392,7 +392,7 @@ static void tsetdirtattr(int);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);
 static void techo(char *, int);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);
 static void techo(char *, int);
-static bool tcontrolcode(uchar );
+static void tcontrolcode(uchar );
 static void tdectest(char );
 static int32_t tdefcolor(int *, int *, int);
 static void tdeftran(char);
 static void tdectest(char );
 static int32_t tdefcolor(int *, int *, int);
 static void tdeftran(char);
@@ -765,7 +765,7 @@ selsnap(int mode, int *x, int *y, int direction) {
 void
 getbuttoninfo(XEvent *e) {
        int type;
 void
 getbuttoninfo(XEvent *e) {
        int type;
-       uint state = e->xbutton.state &~Button1Mask;
+       uint state = e->xbutton.state & ~(Button1Mask | forceselmod);
 
        sel.alt = IS_SET(MODE_ALTSCREEN);
 
 
        sel.alt = IS_SET(MODE_ALTSCREEN);
 
@@ -829,6 +829,8 @@ mousereport(XEvent *e) {
                        /* MODE_MOUSEX10: no button release reporting */
                        if(IS_SET(MODE_MOUSEX10))
                                return;
                        /* MODE_MOUSEX10: no button release reporting */
                        if(IS_SET(MODE_MOUSEX10))
                                return;
+                       if (button == 64 || button == 65)
+                               return;
                }
        }
 
                }
        }
 
@@ -858,7 +860,7 @@ bpress(XEvent *e) {
        struct timeval now;
        Mousekey *mk;
 
        struct timeval now;
        Mousekey *mk;
 
-       if(IS_SET(MODE_MOUSE)) {
+       if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
                mousereport(e);
                return;
        }
@@ -949,7 +951,7 @@ getsel(void) {
                 * st.
                 * FIXME: Fix the computer world.
                 */
                 * st.
                 * FIXME: Fix the computer world.
                 */
-               if(y < sel.ne.y && x > 0 && !((gp-1)->mode & ATTR_WRAP))
+               if(y < sel.ne.y && !(x > 0 && (gp-1)->mode & ATTR_WRAP))
                        *ptr++ = '\n';
 
                /*
                        *ptr++ = '\n';
 
                /*
@@ -1090,7 +1092,7 @@ xsetsel(char *str) {
 
 void
 brelease(XEvent *e) {
 
 void
 brelease(XEvent *e) {
-       if(IS_SET(MODE_MOUSE)) {
+       if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
                mousereport(e);
                return;
        }
@@ -1113,7 +1115,7 @@ void
 bmotion(XEvent *e) {
        int oldey, oldex, oldsby, oldsey;
 
 bmotion(XEvent *e) {
        int oldey, oldex, oldsby, oldsey;
 
-       if(IS_SET(MODE_MOUSE)) {
+       if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
                mousereport(e);
                return;
        }
@@ -1837,7 +1839,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                if (!allowaltscreen)
                                        break;
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                if (!allowaltscreen)
                                        break;
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
-                               /* FALLTHRU */
+                               /* FALLTHROUGH */
                        case 47: /* swap screen */
                        case 1047:
                                if (!allowaltscreen)
                        case 47: /* swap screen */
                        case 1047:
                                if (!allowaltscreen)
@@ -1851,7 +1853,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                        tswapscreen();
                                if(*args != 1049)
                                        break;
                                        tswapscreen();
                                if(*args != 1049)
                                        break;
-                               /* FALLTRU */
+                               /* FALLTHROUGH */
                        case 1048:
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;
                        case 1048:
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;
@@ -2146,7 +2148,7 @@ strhandle(void) {
                        if(narg < 3)
                                break;
                        p = strescseq.args[2];
                        if(narg < 3)
                                break;
                        p = strescseq.args[2];
-                       /* fall through */
+                       /* FALLTHROUGH */
                case 104: /* color reset, here p = NULL */
                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
                        if (!xsetcolorname(j, p)) {
                case 104: /* color reset, here p = NULL */
                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
                        if (!xsetcolorname(j, p)) {
@@ -2328,26 +2330,26 @@ tdeftran(char ascii) {
                term.trantbl[term.icharset] = (*bp)[1];
 }
 
                term.trantbl[term.icharset] = (*bp)[1];
 }
 
-bool
+void
 tcontrolcode(uchar ascii) {
        static char question[UTF_SIZ] = "?";
 
        switch(ascii) {
        case '\t':   /* HT */
                tputtab(1);
 tcontrolcode(uchar ascii) {
        static char question[UTF_SIZ] = "?";
 
        switch(ascii) {
        case '\t':   /* HT */
                tputtab(1);
-               break;
+               return;
        case '\b':   /* BS */
                tmoveto(term.c.x-1, term.c.y);
        case '\b':   /* BS */
                tmoveto(term.c.x-1, term.c.y);
-               break;
+               return;
        case '\r':   /* CR */
                tmoveto(0, term.c.y);
        case '\r':   /* CR */
                tmoveto(0, term.c.y);
-               break;
+               return;
        case '\f':   /* LF */
        case '\v':   /* VT */
        case '\n':   /* LF */
                /* go to first col if the mode is set */
                tnewline(IS_SET(MODE_CRLF));
        case '\f':   /* LF */
        case '\v':   /* VT */
        case '\n':   /* LF */
                /* go to first col if the mode is set */
                tnewline(IS_SET(MODE_CRLF));
-               break;
+               return;
        case '\a':   /* BEL */
                if(term.esc & ESC_STR_END) {
                        /* backwards compatibility to xterm */
        case '\a':   /* BEL */
                if(term.esc & ESC_STR_END) {
                        /* backwards compatibility to xterm */
@@ -2363,13 +2365,13 @@ tcontrolcode(uchar ascii) {
                csireset();
                term.esc &= ~(ESC_CSI|ESC_ALTCHARSET|ESC_TEST);
                term.esc |= ESC_START;
                csireset();
                term.esc &= ~(ESC_CSI|ESC_ALTCHARSET|ESC_TEST);
                term.esc |= ESC_START;
-               return 1;
+               return;
        case '\016': /* SO */
                term.charset = 0;
        case '\016': /* SO */
                term.charset = 0;
-               break;
+               return;
        case '\017': /* SI */
                term.charset = 1;
        case '\017': /* SI */
                term.charset = 1;
-               break;
+               return;
        case '\032': /* SUB */
                tsetchar(question, &term.c.attr, term.c.x, term.c.y);
        case '\030': /* CAN */
        case '\032': /* SUB */
                tsetchar(question, &term.c.attr, term.c.x, term.c.y);
        case '\030': /* CAN */
@@ -2380,6 +2382,7 @@ tcontrolcode(uchar ascii) {
        case '\021': /* XON (IGNORED) */
        case '\023': /* XOFF (IGNORED) */
        case 0177:   /* DEL (IGNORED) */
        case '\021': /* XON (IGNORED) */
        case '\023': /* XOFF (IGNORED) */
        case 0177:   /* DEL (IGNORED) */
+               return;
        case 0x84:   /* TODO: IND */
        case 0x85:   /* TODO: NEL */
        case 0x88:   /* TODO: HTS */
        case 0x84:   /* TODO: IND */
        case 0x85:   /* TODO: NEL */
        case 0x88:   /* TODO: HTS */
@@ -2395,11 +2398,10 @@ tcontrolcode(uchar ascii) {
        case 0x9e:   /* TODO: PM */
        case 0x9f:   /* TODO: APC */
                break;
        case 0x9e:   /* TODO: PM */
        case 0x9f:   /* TODO: APC */
                break;
-       default:
-               return 0;
        }
        }
+       /* only CAN, SUB, \a and C1 chars interrupt a sequence */
        term.esc &= ~(ESC_STR_END|ESC_STR);
        term.esc &= ~(ESC_STR_END|ESC_STR);
-       return 1;
+       return;
 }
 
 void
 }
 
 void
@@ -2448,7 +2450,7 @@ tputc(char *c, int len) {
                   (ascii == '\a' || ascii == 030 ||
                    ascii == 032  || ascii == 033 ||
                    ISCONTROLC1(unicodep))) {
                   (ascii == '\a' || ascii == 030 ||
                    ascii == 032  || ascii == 033 ||
                    ISCONTROLC1(unicodep))) {
-                       term.esc &= ~ESC_STR;
+                       term.esc &= ~(ESC_START|ESC_STR);
                        term.esc |= ESC_STR_END;
                } else if(strescseq.len + len < sizeof(strescseq.buf) - 1) {
                        memmove(&strescseq.buf[strescseq.len], c, len);
                        term.esc |= ESC_STR_END;
                } else if(strescseq.len + len < sizeof(strescseq.buf) - 1) {
                        memmove(&strescseq.buf[strescseq.len], c, len);
@@ -2478,8 +2480,11 @@ tputc(char *c, int len) {
         * they must not cause conflicts with sequences.
         */
        if(control) {
         * they must not cause conflicts with sequences.
         */
        if(control) {
-               if (tcontrolcode(ascii))
-                       return;
+               tcontrolcode(ascii);
+               /*
+                * control codes are not shown ever
+                */
+               return;
        } else if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
        } else if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
@@ -2576,11 +2581,6 @@ tputc(char *c, int len) {
                 */
                return;
        }
                 */
                return;
        }
-       /*
-        * Display control codes only if we are in graphic mode
-        */
-       if(control && term.trantbl[term.charset] != CS_GRAPHIC0)
-               return;
        if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
                selclear(NULL);
 
        if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
                selclear(NULL);
 
@@ -2717,7 +2717,7 @@ sixd_to_16bit(int x) {
 
 void
 xloadcols(void) {
 
 void
 xloadcols(void) {
-       int i, r, g, b;
+       int i;
        XRenderColor color = { .alpha = 0xffff };
        static bool loaded;
        Colour *cp;
        XRenderColor color = { .alpha = 0xffff };
        static bool loaded;
        Colour *cp;
@@ -2727,7 +2727,7 @@ xloadcols(void) {
                        XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
        }
 
                        XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
        }
 
-       /* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */
+       /* load colours [0-15] and [256-LEN(colorname)] (config.h) */
        for(i = 0; i < LEN(colorname); i++) {
                if(!colorname[i])
                        continue;
        for(i = 0; i < LEN(colorname); i++) {
                if(!colorname[i])
                        continue;
@@ -2736,27 +2736,20 @@ xloadcols(void) {
                }
        }
 
                }
        }
 
-       /* load colors [16-255] ; same colors as xterm */
-       for(i = 16, r = 0; r < 6; r++) {
-               for(g = 0; g < 6; g++) {
-                       for(b = 0; b < 6; b++) {
-                               color.red = sixd_to_16bit(r);
-                               color.green = sixd_to_16bit(g);
-                               color.blue = sixd_to_16bit(b);
-                               if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[i])) {
-                                       die("Could not allocate color %d\n", i);
-                               }
-                               i++;
-                       }
-               }
+       /* load colours [16-231] ; same colours as xterm */
+       for(i = 16; i < 6*6*6+16; i++) {
+               color.red   = sixd_to_16bit( ((i-16)/36)%6 );
+               color.green = sixd_to_16bit( ((i-16)/6) %6 );
+               color.blue  = sixd_to_16bit( ((i-16)/1) %6 );
+               if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[i]))
+                       die("Could not allocate color %d\n", i);
        }
 
        }
 
-       for(r = 0; r < 24; r++, i++) {
-               color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
-               if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color,
-                                       &dc.col[i])) {
+       /* load colours [232-255] ; grayscale */
+       for(; i < 256; i++) {
+               color.red = color.green = color.blue = 0x0808 + 0x0a0a * (i-(6*6*6+16));
+               if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[i]))
                        die("Could not allocate color %d\n", i);
                        die("Could not allocate color %d\n", i);
-               }
        }
        loaded = true;
 }
        }
        loaded = true;
 }
@@ -2764,32 +2757,28 @@ xloadcols(void) {
 int
 xsetcolorname(int x, const char *name) {
        XRenderColor color = { .alpha = 0xffff };
 int
 xsetcolorname(int x, const char *name) {
        XRenderColor color = { .alpha = 0xffff };
-       Colour colour;
+
        if(!BETWEEN(x, 0, LEN(colorname)))
                return -1;
        if(!name) {
        if(!BETWEEN(x, 0, LEN(colorname)))
                return -1;
        if(!name) {
-               if(BETWEEN(x, 16, 16 + 215)) {
-                       int r = (x - 16) / 36, g = ((x - 16) % 36) / 6, b = (x - 16) % 6;
-                       color.red = sixd_to_16bit(r);
-                       color.green = sixd_to_16bit(g);
-                       color.blue = sixd_to_16bit(b);
-                       if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &colour))
-                               return 0; /* something went wrong */
-                       dc.col[x] = colour;
+               if(BETWEEN(x, 16, 6*6*6+16)) { /* 256 colour */
+                       color.red   = sixd_to_16bit( ((x-16)/36)%6 );
+                       color.green = sixd_to_16bit( ((x-16)/6) %6 );
+                       color.blue  = sixd_to_16bit( ((x-16)/1) %6 );
+                       if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[x]))
+                               die("Could not allocate color %d\n", x);
                        return 1;
                        return 1;
-               } else if(BETWEEN(x, 16 + 216, 255)) {
-                       color.red = color.green = color.blue = 0x0808 + 0x0a0a * (x - (16 + 216));
-                       if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &colour))
-                               return 0; /* something went wrong */
-                       dc.col[x] = colour;
+               } else if(BETWEEN(x, 6*6*6+16, 255)) { /* grayscale */
+                       color.red = color.green = color.blue = 0x0808 + 0x0a0a * (x-(6*6*6+16));
+                       if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[x]))
+                               die("Could not allocate color %d\n", x);
                        return 1;
                        return 1;
-               } else {
+               } else { /* system colours */
                        name = colorname[x];
                }
        }
                        name = colorname[x];
                }
        }
-       if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, &colour))
-               return 0;
-       dc.col[x] = colour;
+       if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, &dc.col[x]))
+               return 0; /* invalid name */
        return 1;
 }
 
        return 1;
 }
 
@@ -3151,24 +3140,20 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        }
 
        if(base.mode & ATTR_BOLD) {
        }
 
        if(base.mode & ATTR_BOLD) {
-               if(BETWEEN(base.fg, 0, 7)) {
-                       /* basic system colors */
-                       fg = &dc.col[base.fg + 8];
-               } else if(BETWEEN(base.fg, 16, 195)) {
-                       /* 256 colors */
-                       fg = &dc.col[base.fg + 36];
-               } else if(BETWEEN(base.fg, 232, 251)) {
-                       /* greyscale */
-                       fg = &dc.col[base.fg + 4];
-               }
                /*
                /*
-                * Those ranges will not be brightened:
-                *    8 - 15 – bright system colors
-                *    196 - 231 – highest 256 color cube
-                *    252 - 255 – brightest colors in greyscale
+                * change basic system colours [0-7]
+                * to bright system colours [8-15]
                 */
                 */
-               font = &dc.bfont;
-               frcflags = FRC_BOLD;
+               if(BETWEEN(base.fg, 0, 7))
+                       fg = &dc.col[base.fg + 8];
+
+               if(base.mode & ATTR_ITALIC) {
+                       font = &dc.ibfont;
+                       frcflags = FRC_ITALICBOLD;
+               } else {
+                       font = &dc.bfont;
+                       frcflags = FRC_BOLD;
+               }
        }
 
        if(IS_SET(MODE_REVERSE)) {
        }
 
        if(IS_SET(MODE_REVERSE)) {
@@ -3441,6 +3426,7 @@ void
 redraw(int timeout) {
        struct timespec tv = {0, timeout * 1000};
 
 redraw(int timeout) {
        struct timespec tv = {0, timeout * 1000};
 
+       tfulldirt();
        draw();
 
        if(timeout > 0) {
        draw();
 
        if(timeout > 0) {