Style cleanup.

[st.git] / st.c

diff --git a/st.c b/st.c
index 82bfd3d..c16e45d 100644 (file)
--- a/st.c
+++ b/st.c
@@ -441,6 +441,7 @@ static int isfullutf8(char *, int);
 static ssize_t xwrite(int, char *, size_t);
 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);
+static char *xstrdup(char *s);
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
@@ -529,6 +530,16 @@ xrealloc(void *p, size_t len) {
        return p;
 }
 
+char *
+xstrdup(char *s) {
+       char *p = strdup(s);
+
+       if (!p)
+               die("Out of memory\n");
+
+       return p;
+}
+
 int
 utf8decode(char *s, long *u) {
        uchar c;
@@ -953,11 +964,12 @@ selcopy(void) {
                /* append every set & selected glyph to the selection */
                for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
                        gp = &term.line[y][0];
-                       last = gp + term.col;
+                       last = &gp[term.col-1];
 
-                       while(--last >= gp && !(selected(last - gp, y) && \
-                                               strcmp(last->c, " ") != 0))
-                               /* nothing */;
+                       while(last >= gp && !(selected(last - gp, y) &&
+                                             strcmp(last->c, " ") != 0)) {
+                               --last;
+                       }
 
                        for(x = 0; gp <= last; x++, ++gp) {
                                if(!selected(x, y) || (gp->mode & ATTR_WDUMMY))
@@ -2152,20 +2164,21 @@ csireset(void) {
 void
 strhandle(void) {
        char *p = NULL;
-       int i, j, narg;
+       int j, narg, par;
 
        strparse();
        narg = strescseq.narg;
+       par = atoi(strescseq.args[0]);
 
        switch(strescseq.type) {
        case ']': /* OSC -- Operating System Command */
-               switch(i = atoi(strescseq.args[0])) {
+               switch(par) {
                case 0:
                case 1:
                case 2:
                        if(narg > 1)
                                xsettitle(strescseq.args[1]);
-                       break;
+                       return;
                case 4: /* color set */
                        if(narg < 3)
                                break;
@@ -2182,25 +2195,20 @@ strhandle(void) {
                                 */
                                redraw(0);
                        }
-                       break;
-               default:
-                       fprintf(stderr, "erresc: unknown str ");
-                       strdump();
-                       break;
+                       return;
                }
                break;
        case 'k': /* old title set compatibility */
                xsettitle(strescseq.args[0]);
-               break;
+               return;
        case 'P': /* DSC -- Device Control String */
        case '_': /* APC -- Application Program Command */
        case '^': /* PM -- Privacy Message */
-       default:
-               fprintf(stderr, "erresc: unknown str ");
-               strdump();
-               /* die(""); */
-               break;
+               return;
        }
+
+       fprintf(stderr, "erresc: unknown str ");
+       strdump();
 }
 
 void
@@ -2793,7 +2801,8 @@ xhints(void) {
                sizeh->min_height = sizeh->max_height = xw.fh;
        }
 
-       XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, &class);
+       XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm,
+                       &class);
        XFree(sizeh);
 }
 
@@ -3082,7 +3091,9 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                if(base.fg == defaultfg)
                        base.fg = defaultunderline;
        }
+
        if(IS_TRUECOL(base.fg)) {
+               colfg.alpha = 0xffff;
                colfg.red = TRUERED(base.fg);
                colfg.green = TRUEGREEN(base.fg);
                colfg.blue = TRUEBLUE(base.fg);
@@ -3093,6 +3104,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        }
 
        if(IS_TRUECOL(base.bg)) {
+               colbg.alpha = 0xffff;
                colbg.green = TRUEGREEN(base.bg);
                colbg.red = TRUERED(base.bg);
                colbg.blue = TRUEBLUE(base.bg);
@@ -3102,8 +3114,6 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                bg = &dc.col[base.bg];
        }
 
-
-
        if(base.mode & ATTR_BOLD) {
                if(BETWEEN(base.fg, 0, 7)) {
                        /* basic system colors */
@@ -3133,7 +3143,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        colfg.green = ~fg->color.green;
                        colfg.blue = ~fg->color.blue;
                        colfg.alpha = fg->color.alpha;
-                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
+                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg,
+                                       &revfg);
                        fg = &revfg;
                }
 
@@ -3144,7 +3155,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        colbg.green = ~bg->color.green;
                        colbg.blue = ~bg->color.blue;
                        colbg.alpha = bg->color.alpha;
-                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &revbg);
+                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg,
+                                       &revbg);
                        bg = &revbg;
                }
        }
@@ -3224,7 +3236,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        u8fblen += u8cblen;
                }
                if(doesexist) {
-                       if (oneatatime)
+                       if(oneatatime)
                                continue;
                        break;
                }
@@ -3247,6 +3259,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                         * Nothing was found in the cache. Now use
                         * some dozen of Fontconfig calls to get the
                         * font for one single character.
+                        *
+                        * Xft and fontconfig are design failures.
                         */
                        fcpattern = FcPatternDuplicate(font->pattern);
                        fccharset = FcCharSetCreate();
@@ -3290,6 +3304,12 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                xp += xw.cw * wcwidth(u8char);
        }
 
+       /*
+        * This is how the loop above actually should be. Why does the
+        * application have to care about font details?
+        *
+        * I have to repeat: Xft and Fontconfig are design failures.
+        */
        /*
        XftDrawStringUtf8(xw.draw, fg, font->set, winx,
                        winy + font->ascent, (FcChar8 *)s, bytelen);
@@ -3790,7 +3810,7 @@ main(int argc, char *argv[]) {
                if(argc > 1) {
                        opt_cmd = &argv[1];
                        if(argv[1] != NULL && opt_title == NULL) {
-                               titles = strdup(argv[1]);
+                               titles = xstrdup(argv[1]);
                                opt_title = basename(titles);
                        }
                }