Add tabs field into Term struct

[st.git] / st.c

diff --git a/st.c b/st.c
index 0e82eaf..d169ddf 100644 (file)
--- a/st.c
+++ b/st.c
@@ -164,7 +164,7 @@ typedef struct {
        int col;        /* nb col */
        Line* line;     /* screen */
        Line* alt;      /* alternate screen */
-       bool* dirty; /* dirtyness of lines */
+       bool* dirty;    /* dirtyness of lines */
        TCursor c;      /* cursor */
        int top;        /* top    scroll limit */
        int bot;        /* bottom scroll limit */
@@ -172,6 +172,7 @@ typedef struct {
        int esc;        /* escape state flags */
        char title[ESC_TITLE_SIZ];
        int titlelen;
+       bool *tabs;
 } Term;
 
 /* Purely graphic info */
@@ -186,8 +187,6 @@ typedef struct {
        int scr;
        int w;  /* window width */
        int h;  /* window height */
-       int bufw; /* pixmap width  */
-       int bufh; /* pixmap height */
        int ch; /* char height */
        int cw; /* char width  */
        char state; /* focus, redraw, visible */
@@ -849,12 +848,16 @@ tcursor(int mode) {
 
 void
 treset(void) {
+       unsigned i;
        term.c = (TCursor){{
                .mode = ATTR_NULL,
                .fg = DefaultFG,
                .bg = DefaultBG
        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
-       
+
+       memset(term.tabs, 0, term.col * sizeof(*term.tabs));
+       for (i = TAB; i < term.col; i += TAB)
+               term.tabs[i] = 1;
        term.top = 0, term.bot = term.row - 1;
        term.mode = MODE_WRAP;
        tclearregion(0, 0, term.col-1, term.row-1);
@@ -867,12 +870,14 @@ tnew(int col, int row) {
        term.line = malloc(term.row * sizeof(Line));
        term.alt  = malloc(term.row * sizeof(Line));
        term.dirty = malloc(term.row * sizeof(*term.dirty));
+       term.tabs = malloc(term.col * sizeof(*term.tabs));
 
        for(row = 0; row < term.row; row++) {
                term.line[row] = malloc(term.col * sizeof(Glyph));
                term.alt [row] = malloc(term.col * sizeof(Glyph));
                term.dirty[row] = 0;
        }
+       memset(term.tabs, 0, term.col * sizeof(*term.tabs));
        /* setup screen */
        treset();
 }
@@ -1590,6 +1595,7 @@ tresize(int col, int row) {
        term.line = realloc(term.line, row * sizeof(Line));
        term.alt  = realloc(term.alt,  row * sizeof(Line));
        term.dirty = realloc(term.dirty, row * sizeof(*term.dirty));
+       term.tabs = realloc(term.tabs, col * sizeof(*term.tabs));
 
        /* resize each row to new width, zero-pad if needed */
        for(i = 0; i < minrow; i++) {
@@ -1608,7 +1614,15 @@ tresize(int col, int row) {
                term.line[i] = calloc(col, sizeof(Glyph));
                term.alt [i] = calloc(col, sizeof(Glyph));
        }
-       
+       if (col > term.col) {
+               bool *bp = term.tabs + term.col;
+
+               memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
+               while (--bp > term.tabs && !*bp)
+                       /* nothing */ ;
+               for (bp += TAB; bp < term.tabs + col; bp += TAB)
+                       *bp = 1;
+       }
        /* update terminal size */
        term.col = col, term.row = row;
        /* make use of the LIMIT in tmoveto */
@@ -1621,8 +1635,8 @@ tresize(int col, int row) {
 
 void
 xresize(int col, int row) {
-       xw.bufw = MAX(1, col * xw.cw);
-       xw.bufh = MAX(1, row * xw.ch);
+       xw.w = MAX(1, 2*BORDER + col * xw.cw);
+       xw.h = MAX(1, 2*BORDER + row * xw.ch);
 }
 
 void
@@ -1671,7 +1685,7 @@ void
 xclear(int x1, int y1, int x2, int y2) {
        XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG]);
        XFillRectangle(xw.dpy, xw.buf, dc.gc,
-                      x1 * xw.cw, y1 * xw.ch,
+                      BORDER + x1 * xw.cw, BORDER + y1 * xw.ch,
                       (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
 }
 
@@ -1757,10 +1771,8 @@ xinit(void) {
        xloadcols();
 
        /* window - default size */
-       xw.bufh = term.row * xw.ch;
-       xw.bufw = term.col * xw.cw;
-       xw.h = xw.bufh + 2*BORDER;
-       xw.w = xw.bufw + 2*BORDER;
+       xw.h = 2*BORDER + term.row * xw.ch;
+       xw.w = 2*BORDER + term.col * xw.cw;
 
        attrs.background_pixel = dc.col[DefaultBG];
        attrs.border_pixel = dc.col[DefaultBG];
@@ -1807,7 +1819,7 @@ xinit(void) {
 void
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        int fg = base.fg, bg = base.bg, temp;
-       int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
+       int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
        XFontSet fontset = dc.font.set;
        int i;