mirror of https://github.com/pikami/st.git
redraw optimization.
This commit is contained in:
parent
9e004846de
commit
ce27e63491
34
st.c
34
st.c
|
@ -58,6 +58,7 @@ enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
|
||||||
enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8 };
|
enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8 };
|
||||||
enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
|
enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
|
||||||
enum { SCREEN_UPDATE, SCREEN_REDRAW };
|
enum { SCREEN_UPDATE, SCREEN_REDRAW };
|
||||||
|
enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 };
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
char c; /* character code */
|
char c; /* character code */
|
||||||
|
@ -117,8 +118,7 @@ typedef struct {
|
||||||
int bufh; /* pixmap height */
|
int bufh; /* pixmap height */
|
||||||
int ch; /* char height */
|
int ch; /* char height */
|
||||||
int cw; /* char width */
|
int cw; /* char width */
|
||||||
int focus;
|
char state; /* focus, redraw, visible */
|
||||||
int vis; /* is visible */
|
|
||||||
} XWindow;
|
} XWindow;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
@ -1166,7 +1166,7 @@ tputc(char c) {
|
||||||
tnewline();
|
tnewline();
|
||||||
break;
|
break;
|
||||||
case '\a':
|
case '\a':
|
||||||
if(!xw.focus)
|
if(!(xw.state & WIN_FOCUSED))
|
||||||
xseturgency(1);
|
xseturgency(1);
|
||||||
break;
|
break;
|
||||||
case '\033':
|
case '\033':
|
||||||
|
@ -1418,7 +1418,7 @@ xdrawcursor(void) {
|
||||||
xclear(oldx, oldy, oldx, oldy);
|
xclear(oldx, oldy, oldx, oldy);
|
||||||
|
|
||||||
/* draw the new one */
|
/* draw the new one */
|
||||||
if(!(term.c.state & CURSOR_HIDE) && xw.focus) {
|
if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) {
|
||||||
xdraws(&g.c, g, term.c.x, term.c.y, 1);
|
xdraws(&g.c, g, term.c.x, term.c.y, 1);
|
||||||
oldx = term.c.x, oldy = term.c.y;
|
oldx = term.c.x, oldy = term.c.y;
|
||||||
}
|
}
|
||||||
|
@ -1458,7 +1458,7 @@ draw(int redraw_all) {
|
||||||
Glyph base, new;
|
Glyph base, new;
|
||||||
char buf[DRAW_BUF_SIZ];
|
char buf[DRAW_BUF_SIZ];
|
||||||
|
|
||||||
if(!xw.vis)
|
if(!(xw.state & WIN_VISIBLE))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
xclear(0, 0, term.col-1, term.row-1);
|
xclear(0, 0, term.col-1, term.row-1);
|
||||||
|
@ -1487,27 +1487,36 @@ draw(int redraw_all) {
|
||||||
}
|
}
|
||||||
xdrawcursor();
|
xdrawcursor();
|
||||||
XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
|
XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
|
||||||
XFlush(xw.dis);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void
|
void
|
||||||
expose(XEvent *ev) {
|
expose(XEvent *ev) {
|
||||||
|
XExposeEvent *e = &ev->xexpose;
|
||||||
|
if(xw.state & WIN_REDRAW) {
|
||||||
|
if(!e->count) {
|
||||||
|
xw.state &= ~WIN_REDRAW;
|
||||||
draw(SCREEN_REDRAW);
|
draw(SCREEN_REDRAW);
|
||||||
}
|
}
|
||||||
|
} else
|
||||||
|
XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER,
|
||||||
|
e->width, e->height, e->x, e->y);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
visibility(XEvent *ev) {
|
visibility(XEvent *ev) {
|
||||||
XVisibilityEvent *e = &ev->xvisibility;
|
XVisibilityEvent *e = &ev->xvisibility;
|
||||||
/* XXX if this goes from 0 to 1, need a full redraw for next Expose,
|
if(e->state == VisibilityFullyObscured)
|
||||||
* not just a buf copy */
|
xw.state &= ~WIN_VISIBLE;
|
||||||
xw.vis = e->state != VisibilityFullyObscured;
|
else if(!(xw.state & WIN_VISIBLE))
|
||||||
|
/* need a full redraw for next Expose, not just a buf copy */
|
||||||
|
xw.state |= WIN_VISIBLE | WIN_REDRAW;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
unmap(XEvent *ev) {
|
unmap(XEvent *ev) {
|
||||||
xw.vis = 0;
|
xw.state &= ~WIN_VISIBLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -1520,8 +1529,11 @@ xseturgency(int add) {
|
||||||
|
|
||||||
void
|
void
|
||||||
focus(XEvent *ev) {
|
focus(XEvent *ev) {
|
||||||
if((xw.focus = ev->type == FocusIn))
|
if(ev->type == FocusIn) {
|
||||||
|
xw.state |= WIN_FOCUSED;
|
||||||
xseturgency(0);
|
xseturgency(0);
|
||||||
|
} else
|
||||||
|
xw.state &= ~WIN_FOCUSED;
|
||||||
draw(SCREEN_UPDATE);
|
draw(SCREEN_UPDATE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue