X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=0536b6f81c113d0bc8a1b7cb65d5664e4b802095;hb=4fdba860c8db70035e9749806ecc6ca2d7c418d0;hp=005bf1d560ba309a6921086bdf03635d7dc5765d;hpb=82335583eba15e87749d0e663270353005fca30b;p=st.git

diff --git a/st.c b/st.c
index 005bf1d..0536b6f 100644
--- a/st.c
+++ b/st.c
@@ -1441,8 +1441,6 @@ ttynew(void)
 	if (openpty(&m, &s, NULL, NULL, &w) < 0)
 		die("openpty failed: %s\n", strerror(errno));
 
-	ttyresize();
-
 	switch (pid = fork()) {
 	case -1:
 		die("fork failed\n");
@@ -3427,6 +3425,7 @@ xzoomabs(const Arg *arg)
 	xunloadfonts();
 	xloadfonts(usedfont, arg->f);
 	cresize(0, 0);
+	ttyresize();
 	redraw();
 	xhints();
 }
@@ -4210,7 +4209,6 @@ cresize(int width, int height)
 
 	tresize(col, row);
 	xresize(col, row);
-	ttyresize();
 }
 
 void
@@ -4220,6 +4218,7 @@ resize(XEvent *e)
 		return;
 
 	cresize(e->xconfigure.width, e->xconfigure.height);
+	ttyresize();
 }
 
 void
@@ -4248,8 +4247,9 @@ run(void)
 		}
 	} while (ev.type != MapNotify);
 
-	ttynew();
 	cresize(w, h);
+	ttynew();
+	ttyresize();
 
 	clock_gettime(CLOCK_MONOTONIC, &last);
 	lastblink = last;
@@ -4333,12 +4333,14 @@ run(void)
 void
 usage(void)
 {
-	die("usage: %s "
-	"[-aiv] [-c class] [-f font] [-g geometry] [-n name] [-o file]\n       "
-	"   [-T title] [-t title] [-w windowid] [[-e] command [args ...]\n     "
-	"  %s [-aiv] [-c class] [-f font] [-g geometry] [-n name] [-o file]\n  "
-	"        [-o file] [-T title] [-t title] [-w windowid] -l line"
-	" [stty_args ...]\n", argv0, argv0);
+	die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]"
+	    " [-n name] [-o file]\n"
+	    "          [-T title] [-t title] [-w windowid]"
+	    " [[-e] command [args ...]]\n"
+	    "       %s [-aiv] [-c class] [-f font] [-g geometry]"
+	    " [-n name] [-o file]\n"
+	    "          [-T title] [-t title] [-w windowid] -l line"
+	    " [stty_args ...]\n", argv0, argv0);
 }
 
 int