Merge branch 'master' of ssh://suckless.org/gitrepos/st

[st.git] / st.c

diff --git a/st.c b/st.c
index 4b98b2784aa8ce7e9a068a6a37640c96a8c8cd0c..f87412761b88210cd9423c8dd08dfe4ea4922447 100644 (file)
--- a/st.c
+++ b/st.c
@@ -197,14 +197,14 @@ typedef struct {
 } TCursor;
 
 /* CSI Escape sequence structs */
-/* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */
+/* ESC '[' [[ [<priv>] <arg> [;]] <mode> [<mode>]] */
 typedef struct {
        char buf[ESC_BUF_SIZ]; /* raw string */
        int len;               /* raw string length */
        char priv;
        int arg[ESC_ARG_SIZ];
        int narg;              /* nb of args */
-       char mode;
+       char mode[2];
 } CSIEscape;
 
 /* STR Escape sequence structs */
@@ -257,6 +257,7 @@ typedef struct {
        int ch; /* char height */
        int cw; /* char width  */
        char state; /* focus, redraw, visible */
+       int cursor; /* cursor style */
 } XWindow;
 
 typedef struct {
@@ -358,7 +359,7 @@ static void csidump(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);
@@ -405,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 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);
@@ -417,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 xloadfontset(Font *);
 static void xsettitle(char *);
 static void xresettitle(void);
 static void xsetpointermotion(int);
@@ -451,6 +452,8 @@ static char *getsel(void);
 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 *);
 
@@ -639,7 +642,7 @@ utf8validate(long *u, size_t i) {
        return i;
 }
 
