Check alternative screen before drawing box selection

[st.git] / st.c

diff --git a/st.c b/st.c
index fde0493..b143582 100644 (file)
--- a/st.c
+++ b/st.c
@@ -36,7 +36,8 @@
 
 #define USAGE \
        "st " VERSION " (c) 2010-2012 st engineers\n" \
-       "usage: st [-t title] [-c class] [-w windowid] [-v] [-f file] [-e command...]\n"
+       "usage: st [-t title] [-c class] [-g geometry]" \
+       " [-w windowid] [-v] [-f file] [-e command...]\n"
 
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4
@@ -54,6 +55,7 @@
 
 #define SELECT_TIMEOUT (20*1000) /* 20 ms */
 #define DRAW_TIMEOUT  (20*1000) /* 20 ms */
+#define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
@@ -194,6 +196,8 @@ typedef struct {
        XIM xim;
        XIC xic;
        int scr;
+       Bool isfixed; /* is fixed geometry? */
+       int fx, fy, fw, fh; /* fixed geometry */
        int w;  /* window width */
        int h;  /* window height */
        int ch; /* char height */
@@ -217,6 +221,7 @@ typedef struct {
        struct {int x, y;} b, e;
        char *clip;
        Atom xtarget;
+       bool alt;
        struct timeval tclick1;
        struct timeval tclick2;
 } Selection;
@@ -238,6 +243,7 @@ typedef struct {
 
 static void die(const char*, ...);
 static void draw(void);
+static void redraw(void);
 static void drawregion(int, int, int, int);
 static void execsh(void);
 static void sigchld(int);
@@ -574,6 +580,7 @@ selcopy(void) {
                }
                *ptr = 0;
        }
+       sel.alt = IS_SET(MODE_ALTSCREEN);
        xsetsel(str);
 }
 
@@ -779,7 +786,7 @@ ttynew(void) {
                cmdfd = m;
                signal(SIGCHLD, sigchld);
                if (opt_io && !(fileio = fopen(opt_io, "w"))) {
-                       fprintf(stderr, "Error opening %s:%s",
+                       fprintf(stderr, "Error opening %s:%s\n",
                                opt_io, strerror(errno));
                }
        }
@@ -1206,7 +1213,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                mode = term.mode;
                                MODBIT(term.mode,set, MODE_REVERSE);
                                if (mode != term.mode)
-                                       draw();
+                                       redraw();
                                break;
                        case 7:
                                MODBIT(term.mode, set, MODE_WRAP);
@@ -1818,16 +1825,25 @@ void
 xhints(void) {
        XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
        XWMHints wm = {.flags = InputHint, .input = 1};
-       XSizeHints size = {
-               .flags = PSize | PResizeInc | PBaseSize,
-               .height = xw.h,
-               .width = xw.w,
-               .height_inc = xw.ch,
-               .width_inc = xw.cw,
-               .base_height = 2*BORDER,
-               .base_width = 2*BORDER,
-       };
-       XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
+       XSizeHints *sizeh = NULL;
+
+       sizeh = XAllocSizeHints();
+       if(xw.isfixed == False) {
+               sizeh->flags = PSize | PResizeInc | PBaseSize;
+               sizeh->height = xw.h;
+               sizeh->width = xw.w;
+               sizeh->height_inc = xw.ch;
+               sizeh->width_inc = xw.cw;
+               sizeh->base_height = 2*BORDER;
+               sizeh->base_width = 2*BORDER;
+       } else {
+               sizeh->flags = PMaxSize | PMinSize;
+               sizeh->min_width = sizeh->max_width = xw.fw;
+               sizeh->min_height = sizeh->max_height = xw.fh;
+       }
+
+       XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, &class);
+       XFree(sizeh);
 }
 
 XFontSet
@@ -1879,11 +1895,28 @@ xinit(void) {
        XSetWindowAttributes attrs;
        Cursor cursor;
        Window parent;
+       int sw, sh;
 
        if(!(xw.dpy = XOpenDisplay(NULL)))
                die("Can't open display\n");
        xw.scr = XDefaultScreen(xw.dpy);
 
+       /* adjust fixed window geometry */
+       if(xw.isfixed) {
+               sw = DisplayWidth(xw.dpy, xw.scr);
+               sh = DisplayHeight(xw.dpy, xw.scr);
+               if(xw.fx < 0)
+                       xw.fx = sw + xw.fx - xw.fw - 1;
+               if(xw.fy < 0)
+                       xw.fy = sh + xw.fy - xw.fh - 1;
+       } 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;
+       }
+
        /* font */
        initfonts(FONT, BOLDFONT);
 
@@ -1895,10 +1928,6 @@ xinit(void) {
        xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
        xloadcols();
 
-       /* window - default size */
-       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];
        attrs.bit_gravity = NorthWestGravity;
@@ -1909,8 +1938,8 @@ xinit(void) {
        attrs.colormap = xw.cmap;
 
        parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
-       xw.win = XCreateWindow(xw.dpy, parent, 0, 0,
-                       xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
+       xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
+                       xw.fw, xw.fh, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
                        XDefaultVisual(xw.dpy, xw.scr),
                        CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
                        | CWColormap,
@@ -2030,6 +2059,14 @@ xdrawcursor(void) {
 }
 
 void
+redraw(void) {
+       struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
+       tfulldirt();
+       draw();
+       nanosleep(&tv, NULL);
+}
+
+void
 draw() {
        drawregion(0, 0, term.col, term.row);
        xcopy();
@@ -2041,7 +2078,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];
+       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;
 
@@ -2054,7 +2094,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];
-                       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)) {
@@ -2265,7 +2305,10 @@ run(void) {
 
 int
 main(int argc, char *argv[]) {
-       int i;
+       int i, bitm, xr, yr;
+       unsigned int wr, hr;
+
+       xw.fw = xw.fh = xw.fx = xw.fy = 0;
 
        for(i = 1; i < argc; i++) {
                switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
@@ -2285,6 +2328,27 @@ main(int argc, char *argv[]) {
                        /* eat every remaining arguments */
                        if(++i < argc) opt_cmd = &argv[i];
                        goto run;
+               case 'g':
+                       if(++i >= argc)
+                               break;
+
+                       bitm = XParseGeometry(argv[i], &xr, &yr, &wr, &hr);
+                       if(bitm & XValue)
+                               xw.fx = xr;
+                       if(bitm & YValue)
+                               xw.fy = yr;
+                       if(bitm & WidthValue)
+                               xw.fw = (int)wr;
+                       if(bitm & HeightValue)
+                               xw.fh = (int)hr;
+                       if(bitm & XNegative && xw.fx == 0)
+                               xw.fx = -1;
+                       if(bitm & XNegative && xw.fy == 0)
+                               xw.fy = -1;
+
+                       if(xw.fh != 0 && xw.fw != 0)
+                               xw.isfixed = True;
+                       break;
                case 'v':
                default:
                        die(USAGE);
@@ -2300,3 +2364,4 @@ main(int argc, char *argv[]) {
        run();
        return 0;
 }
+