marco/st
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing the redrawing patch of k0ga, so it's using xclear() in redraw() too.

Browse Source
This commit is contained in:
Christoph Lohmann 2012-09-17 22:44:27 +02:00
parent 4876d6e05b
commit e4bf2679c1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
st.c
View File

@ -198,6 +198,7 @@ typedef struct {
int scr; int scr;
Bool isfixed; /* is fixed geometry? */ Bool isfixed; /* is fixed geometry? */
int fx, fy, fw, fh; /* fixed geometry */ int fx, fy, fw, fh; /* fixed geometry */
int tw, th; /* tty width and height */
int w; /* window width */ int w; /* window width */
int h; /* window height */ int h; /* window height */
int ch; /* char height */ int ch; /* char height */
@ -894,8 +895,8 @@ ttyresize(int x, int y) {
w.ws_row = term.row; w.ws_row = term.row;
w.ws_col = term.col; w.ws_col = term.col;
w.ws_xpixel = xw.w; w.ws_xpixel = xw.tw;
w.ws_ypixel = xw.h; w.ws_ypixel = xw.th;
if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0) if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
fprintf(stderr, "Couldn't set window size: %s\n", SERRNO); fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
} }
@ -1837,11 +1838,8 @@ tresize(int col, int row) {
void void
xresize(int col, int row) { xresize(int col, int row) {
xw.w = MAX(1, 2*BORDER + col * xw.cw); xw.tw = MAX(1, 2*BORDER + col * xw.cw);
xw.h = MAX(1, 2*BORDER + row * xw.ch); xw.th = MAX(1, 2*BORDER + row * xw.ch);
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0,
DisplayWidth(xw.dpy, xw.scr),
DisplayHeight(xw.dpy, xw.scr));
} }
void void
@ -2145,6 +2143,8 @@ xresettitle(void) {
void void
redraw(void) { redraw(void) {
struct timespec tv = {0, REDRAW_TIMEOUT * 1000}; struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
xclear(0, 0, xw.w, xw.h);
tfulldirt(); tfulldirt();
draw(); draw();
XSync(xw.dpy, False); /* necessary for a good tput flash */ XSync(xw.dpy, False); /* necessary for a good tput flash */
@ -2334,6 +2334,8 @@ resize(XEvent *e) {
row = (xw.h - 2*BORDER) / xw.ch; row = (xw.h - 2*BORDER) / xw.ch;
if(col == term.col && row == term.row) if(col == term.col && row == term.row)
return; return;
xclear(0, 0, xw.w, xw.h);
tresize(col, row); tresize(col, row);
xresize(col, row); xresize(col, row);
ttyresize(col, row); ttyresize(col, row);