-static void
+void
 selinit(void) {
        memset(&sel.tclick1, 0, sizeof(sel.tclick1));
        memset(&sel.tclick2, 0, sizeof(sel.tclick2));
@@ -652,7 +655,7 @@ selinit(void) {
                sel.xtarget = XA_STRING;
 }
 
-static int
+int
 x2col(int x) {
        x -= borderpx;
        x /= xw.cw;
@@ -660,7 +663,7 @@ x2col(int x) {
        return LIMIT(x, 0, term.col-1);
 }
 
-static int
+int
 y2row(int y) {
        y -= borderpx;
        y /= xw.ch;
@@ -668,7 +671,7 @@ y2row(int y) {
        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)
@@ -680,7 +683,7 @@ static int tlinelen(int y) {
        return i;
 }
 
-static void
+void
 selnormalize(void) {
        int i;
 
@@ -707,7 +710,7 @@ selnormalize(void) {
                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)
@@ -995,6 +998,8 @@ selnotify(XEvent *e) {
 
        ofs = 0;
        xsev = (XSelectionEvent *)e;
+       if (xsev->property == None)
+           return;
        do {
                if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
                                        BUFSIZ/4, False, AnyPropertyType,
@@ -1089,7 +1094,11 @@ selrequest(XEvent *e) {
                                XA_ATOM, 32, PropModeReplace,
                                (uchar *) &string, 1);
                xev.property = xsre->property;
-       } else if(xsre->target == sel.xtarget) {
+       } else if(xsre->target == sel.xtarget || xsre->target == XA_STRING) {
+               /*
+                * xith XA_STRING non ascii characters may be incorrect in the
+                * requestor. It is not our problem, use utf8.
+                */
                clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
                if(xsre->selection == XA_PRIMARY) {
                        seltext = sel.primary;
@@ -1541,7 +1550,8 @@ csiparse(void) {
                        break;
                p++;
        }
-       csiescseq.mode = *p;
+       csiescseq.mode[0] = *p++;
+       csiescseq.mode[1] = (p < csiescseq.buf+csiescseq.len) ? *p : '\0';
 }
 
 /* for absolute user moves, when decom is set */
@@ -1979,7 +1989,7 @@ csihandle(void) {
        char buf[40];
        int len;
 
-       switch(csiescseq.mode) {
+       switch(csiescseq.mode[0]) {
        default:
        unknown:
                fprintf(stderr, "erresc: unknown csi ");
@@ -2167,6 +2177,19 @@ csihandle(void) {
        case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */
                tcursor(CURSOR_LOAD);
                break;
+       case ' ':
+               switch (csiescseq.mode[1]) {
+                       case 'q': /* DECSCUSR -- Set Cursor Style */
+                               DEFAULT(csiescseq.arg[0], 1);
+                               if (!BETWEEN(csiescseq.arg[0], 0, 6)) {
+                                       goto unknown;
+                               }
+                               xw.cursor = csiescseq.arg[0];
+                               break;
+                       default:
+                               goto unknown;
+               }
+               break;
        }
 }
 
@@ -2251,12 +2274,23 @@ strhandle(void) {
 
 void
 strparse(void) {
+       int c;
        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
@@ -2358,7 +2392,7 @@ tputtab(int n) {
                        for(--x; x > 0 && !term.tabs[x]; --x)
                                /* nothing */ ;
        }
-       tmoveto(x, term.c.y);
+       term.c.x = LIMIT(x, 0, term.col-1);
 }
 
 void
@@ -2616,7 +2650,6 @@ tputc(char *c, int len) {
                        c = "\357\277\275";     /* UTF_INVALID */
                        width = 1;
                }
-               control = ISCONTROLC1(unicodep);
                ascii = unicodep;
        }
 
@@ -2631,7 +2664,7 @@ tputc(char *c, int len) {
         * character.
         */
        if(term.esc & ESC_STR) {
-               if(width == 1 &&
+               if(len == 1 &&
                   (ascii == '\a' || ascii == 030 ||
                    ascii == 032  || ascii == 033 ||
                    ISCONTROLC1(unicodep))) {
@@ -2826,7 +2859,7 @@ xresize(int col, int row) {
        xclear(0, 0, xw.w, xw.h);
 }
 
-static inline ushort
+ushort
 sixd_to_16bit(int x) {
        return x == 0 ? 0 : 0x3737 + 0x2828 * x;
 }
@@ -3082,15 +3115,6 @@ xloadfonts(char *fontstr, double fontsize) {
        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);
@@ -3438,7 +3462,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                /* Nothing was found. */
                if(i >= frclen) {
                        if(!font->set)
-                               xloadfontset(font);
+                               font->set = FcFontSort(0, font->pattern,
+                                                      FcTrue, 0, &fcres);
                        fcsets[0] = font->set;
 
                        /*
@@ -3547,16 +3572,36 @@ xdrawcursor(void) {
 
        /* draw the new one */
        if(xw.state & WIN_FOCUSED) {
-               if(IS_SET(MODE_REVERSE)) {
-                       g.mode |= ATTR_REVERSE;
-                       g.fg = defaultcs;
-                       g.bg = defaultfg;
-               }
+               switch (xw.cursor) {
+                       case 0: /* Blinking Block */
+                       case 1: /* Blinking Block (Default) */
+                       case 2: /* Steady Block */
+                               if(IS_SET(MODE_REVERSE)) {
+                                               g.mode |= ATTR_REVERSE;
+                                               g.fg = defaultcs;
+                                               g.bg = defaultfg;
+                                       }
 
-               sl = utf8len(g.c);
-               width = (term.line[term.c.y][curx].mode & ATTR_WIDE)\
-                       ? 2 : 1;
-               xdraws(g.c, g, term.c.x, term.c.y, width, sl);
+                               sl = utf8len(g.c);
+                               width = (term.line[term.c.y][curx].mode & ATTR_WIDE)\
+                                       ? 2 : 1;
+                               xdraws(g.c, g, term.c.x, term.c.y, width, sl);
+                               break;
+                       case 3: /* Blinking Underline */
+                       case 4: /* Steady Underline */
+                               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                                               borderpx + curx * xw.cw,
+                                               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],
+                                               borderpx + curx * xw.cw,
+                                               borderpx + term.c.y * xw.ch,
+                                               cursorthickness, xw.ch);
+                               break;
+               }
        } else {
                XftDrawRect(xw.draw, &dc.col[defaultcs],
                                borderpx + curx * xw.cw,
@@ -3721,7 +3766,7 @@ focus(XEvent *ev) {
        }
 }
 
-static inline bool
+bool
 match(uint mask, uint state) {
        return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
 }
@@ -3981,6 +4026,7 @@ main(int argc, char *argv[]) {
 
        xw.l = xw.t = 0;
        xw.isfixed = False;
+       xw.cursor = 0;
 
        ARGBEGIN {
        case 'a':
@@ -4026,7 +4072,7 @@ main(int argc, char *argv[]) {
 run:
        setlocale(LC_CTYPE, "");
        XSetLocaleModifiers("");
-       tnew(cols? cols : 1, rows? rows : 1);
+       tnew(MAX(cols, 1), MAX(rows, 1));
        xinit();
        selinit();
        run();