Remove 'titles' variable.

[st.git] / st.c

diff --git a/st.c b/st.c
index 68dc2be..4650990 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1,4 +1,4 @@
-/* See LICENSE for licence details. */
+/* See LICENSE for license details. */

 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>


@@ -359,7 +359,7 @@ static void csidump(void);
 static void csihandle(void);
 static void csiparse(void);
 static void csireset(void);
 static void csihandle(void);
 static void csiparse(void);
 static void csireset(void);

-static int eschandle(uchar ascii);
+static int eschandle(uchar);

 static void strdump(void);
 static void strhandle(void);
 static void strparse(void);
 static void strdump(void);
 static void strhandle(void);
 static void strparse(void);


@@ -406,8 +406,9 @@ static void ttyread(void);
 static void ttyresize(void);
 static void ttysend(char *, size_t);
 static void ttywrite(const char *, size_t);
 static void ttyresize(void);
 static void ttysend(char *, size_t);
 static void ttywrite(const char *, size_t);

-static void tstrsequence(uchar c);
+static void tstrsequence(uchar);

 
 

+static inline ushort sixd_to_16bit(int);

 static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);
 static void xclear(int, int, int, int);
 static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);
 static void xclear(int, int, int, int);


@@ -418,7 +419,6 @@ static int xsetcolorname(int, const char *);
 static int xgeommasktogravity(int);
 static int xloadfont(Font *, FcPattern *);
 static void xloadfonts(char *, double);
 static int xgeommasktogravity(int);
 static int xloadfont(Font *, FcPattern *);
 static void xloadfonts(char *, double);

-static int xloadfontset(Font *);

 static void xsettitle(char *);
 static void xresettitle(void);
 static void xsetpointermotion(int);
 static void xsettitle(char *);
 static void xresettitle(void);
 static void xsetpointermotion(int);


@@ -452,6 +452,8 @@ static char *getsel(void);
 static void selcopy(void);
 static void selscroll(int, int);
 static void selsnap(int, int *, int *, int);
 static void selcopy(void);
 static void selscroll(int, int);
 static void selsnap(int, int *, int *, int);

+static int x2col(int);
+static int y2row(int);

 static void getbuttoninfo(XEvent *);
 static void mousereport(XEvent *);
 
 static void getbuttoninfo(XEvent *);
 static void mousereport(XEvent *);
 


@@ -640,7 +642,7 @@ utf8validate(long *u, size_t i) {
        return i;
 }
 
        return i;
 }
 

