X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=0536b6f81c113d0bc8a1b7cb65d5664e4b802095;hb=4fdba860c8db70035e9749806ecc6ca2d7c418d0;hp=38abffbd65a59202e3a4004ee94f2ee80c6da6e1;hpb=0cd5117a2cfc4134712de748ec416be0655838b2;p=st.git

diff --git a/st.c b/st.c
index 38abffb..0536b6f 100644
--- a/st.c
+++ b/st.c
@@ -486,7 +486,6 @@ static void *xrealloc(void *, size_t);
 static char *xstrdup(char *);
 
 static void usage(void);
-static void version(void);
 
 static void (*handler[LASTEvent])(XEvent *) = {
 	[KeyPress] = kpress,
@@ -1442,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");
@@ -3428,6 +3425,7 @@ xzoomabs(const Arg *arg)
 	xunloadfonts();
 	xloadfonts(usedfont, arg->f);
 	cresize(0, 0);
+	ttyresize();
 	redraw();
 	xhints();
 }
@@ -4211,7 +4209,6 @@ cresize(int width, int height)
 
 	tresize(col, row);
 	xresize(col, row);
-	ttyresize();
 }
 
 void
@@ -4221,6 +4218,7 @@ resize(XEvent *e)
 		return;
 
 	cresize(e->xconfigure.width, e->xconfigure.height);
+	ttyresize();
 }
 
 void
@@ -4249,8 +4247,9 @@ run(void)
 		}
 	} while (ev.type != MapNotify);
 
-	ttynew();
 	cresize(w, h);
+	ttynew();
+	ttyresize();
 
 	clock_gettime(CLOCK_MONOTONIC, &last);
 	lastblink = last;
@@ -4334,18 +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);
-}
-
-void
-version(void)
-{
-	die("%s " VERSION " (c) 2010-2016 st engineers\n", 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
@@ -4395,7 +4390,7 @@ main(int argc, char *argv[])
 		opt_embed = EARGF(usage());
 		break;
 	case 'v':
-		version();
+		die("%s " VERSION " (c) 2010-2016 st engineers\n", argv0);
 		break;
 	default:
 		usage();