Add the possibility to have default highlight colors.

[st.git] / st.c

diff --git a/st.c b/st.c
index 23c4caf..8b1fc56 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1,5 +1,4 @@
 /* See LICENSE for licence details. */
 /* See LICENSE for licence details. */

-#define _XOPEN_SOURCE 600

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


@@ -650,23 +649,18 @@ selected(int x, int y) {
        if(sel.ey == y && sel.by == y) {
                bx = MIN(sel.bx, sel.ex);
                ex = MAX(sel.bx, sel.ex);
        if(sel.ey == y && sel.by == y) {
                bx = MIN(sel.bx, sel.ex);
                ex = MAX(sel.bx, sel.ex);

+

                return BETWEEN(x, bx, ex);
        }
 
                return BETWEEN(x, bx, ex);
        }
 

-       return ((sel.b.y < y && y < sel.e.y)
-                       || (y == sel.e.y && x <= sel.e.x))
-                       || (y == sel.b.y && x >= sel.b.x
-                               && (x <= sel.e.x || sel.b.y != sel.e.y));
-       switch(sel.type) {
-       case SEL_REGULAR:
-               return ((sel.b.y < y && y < sel.e.y)
-                       || (y == sel.e.y && x <= sel.e.x))
-                       || (y == sel.b.y && x >= sel.b.x
-                               && (x <= sel.e.x || sel.b.y != sel.e.y));
-       case SEL_RECTANGULAR:
+       if(sel.type == SEL_RECTANGULAR) {

                return ((sel.b.y <= y && y <= sel.e.y)
                        && (sel.b.x <= x && x <= sel.e.x));
                return ((sel.b.y <= y && y <= sel.e.y)
                        && (sel.b.x <= x && x <= sel.e.x));

-       };
+       }
+       return ((sel.b.y < y && y < sel.e.y)
+               || (y == sel.e.y && x <= sel.e.x))
+               || (y == sel.b.y && x >= sel.b.x
+                       && (x <= sel.e.x || sel.b.y != sel.e.y));

 }
 
 void
 }
 
 void


@@ -796,7 +790,7 @@ selcopy(void) {
                        }
                        /* \n at the end of every selected line except for the last one */
                        if(is_selected && y < sel.e.y)
                        }
                        /* \n at the end of every selected line except for the last one */
                        if(is_selected && y < sel.e.y)

-                               *ptr++ = '\n';
+                               *ptr++ = '\r';

                }
                *ptr = 0;
        }
                }
                *ptr = 0;
        }


@@ -1258,8 +1252,12 @@ selscroll(int orig, int n) {
                        sel.bx = -1;
                        return;
                }
                        sel.bx = -1;
                        return;
                }

-               switch(sel.type) {
-               case SEL_REGULAR:
+               if(sel.type == SEL_RECTANGULAR) {
+                       if(sel.by < term.top)
+                               sel.by = term.top;
+                       if(sel.ey > term.bot)
+                               sel.ey = term.bot;
+               } else {

                        if(sel.by < term.top) {
                                sel.by = term.top;
                                sel.bx = 0;
                        if(sel.by < term.top) {
                                sel.by = term.top;
                                sel.bx = 0;


@@ -1268,14 +1266,7 @@ selscroll(int orig, int n) {
                                sel.ey = term.bot;
                                sel.ex = term.col;
                        }
                                sel.ey = term.bot;
                                sel.ex = term.col;
                        }

-                       break;
-               case SEL_RECTANGULAR:
-                       if(sel.by < term.top)
-                               sel.by = term.top;
-                       if(sel.ey > term.bot)
-                               sel.ey = term.bot;
-                       break;
-               };
+               }

                sel.b.y = sel.by, sel.b.x = sel.bx;
                sel.e.y = sel.ey, sel.e.x = sel.ex;
        }
                sel.b.y = sel.by, sel.b.x = sel.bx;
                sel.e.y = sel.ey, sel.e.x = sel.ex;
        }


@@ -1295,32 +1286,30 @@ tnewline(int first_col) {
 
 void
 csiparse(void) {
 
 void
 csiparse(void) {

-       /* int noarg = 1; */

        char *p = csiescseq.buf, *np;
        long int v;
 
        csiescseq.narg = 0;
        char *p = csiescseq.buf, *np;
        long int v;
 
        csiescseq.narg = 0;

-       if(*p == '?')
-               csiescseq.priv = 1, p++;
+       if(*p == '?') {
+               csiescseq.priv = 1;
+               p++;
+       }

 
 

+       csiescseq.buf[csiescseq.len] = '\0';

        while(p < csiescseq.buf+csiescseq.len) {
                np = NULL;
                v = strtol(p, &np, 10);
        while(p < csiescseq.buf+csiescseq.len) {
                np = NULL;
                v = strtol(p, &np, 10);

+               if(np == p)
+                       v = 0;

                if(v == LONG_MAX || v == LONG_MIN)
                        v = -1;
                if(v == LONG_MAX || v == LONG_MIN)
                        v = -1;

-               csiescseq.arg[csiescseq.narg] = v;
-               if(np != NULL)
-                       p = np;
-
-               if(*p == ';' && csiescseq.narg+1 < ESC_ARG_SIZ) {
-                       csiescseq.narg++, p++;
-               } else {
-                       csiescseq.mode = *p;
-                       csiescseq.narg++;
-
-                       return;
-               }
+               csiescseq.arg[csiescseq.narg++] = v;
+               p = np;
+               if(*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
+                       break;
+               p++;

        }
        }

+       csiescseq.mode = *p;

 }
 
 /* for absolute user moves, when decom is set */
 }
 
 /* for absolute user moves, when decom is set */


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

-       /*
-        * TODO: Implement parsing like for CSI when required.
-        * Format: ESC type cmd ';' arg0 [';' argn] ESC \
-        */
-       int narg = 0;
-       char *start = strescseq.buf, *end = start + strescseq.len;
-       strescseq.args[0] = start;
-       while(start < end && narg < LEN(strescseq.args)) {
-               start = memchr(start, ';', end - start);
-               if(!start)
-                       break;
-               *start++ = '\0';
-               if(start < end) {
-                       strescseq.args[++narg] = start;
-               }
-       }
-       strescseq.narg = narg + 1;
+       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, ";");

 }
 
 void
 }
 
 void