-static void
+void

 selinit(void) {
        memset(&sel.tclick1, 0, sizeof(sel.tclick1));
        memset(&sel.tclick2, 0, sizeof(sel.tclick2));
 selinit(void) {
        memset(&sel.tclick1, 0, sizeof(sel.tclick1));
        memset(&sel.tclick2, 0, sizeof(sel.tclick2));


@@ -653,7 +655,7 @@ selinit(void) {
                sel.xtarget = XA_STRING;
 }
 
                sel.xtarget = XA_STRING;
 }
 

-static int
+int

 x2col(int x) {
        x -= borderpx;
        x /= xw.cw;
 x2col(int x) {
        x -= borderpx;
        x /= xw.cw;


@@ -661,7 +663,7 @@ x2col(int x) {
        return LIMIT(x, 0, term.col-1);
 }
 
        return LIMIT(x, 0, term.col-1);
 }
 

-static int
+int

 y2row(int y) {
        y -= borderpx;
        y /= xw.ch;
 y2row(int y) {
        y -= borderpx;
        y /= xw.ch;


@@ -669,7 +671,7 @@ y2row(int y) {
        return LIMIT(y, 0, term.row-1);
 }
 
        return LIMIT(y, 0, term.row-1);
 }
 

-static int tlinelen(int y) {
+int tlinelen(int y) {

        int i = term.col;
 
        if(term.line[y][i - 1].mode & ATTR_WRAP)
        int i = term.col;
 
        if(term.line[y][i - 1].mode & ATTR_WRAP)


@@ -681,7 +683,7 @@ static int tlinelen(int y) {
        return i;
 }
 
        return i;
 }
 

-static void
+void

 selnormalize(void) {
        int i;
 
 selnormalize(void) {
        int i;
 


@@ -708,7 +710,7 @@ selnormalize(void) {
                sel.ne.x = term.col - 1;
 }
 
                sel.ne.x = term.col - 1;
 }
 

-static inline bool
+bool

 selected(int x, int y) {
        if(sel.type == SEL_RECTANGULAR)
                return BETWEEN(y, sel.nb.y, sel.ne.y)
 selected(int x, int y) {
        if(sel.type == SEL_RECTANGULAR)
                return BETWEEN(y, sel.nb.y, sel.ne.y)


@@ -942,7 +944,7 @@ getsel(void) {
        ptr = str = xmalloc(bufsize);
 
        /* append every set & selected glyph to the selection */
        ptr = str = xmalloc(bufsize);
 
        /* append every set & selected glyph to the selection */

-       for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
+       for(y = sel.nb.y; y <= sel.ne.y; y++) {

                linelen = tlinelen(y);
 
                if(sel.type == SEL_RECTANGULAR) {
                linelen = tlinelen(y);
 
                if(sel.type == SEL_RECTANGULAR) {


@@ -1569,11 +1571,9 @@ tmoveto(int x, int y) {
                miny = 0;
                maxy = term.row - 1;
        }
                miny = 0;
                maxy = term.row - 1;
        }

-       LIMIT(x, 0, term.col-1);
-       LIMIT(y, miny, maxy);

        term.c.state &= ~CURSOR_WRAPNEXT;
        term.c.state &= ~CURSOR_WRAPNEXT;

-       term.c.x = x;
-       term.c.y = y;
+       term.c.x = LIMIT(x, 0, term.col-1);
+       term.c.y = LIMIT(y, miny, maxy);

 }
 
 void
 }
 
 void


@@ -2272,12 +2272,23 @@ strhandle(void) {
 
 void
 strparse(void) {
 
 void
 strparse(void) {

+       int c;

        char *p = strescseq.buf;
 
        strescseq.narg = 0;
        strescseq.buf[strescseq.len] = '\0';
        char *p = strescseq.buf;
 
        strescseq.narg = 0;
        strescseq.buf[strescseq.len] = '\0';

-       while(p && strescseq.narg < STR_ARG_SIZ)
-               strescseq.args[strescseq.narg++] = strsep(&p, ";");
+
+       if(*p == '\0')
+               return;
+
+       while(strescseq.narg < STR_ARG_SIZ) {
+               strescseq.args[strescseq.narg++] = p;
+               while((c = *p) != ';' && c != '\0')
+                       ++p;
+               if(c == '\0')
+                       return;
+               *p++ = '\0';
+       }

 }
 
 void
 }
 
 void


@@ -2433,21 +2444,19 @@ tdectest(char c) {
 
 void
 tstrsequence(uchar c) {
 
 void
 tstrsequence(uchar c) {

-       if (c & 0x80) {
-               switch (c) {
-               case 0x90:   /* DCS -- Device Control String */
-                       c = 'P';
-                       break;
-               case 0x9f:   /* APC -- Application Program Command */
-                       c = '_';
-                       break;
-               case 0x9e:   /* PM -- Privacy Message */
-                       c = '^';
-                       break;
-               case 0x9d:   /* OSC -- Operating System Command */
-                       c = ']';
-                       break;
-               }
+       switch (c) {
+       case 0x90:   /* DCS -- Device Control String */
+               c = 'P';
+               break;
+       case 0x9f:   /* APC -- Application Program Command */
+               c = '_';
+               break;
+       case 0x9e:   /* PM -- Privacy Message */
+               c = '^';
+               break;
+       case 0x9d:   /* OSC -- Operating System Command */
+               c = ']';
+               break;

        }
        strreset();
        strescseq.type = c;
        }
        strreset();
        strescseq.type = c;


@@ -2637,7 +2646,6 @@ tputc(char *c, int len) {
                        c = "\357\277\275";     /* UTF_INVALID */
                        width = 1;
                }
                        c = "\357\277\275";     /* UTF_INVALID */
                        width = 1;
                }

-               control = ISCONTROLC1(unicodep);

                ascii = unicodep;
        }
 
                ascii = unicodep;
        }
 


@@ -2652,7 +2660,7 @@ tputc(char *c, int len) {
         * character.
         */
        if(term.esc & ESC_STR) {
         * character.
         */
        if(term.esc & ESC_STR) {

-               if(width == 1 &&
+               if(len == 1 &&

                   (ascii == '\a' || ascii == 030 ||
                    ascii == 032  || ascii == 033 ||
                    ISCONTROLC1(unicodep))) {
                   (ascii == '\a' || ascii == 030 ||
                    ascii == 032  || ascii == 033 ||
                    ISCONTROLC1(unicodep))) {


@@ -2757,7 +2765,6 @@ tresize(int col, int row) {
        int i;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
        int i;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);

-       int slide = term.c.y - row + 1;

        bool *bp;
        TCursor c;
 
        bool *bp;
        TCursor c;
 


@@ -2767,20 +2774,18 @@ tresize(int col, int row) {
                return;
        }
 
                return;
        }
 

-       /* free unneeded rows */
-       i = 0;
-       if(slide > 0) {
-               /*
-                * slide screen to keep cursor where we expect it -
-                * tscrollup would work here, but we can optimize to
-                * memmove because we're freeing the earlier lines
-                */
-               for(/* i = 0 */; i < slide; i++) {
-                       free(term.line[i]);
-                       free(term.alt[i]);
-               }
-               memmove(term.line, term.line + slide, row * sizeof(Line));
-               memmove(term.alt, term.alt + slide, row * sizeof(Line));
+       /*
+        * slide screen to keep cursor where we expect it -
+        * tscrollup would work here, but we can optimize to
+        * memmove because we're freeing the earlier lines
+        */
+       for(i = 0; i <= term.c.y - row; i++) {
+               free(term.line[i]);
+               free(term.alt[i]);
+       }
+       if(i > 0) {
+               memmove(term.line, term.line + i, row * sizeof(Line));
+               memmove(term.alt, term.alt + i, row * sizeof(Line));

        }
        for(i += row; i < term.row; i++) {
                free(term.line[i]);
        }
        for(i += row; i < term.row; i++) {
                free(term.line[i]);


@@ -2847,7 +2852,7 @@ xresize(int col, int row) {
        xclear(0, 0, xw.w, xw.h);
 }
 
        xclear(0, 0, xw.w, xw.h);
 }
 

-static inline ushort
+ushort

 sixd_to_16bit(int x) {
        return x == 0 ? 0 : 0x3737 + 0x2828 * x;
 }
 sixd_to_16bit(int x) {
        return x == 0 ? 0 : 0x3737 + 0x2828 * x;
 }


@@ -3103,15 +3108,6 @@ xloadfonts(char *fontstr, double fontsize) {
        FcPatternDestroy(pattern);
 }
 
        FcPatternDestroy(pattern);
 }
 

-int
-xloadfontset(Font *f) {
-       FcResult result;
-
-       if(!(f->set = FcFontSort(0, f->pattern, FcTrue, 0, &result)))
-               return 1;
-       return 0;
-}
-

 void
 xunloadfont(Font *f) {
        XftFontClose(xw.dpy, f->match);
 void
 xunloadfont(Font *f) {
        XftFontClose(xw.dpy, f->match);


@@ -3459,7 +3455,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                /* Nothing was found. */
                if(i >= frclen) {
                        if(!font->set)
                /* Nothing was found. */
                if(i >= frclen) {
                        if(!font->set)

-                               xloadfontset(font);
+                               font->set = FcFontSort(0, font->pattern,
+                                                      FcTrue, 0, &fcres);

                        fcsets[0] = font->set;
 
                        /*
                        fcsets[0] = font->set;
 
                        /*


@@ -3587,15 +3584,15 @@ xdrawcursor(void) {
                        case 4: /* Steady Underline */
                                XftDrawRect(xw.draw, &dc.col[defaultcs],
                                                borderpx + curx * xw.cw,
                        case 4: /* Steady Underline */
                                XftDrawRect(xw.draw, &dc.col[defaultcs],
                                                borderpx + curx * xw.cw,

-                                               borderpx + (term.c.y + 1) * xw.ch - 1,
-                                               xw.cw, 1);
+                                               borderpx + (term.c.y + 1) * xw.ch - cursorthickness,
+                                               xw.cw, cursorthickness);

                                break;
                        case 5: /* Blinking bar */
                        case 6: /* Steady bar */
                                XftDrawRect(xw.draw, &dc.col[defaultcs],
                                break;
                        case 5: /* Blinking bar */
                        case 6: /* Steady bar */
                                XftDrawRect(xw.draw, &dc.col[defaultcs],

-                                                               borderpx + curx * xw.cw,
-                                                               borderpx + term.c.y * xw.ch,
-                                                               1, xw.ch);
+                                               borderpx + curx * xw.cw,
+                                               borderpx + term.c.y * xw.ch,
+                                               cursorthickness, xw.ch);

                                break;
                }
        } else {
                                break;
                }
        } else {


@@ -3762,7 +3759,7 @@ focus(XEvent *ev) {
        }
 }
 
        }
 }
 

-static inline bool
+bool

 match(uint mask, uint state) {
        return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
 }
 match(uint mask, uint state) {
        return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
 }


@@ -3913,17 +3910,13 @@ run(void) {
        long deltatime;
 
        /* Waiting for window mapping */
        long deltatime;
 
        /* Waiting for window mapping */

-       while(1) {
+       do {

                XNextEvent(xw.dpy, &ev);
                XNextEvent(xw.dpy, &ev);

-               if(XFilterEvent(&ev, None))
-                       continue;

                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;
                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;

-               } else if(ev.type == MapNotify) {
-                       break;

                }
                }

-       }
+       } while(ev.type != MapNotify);

 
        ttynew();
        cresize(w, h);
 
        ttynew();
        cresize(w, h);


@@ -4017,7 +4010,6 @@ usage(void) {
 
 int
 main(int argc, char *argv[]) {
 
 int
 main(int argc, char *argv[]) {

-       char *titles;

        uint cols = 80, rows = 24;
 
        xw.l = xw.t = 0;
        uint cols = 80, rows = 24;
 
        xw.l = xw.t = 0;


@@ -4035,10 +4027,8 @@ main(int argc, char *argv[]) {
                /* eat all remaining arguments */
                if(argc > 1) {
                        opt_cmd = &argv[1];
                /* eat all remaining arguments */
                if(argc > 1) {
                        opt_cmd = &argv[1];

-                       if(argv[1] != NULL && opt_title == NULL) {
-                               titles = xstrdup(argv[1]);
-                               opt_title = basename(titles);
-                       }
+                       if(argv[1] != NULL && opt_title == NULL)
+                               opt_title = basename(xstrdup(argv[1]));

                }
                goto run;
        case 'f':
                }
                goto run;
        case 'f':


@@ -4068,7 +4058,7 @@ main(int argc, char *argv[]) {
 run:
        setlocale(LC_CTYPE, "");
        XSetLocaleModifiers("");
 run:
        setlocale(LC_CTYPE, "");
        XSetLocaleModifiers("");

-       tnew(cols? cols : 1, rows? rows : 1);
+       tnew(MAX(cols, 1), MAX(rows, 1));

        xinit();
        selinit();
        run();
        xinit();
        selinit();
        run();