Browse Source

Pass new dimensions into ttyresize

This removes another reference to TermWindow from st.c.

Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
Devin J. Pohly 7 năm trước cách đây
mục cha
commit
dbe8676d7d
3 tập tin đã thay đổi với 7 bổ sung7 xóa
  1. 3 3
      st.c
  2. 1 1
      st.h
  3. 3 3
      x.c

+ 3 - 3
st.c

@@ -905,14 +905,14 @@ ttysend(char *s, size_t n)
 }
 
 void
-ttyresize(void)
+ttyresize(int tw, int th)
 {
 	struct winsize w;
 
 	w.ws_row = term.row;
 	w.ws_col = term.col;
-	w.ws_xpixel = win.tw;
-	w.ws_ypixel = win.th;
+	w.ws_xpixel = tw;
+	w.ws_ypixel = th;
 	if (ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
 		fprintf(stderr, "Couldn't set window size: %s\n", strerror(errno));
 }

+ 1 - 1
st.h

@@ -187,7 +187,7 @@ void tsetdirtattr(int);
 int match(uint, uint);
 void ttynew(void);
 size_t ttyread(void);
-void ttyresize(void);
+void ttyresize(int, int);
 void ttysend(char *, size_t);
 void ttywrite(const char *, size_t);
 

+ 3 - 3
x.c

@@ -192,7 +192,7 @@ zoomabs(const Arg *arg)
 	xunloadfonts();
 	xloadfonts(usedfont, arg->f);
 	cresize(0, 0);
-	ttyresize();
+	ttyresize(win.tw, win.th);
 	redraw();
 	xhints();
 }
@@ -1679,7 +1679,7 @@ resize(XEvent *e)
 		return;
 
 	cresize(e->xconfigure.width, e->xconfigure.height);
-	ttyresize();
+	ttyresize(win.tw, win.th);
 }
 
 void
@@ -1710,7 +1710,7 @@ run(void)
 
 	cresize(w, h);
 	ttynew();
-	ttyresize();
+	ttyresize(win.tw, win.th);
 
 	clock_gettime(CLOCK_MONOTONIC, &last);
 	lastblink = last;