Rely on ttyresize to set tty size

[st.git] / x.c

diff --git a/x.c b/x.c
index 04e2e05..7bfa1b7 100644 (file)
--- a/x.c
+++ b/x.c
@@ -44,6 +44,11 @@ typedef struct {
        signed char crlf;      /* crlf mode          */
 } Key;
 
+/* X modifiers */
+#define XK_ANY_MOD    UINT_MAX
+#define XK_NO_MOD     0
+#define XK_SWITCH_MOD (1<<13)
+
 /* function definitions used in config.h */
 static void clipcopy(const Arg *);
 static void clippaste(const Arg *);
@@ -148,7 +153,7 @@ static void propnotify(XEvent *);
 static void selnotify(XEvent *);
 static void selclear_(XEvent *);
 static void selrequest(XEvent *);
-static void selcopy(Time);
+static void setsel(char *, Time);
 static void getbuttoninfo(XEvent *);
 static void mousereport(XEvent *);
 static char *kmap(KeySym, uint);
@@ -271,7 +276,6 @@ zoomabs(const Arg *arg)
        xunloadfonts();
        xloadfonts(usedfont, arg->f);
        cresize(0, 0);
-       ttyresize(win.tw, win.th);
        redraw();
        xhints();
 }
@@ -440,12 +444,6 @@ bpress(XEvent *e)
        }
 }
 
-void
-selcopy(Time t)
-{
-       xsetsel(getsel(), t);
-}
-
 void
 propnotify(XEvent *e)
 {
@@ -620,7 +618,7 @@ selrequest(XEvent *e)
 }
 
 void
-xsetsel(char *str, Time t)
+setsel(char *str, Time t)
 {
        free(sel.primary);
        sel.primary = str;
@@ -630,6 +628,12 @@ xsetsel(char *str, Time t)
                selclear_(NULL);
 }
 
+void
+xsetsel(char *str)
+{
+       setsel(str, CurrentTime);
+}
+
 void
 brelease(XEvent *e)
 {
@@ -643,7 +647,7 @@ brelease(XEvent *e)
        } else if (e->xbutton.button == Button1) {
                if (sel.mode == SEL_READY) {
                        getbuttoninfo(e);
-                       selcopy(e->xbutton.time);
+                       setsel(getsel(), e->xbutton.time);
                } else
                        selclear_(NULL);
                sel.mode = SEL_IDLE;
@@ -690,6 +694,7 @@ cresize(int width, int height)
 
        tresize(col, row);
        xresize(col, row);
+       ttyresize(win.tw, win.th);
 }
 
 void
@@ -1789,7 +1794,6 @@ resize(XEvent *e)
                return;
 
        cresize(e->xconfigure.width, e->xconfigure.height);
-       ttyresize(win.tw, win.th);
 }
 
 void
@@ -1818,9 +1822,8 @@ run(void)
                }
        } while (ev.type != MapNotify);
 
-       cresize(w, h);
        ttynew(opt_line, opt_io, opt_cmd);
-       ttyresize(win.tw, win.th);
+       cresize(w, h);
 
        clock_gettime(CLOCK_MONOTONIC, &last);
        lastblink = last;