removed useless cursor init. and renamed xcursor() to xdrawcursor().

This commit is contained in:
Aurélien Aptel 2010-08-30 01:45:57 +02:00
parent 7d88cf88d0
commit 188293c828
1 changed files with 4 additions and 7 deletions

11
st.c
View File

@ -165,7 +165,7 @@ static void xbell(void);
static void xdraws(char *, Glyph, int, int, int); static void xdraws(char *, Glyph, int, int, int);
static void xhints(void); static void xhints(void);
static void xclear(int, int, int, int); static void xclear(int, int, int, int);
static void xcursor(void); static void xdrawcursor(void);
static void xinit(void); static void xinit(void);
static void xloadcols(void); static void xloadcols(void);
@ -1071,9 +1071,6 @@ xinit(void) {
/* colors */ /* colors */
xloadcols(); xloadcols();
term.c.attr.fg = DefaultFG;
term.c.attr.bg = DefaultBG;
term.c.attr.mode = ATTR_NULL;
/* windows */ /* windows */
xw.h = term.row * xw.ch + 2*BORDER; xw.h = term.row * xw.ch + 2*BORDER;
xw.w = term.col * xw.cw + 2*BORDER; xw.w = term.col * xw.cw + 2*BORDER;
@ -1118,7 +1115,7 @@ xdraws(char *s, Glyph base, int x, int y, int len) {
} }
void void
xcursor(void) { xdrawcursor(void) {
static int oldx = 0; static int oldx = 0;
static int oldy = 0; static int oldy = 0;
Glyph g = {' ', ATTR_NULL, DefaultBG, DefaultCS, 0}; Glyph g = {' ', ATTR_NULL, DefaultBG, DefaultCS, 0};
@ -1163,7 +1160,7 @@ draw(int dummy) {
if(term.line[y][x].state & GLYPH_SET) if(term.line[y][x].state & GLYPH_SET)
xdrawc(x, y, term.line[y][x]); xdrawc(x, y, term.line[y][x]);
xcursor(); 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); XFlush(xw.dis);
} }
@ -1199,7 +1196,7 @@ draw(int redraw_all) {
if(i > 0) if(i > 0)
xdraws(buf, base, ox, y, i); xdraws(buf, base, ox, y, i);
} }
xcursor(); 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); XFlush(xw.dis);
} }