@@ -1955,7 +1933,9 @@ strdump(void) {
        printf("ESC%c", strescseq.type);
        for(i = 0; i < strescseq.len; i++) {
                c = strescseq.buf[i] & 0xff;
        printf("ESC%c", strescseq.type);
        for(i = 0; i < strescseq.len; i++) {
                c = strescseq.buf[i] & 0xff;

-               if(isprint(c)) {
+               if(c == '\0') {
+                       return;
+               } else if(isprint(c)) {

                        putchar(c);
                } else if(c == '\n') {
                        printf("(\\n)");
                        putchar(c);
                } else if(c == '\n') {
                        printf("(\\n)");


@@ -2043,7 +2023,7 @@ tputc(char *c, int len) {
                        strhandle();
                        break;
                default:
                        strhandle();
                        break;
                default:

-                       if(strescseq.len + len < sizeof(strescseq.buf)) {
+                       if(strescseq.len + len < sizeof(strescseq.buf) - 1) {

                                memmove(&strescseq.buf[strescseq.len], c, len);
                                strescseq.len += len;
                        } else {
                                memmove(&strescseq.buf[strescseq.len], c, len);
                                strescseq.len += len;
                        } else {


@@ -2119,7 +2099,8 @@ tputc(char *c, int len) {
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
                        if(BETWEEN(ascii, 0x40, 0x7E)
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
                        if(BETWEEN(ascii, 0x40, 0x7E)

-                                       || csiescseq.len >= ESC_BUF_SIZ) {
+                                       || csiescseq.len >= \
+                                       sizeof(csiescseq.buf)-1) {

                                term.esc = 0;
                                csiparse();
                                csihandle();
                                term.esc = 0;
                                csiparse();
                                csihandle();


@@ -2504,7 +2485,7 @@ xloadfont(Font *f, FcPattern *pattern) {
        f->lbearing = 0;
        f->rbearing = f->match->max_advance_width;
 
        f->lbearing = 0;
        f->rbearing = f->match->max_advance_width;
 

-       f->height = f->match->height;
+       f->height = f->ascent + f->descent;

        f->width = f->lbearing + f->rbearing;
 
        return 0;
        f->width = f->lbearing + f->rbearing;
 
        return 0;


@@ -2730,12 +2711,28 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        FcPattern *fcpattern, *fontpattern;
        FcFontSet *fcsets[] = { NULL };
        FcCharSet *fccharset;
        FcPattern *fcpattern, *fontpattern;
        FcFontSet *fcsets[] = { NULL };
        FcCharSet *fccharset;

-       Colour *fg = &dc.col[base.fg], *bg = &dc.col[base.bg],
-                *temp, revfg, revbg;
+       Colour *fg, *bg, *temp, revfg, revbg;

        XRenderColor colfg, colbg;
 
        frcflags = FRC_NORMAL;
 
        XRenderColor colfg, colbg;
 
        frcflags = FRC_NORMAL;
 

+       if(base.mode & ATTR_ITALIC) {
+               if(base.fg == defaultfg)
+                       base.fg = defaultitalic;
+               font = &dc.ifont;
+               frcflags = FRC_ITALIC;
+       } else if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) {
+               if(base.fg == defaultfg)
+                       base.fg = defaultitalic;
+               font = &dc.ibfont;
+               frcflags = FRC_ITALICBOLD;
+       } else if(base.mode & ATTR_UNDERLINE) {
+               if(base.fg == defaultfg)
+                       base.fg = defaultunderline;
+       }
+       fg = &dc.col[base.fg];
+       bg = &dc.col[base.bg];
+

        if(base.mode & ATTR_BOLD) {
                if(BETWEEN(base.fg, 0, 7)) {
                        /* basic system colors */
        if(base.mode & ATTR_BOLD) {
                if(BETWEEN(base.fg, 0, 7)) {
                        /* basic system colors */


@@ -2757,15 +2754,6 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                frcflags = FRC_BOLD;
        }
 
                frcflags = FRC_BOLD;
        }
 

-       if(base.mode & ATTR_ITALIC) {
-               font = &dc.ifont;
-               frcflags = FRC_ITALIC;
-       }
-       if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) {
-               font = &dc.ibfont;
-               frcflags = FRC_ITALICBOLD;
-       }
-

        if(IS_SET(MODE_REVERSE)) {
                if(fg == &dc.col[defaultfg]) {
                        fg = &dc.col[defaultbg];
        if(IS_SET(MODE_REVERSE)) {
                if(fg == &dc.col[defaultfg]) {
                        fg = &dc.col[defaultbg];


@@ -2892,8 +2880,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                                        FcTrue, fcpattern, &fcres);
 
                        /*
                                        FcTrue, fcpattern, &fcres);
 
                        /*

-                        * Overwrite or create the new cache entry
-                        * entry.
+                        * Overwrite or create the new cache entry.

                         */
                        frccur++;
                        frclen++;
                         */
                        frccur++;
                        frclen++;