Cleaning up the fixed window size and the resizing of clients.

[st.git] / st.c

diff --git a/st.c b/st.c
index 8b30d4c..63c3f85 100644 (file)
--- a/st.c
+++ b/st.c
@@ -221,6 +221,7 @@ typedef struct {
        struct {int x, y;} b, e;
        char *clip;
        Atom xtarget;
        struct {int x, y;} b, e;
        char *clip;
        Atom xtarget;

+       bool alt;

        struct timeval tclick1;
        struct timeval tclick2;
 } Selection;
        struct timeval tclick1;
        struct timeval tclick2;
 } Selection;


@@ -579,6 +580,7 @@ selcopy(void) {
                }
                *ptr = 0;
        }
                }
                *ptr = 0;
        }

+       sel.alt = IS_SET(MODE_ALTSCREEN);

        xsetsel(str);
 }
 
        xsetsel(str);
 }
 


@@ -783,8 +785,8 @@ ttynew(void) {
                close(s);
                cmdfd = m;
                signal(SIGCHLD, sigchld);
                close(s);
                cmdfd = m;
                signal(SIGCHLD, sigchld);

-               if (opt_io && !(fileio = fopen(opt_io, "w"))) {
-                       fprintf(stderr, "Error opening %s:%s",
+               if(opt_io && !(fileio = fopen(opt_io, "w"))) {
+                       fprintf(stderr, "Error opening %s:%s\n",

                                opt_io, strerror(errno));
                }
        }
                                opt_io, strerror(errno));
                }
        }


@@ -839,6 +841,8 @@ ttyresize(int x, int y) {
 
        w.ws_row = term.row;
        w.ws_col = term.col;
 
        w.ws_row = term.row;
        w.ws_col = term.col;

+       w.ws_xpixel = xw.w;
+       w.ws_ypixel = xw.h;

        w.ws_xpixel = w.ws_ypixel = 0;
        if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
                fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
        w.ws_xpixel = w.ws_ypixel = 0;
        if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
                fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);


@@ -882,7 +886,7 @@ treset(void) {
        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
 
        memset(term.tabs, 0, term.col * sizeof(*term.tabs));
        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
 
        memset(term.tabs, 0, term.col * sizeof(*term.tabs));

-       for (i = TAB; i < term.col; i += TAB)
+       for(i = TAB; i < term.col; i += TAB)

                term.tabs[i] = 1;
        term.top = 0, term.bot = term.row - 1;
        term.mode = MODE_WRAP;
                term.tabs[i] = 1;
        term.top = 0, term.bot = term.row - 1;
        term.mode = MODE_WRAP;


@@ -1201,7 +1205,7 @@ void
 tsetmode(bool priv, bool set, int *args, int narg) {
        int *lim, mode;
 
 tsetmode(bool priv, bool set, int *args, int narg) {
        int *lim, mode;
 

-       for (lim = args + narg; args < lim; ++args) {
+       for(lim = args + narg; args < lim; ++args) {

                if(priv) {
                        switch(*args) {
                        case 1:
                if(priv) {
                        switch(*args) {
                        case 1:


@@ -1210,7 +1214,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        case 5: /* DECSCNM -- Reverve video */
                                mode = term.mode;
                                MODBIT(term.mode,set, MODE_REVERSE);
                        case 5: /* DECSCNM -- Reverve video */
                                mode = term.mode;
                                MODBIT(term.mode,set, MODE_REVERSE);

-                               if (mode != term.mode)
+                               if(mode != term.mode)

                                        redraw();
                                break;
                        case 7:
                                        redraw();
                                break;
                        case 7:


@@ -1235,11 +1239,11 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        case 1047:
                                if(IS_SET(MODE_ALTSCREEN))
                                        tclearregion(0, 0, term.col-1, term.row-1);
                        case 1047:
                                if(IS_SET(MODE_ALTSCREEN))
                                        tclearregion(0, 0, term.col-1, term.row-1);

-                               if ((set && !IS_SET(MODE_ALTSCREEN)) ||
+                               if((set && !IS_SET(MODE_ALTSCREEN)) ||

                                    (!set && IS_SET(MODE_ALTSCREEN))) {
                                            tswapscreen();
                                }
                                    (!set && IS_SET(MODE_ALTSCREEN))) {
                                            tswapscreen();
                                }

-                               if (*args != 1049)
+                               if(*args != 1049)

                                        break;
                                /* pass through */
                        case 1048:
                                        break;
                                /* pass through */
                        case 1048:


@@ -1320,19 +1324,19 @@ csihandle(void) {
                }
                break;
        case 'G': /* CHA -- Move to <col> */
                }
                break;
        case 'G': /* CHA -- Move to <col> */

-       case '`': /* XXX: HPA -- same? */
+       case '`': /* HPA */

                DEFAULT(csiescseq.arg[0], 1);
                tmoveto(csiescseq.arg[0]-1, term.c.y);
                break;
        case 'H': /* CUP -- Move to <row> <col> */
                DEFAULT(csiescseq.arg[0], 1);
                tmoveto(csiescseq.arg[0]-1, term.c.y);
                break;
        case 'H': /* CUP -- Move to <row> <col> */

-       case 'f': /* XXX: HVP -- same? */
+       case 'f': /* HVP */

                DEFAULT(csiescseq.arg[0], 1);
                DEFAULT(csiescseq.arg[1], 1);
                tmoveto(csiescseq.arg[1]-1, csiescseq.arg[0]-1);
                break;
        case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
                DEFAULT(csiescseq.arg[0], 1);
                DEFAULT(csiescseq.arg[0], 1);
                DEFAULT(csiescseq.arg[1], 1);
                tmoveto(csiescseq.arg[1]-1, csiescseq.arg[0]-1);
                break;
        case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
                DEFAULT(csiescseq.arg[0], 1);

-               while (csiescseq.arg[0]--)
+               while(csiescseq.arg[0]--)

                        tputtab(1);
                break;
        case 'J': /* ED -- Clear screen */
                        tputtab(1);
                break;
        case 'J': /* ED -- Clear screen */


@@ -1397,7 +1401,7 @@ csihandle(void) {
                break;
        case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
                DEFAULT(csiescseq.arg[0], 1);
                break;
        case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
                DEFAULT(csiescseq.arg[0], 1);

-               while (csiescseq.arg[0]--)
+               while(csiescseq.arg[0]--)

                        tputtab(0);
                break;
        case 'd': /* VPA -- Move to <row> */
                        tputtab(0);
                break;
        case 'd': /* VPA -- Move to <row> */


@@ -1528,15 +1532,15 @@ void
 tputtab(bool forward) {
        unsigned x = term.c.x;
 
 tputtab(bool forward) {
        unsigned x = term.c.x;
 

-       if (forward) {
-               if (x == term.col)
+       if(forward) {
+               if(x == term.col)

                        return;
                        return;

-               for (++x; x < term.col && !term.tabs[x]; ++x)
+               for(++x; x < term.col && !term.tabs[x]; ++x)

                        /* nothing */ ;
        } else {
                        /* nothing */ ;
        } else {

-               if (x == 0)
+               if(x == 0)

                        return;
                        return;

-               for (--x; x > 0 && !term.tabs[x]; --x)
+               for(--x; x > 0 && !term.tabs[x]; --x)

                        /* nothing */ ;
        }
        tmoveto(x, term.c.y);
                        /* nothing */ ;
        }
        tmoveto(x, term.c.y);


@@ -1546,8 +1550,9 @@ void
 tputc(char *c) {
        char ascii = *c;
 
 tputc(char *c) {
        char ascii = *c;
 

-       if (fileio)
+       if(fileio)

                putc(ascii, fileio);
                putc(ascii, fileio);

+

        if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
        if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;


@@ -1566,7 +1571,7 @@ tputc(char *c) {
                                break;
                        default:
                                strescseq.buf[strescseq.len++] = ascii;
                                break;
                        default:
                                strescseq.buf[strescseq.len++] = ascii;

-                               if (strescseq.len+1 >= STR_BUF_SIZ) {
+                               if(strescseq.len+1 >= STR_BUF_SIZ) {

                                        term.esc = 0;
                                        strhandle();
                                }
                                        term.esc = 0;
                                        strhandle();
                                }


@@ -1744,13 +1749,13 @@ tresize(int col, int row) {
                term.line[i] = calloc(col, sizeof(Glyph));
                term.alt [i] = calloc(col, sizeof(Glyph));
        }
                term.line[i] = calloc(col, sizeof(Glyph));
                term.alt [i] = calloc(col, sizeof(Glyph));
        }

-       if (col > term.col) {
+       if(col > term.col) {

                bool *bp = term.tabs + term.col;
 
                memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
                bool *bp = term.tabs + term.col;
 
                memset(bp, 0, sizeof(*term.tabs) * (col - term.col));

-               while (--bp > term.tabs && !*bp)
+               while(--bp > term.tabs && !*bp)

                        /* nothing */ ;
                        /* nothing */ ;

-               for (bp += TAB; bp < term.tabs + col; bp += TAB)
+               for(bp += TAB; bp < term.tabs + col; bp += TAB)

                        *bp = 1;
        }
        /* update terminal size */
                        *bp = 1;
        }
        /* update terminal size */


@@ -1803,7 +1808,7 @@ xloadcols(void) {
 
        for(r = 0; r < 24; r++, i++) {
                color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
 
        for(r = 0; r < 24; r++, i++) {
                color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;

-               if (!XAllocColor(xw.dpy, xw.cmap, &color)) {
+               if(!XAllocColor(xw.dpy, xw.cmap, &color)) {

                        dc.col[i] = white;
                        fprintf(stderr, "Could not allocate color %d\n", i);
                } else
                        dc.col[i] = white;
                        fprintf(stderr, "Could not allocate color %d\n", i);
                } else


@@ -1902,17 +1907,20 @@ xinit(void) {
        /* adjust fixed window geometry */
        if(xw.isfixed) {
                sw = DisplayWidth(xw.dpy, xw.scr);
        /* adjust fixed window geometry */
        if(xw.isfixed) {
                sw = DisplayWidth(xw.dpy, xw.scr);

-               sh = DisplayWidth(xw.dpy, xw.scr);
+               sh = DisplayHeight(xw.dpy, xw.scr);

                if(xw.fx < 0)
                if(xw.fx < 0)

-                       xw.fx = sw + xw.fx - xw.fw;
+                       xw.fx = sw + xw.fx - xw.fw - 1;

                if(xw.fy < 0)
                if(xw.fy < 0)

-                       xw.fy = sh + xw.fy - xw.fh;
+                       xw.fy = sh + xw.fy - xw.fh - 1;
+
+               xw.h = xw.fh;
+               xw.w = xw.fw;

        } else {
                /* window - default size */
                xw.h = 2*BORDER + term.row * xw.ch;
                xw.w = 2*BORDER + term.col * xw.cw;
        } else {
                /* window - default size */
                xw.h = 2*BORDER + term.row * xw.ch;
                xw.w = 2*BORDER + term.col * xw.cw;

-               xw.fw = xw.w;
-               xw.fh = xw.h;
+               xw.fx = 0;
+               xw.fy = 0;

        }
 
        /* font */
        }
 
        /* font */


@@ -1937,7 +1945,7 @@ xinit(void) {
 
        parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
        xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
 
        parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
        xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,

-                       xw.fw, xw.fh, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
+                       xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,

                        XDefaultVisual(xw.dpy, xw.scr),
                        CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
                        | CWColormap,
                        XDefaultVisual(xw.dpy, xw.scr),
                        CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
                        | CWColormap,


@@ -2076,7 +2084,10 @@ drawregion(int x1, int y1, int x2, int y2) {
        int ic, ib, x, y, ox, sl;
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
        int ic, ib, x, y, ox, sl;
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];

+       bool ena_sel = sel.bx != -1, alt = IS_SET(MODE_ALTSCREEN);

 
 

+       if((sel.alt && !alt) || (!sel.alt && alt))
+               ena_sel = 0;

        if(!(xw.state & WIN_VISIBLE))
                return;
 
        if(!(xw.state & WIN_VISIBLE))
                return;
 


@@ -2089,7 +2100,7 @@ drawregion(int x1, int y1, int x2, int y2) {
                ic = ib = ox = 0;
                for(x = x1; x < x2; x++) {
                        new = term.line[y][x];
                ic = ib = ox = 0;
                for(x = x1; x < x2; x++) {
                        new = term.line[y][x];

-                       if(sel.bx != -1 && *(new.c) && selected(x, y))
+                       if(ena_sel && *(new.c) && selected(x, y))

                                new.mode ^= ATTR_REVERSE;
                        if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
                                                  ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
                                new.mode ^= ATTR_REVERSE;
                        if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
                                                  ib >= DRAW_BUF_SIZ-UTF_SIZ)) {


@@ -2222,11 +2233,11 @@ void
 cmessage(XEvent *e) {
        /* See xembed specs
           http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html */
 cmessage(XEvent *e) {
        /* See xembed specs
           http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html */

-       if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
-               if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
+       if(e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
+               if(e->xclient.data.l[1] == XEMBED_FOCUS_IN) {

                        xw.state |= WIN_FOCUSED;
                        xseturgency(0);
                        xw.state |= WIN_FOCUSED;
                        xseturgency(0);

-               } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
+               } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {

                        xw.state &= ~WIN_FOCUSED;
                }
                draw();
                        xw.state &= ~WIN_FOCUSED;
                }
                draw();


@@ -2248,8 +2259,8 @@ resize(XEvent *e) {
                return;
        if(tresize(col, row))
                draw();
                return;
        if(tresize(col, row))
                draw();

-       ttyresize(col, row);

        xresize(col, row);
        xresize(col, row);

+       ttyresize(col, row);

 }
 
 bool
 }
 
 bool


@@ -2304,6 +2315,7 @@ main(int argc, char *argv[]) {
        unsigned int wr, hr;
 
        xw.fw = xw.fh = xw.fx = xw.fy = 0;
        unsigned int wr, hr;
 
        xw.fw = xw.fh = xw.fx = xw.fy = 0;

+       xw.isfixed = False;

 
        for(i = 1; i < argc; i++) {
                switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
 
        for(i = 1; i < argc; i++) {
                switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {


@@ -2317,7 +2329,7 @@ main(int argc, char *argv[]) {
                        if(++i < argc) opt_embed = argv[i];
                        break;
                case 'f':
                        if(++i < argc) opt_embed = argv[i];
                        break;
                case 'f':

-                       if (++i < argc) opt_io = argv[i];
+                       if(++i < argc) opt_io = argv[i];

                        break;
                case 'e':
                        /* eat every remaining arguments */
                        break;
                case 'e':
                        /* eat every remaining arguments */