More style changes. We forgot some switches.

master
Christoph Lohmann 2015-10-05 20:48:24 +02:00
parent 2bef36ab81
commit 5ece2b5f4a
1 changed files with 33 additions and 33 deletions

66
st.c
View File

@ -2433,15 +2433,15 @@ csihandle(void)
break; break;
case ' ': case ' ':
switch (csiescseq.mode[1]) { switch (csiescseq.mode[1]) {
case 'q': /* DECSCUSR -- Set Cursor Style */ case 'q': /* DECSCUSR -- Set Cursor Style */
DEFAULT(csiescseq.arg[0], 1); DEFAULT(csiescseq.arg[0], 1);
if (!BETWEEN(csiescseq.arg[0], 0, 6)) { if (!BETWEEN(csiescseq.arg[0], 0, 6)) {
goto unknown;
}
xw.cursor = csiescseq.arg[0];
break;
default:
goto unknown; goto unknown;
}
xw.cursor = csiescseq.arg[0];
break;
default:
goto unknown;
} }
break; break;
} }
@ -3851,32 +3851,32 @@ xdrawcursor(void)
/* draw the new one */ /* draw the new one */
if (xw.state & WIN_FOCUSED) { if (xw.state & WIN_FOCUSED) {
switch (xw.cursor) { switch (xw.cursor) {
case 0: /* Blinking Block */ case 0: /* Blinking Block */
case 1: /* Blinking Block (Default) */ case 1: /* Blinking Block (Default) */
case 2: /* Steady Block */ case 2: /* Steady Block */
if (IS_SET(MODE_REVERSE)) { if (IS_SET(MODE_REVERSE)) {
g.mode |= ATTR_REVERSE; g.mode |= ATTR_REVERSE;
g.fg = defaultcs; g.fg = defaultcs;
g.bg = defaultfg; g.bg = defaultfg;
} }
g.mode |= term.line[term.c.y][curx].mode & ATTR_WIDE; g.mode |= term.line[term.c.y][curx].mode & ATTR_WIDE;
xdrawglyph(g, term.c.x, term.c.y); xdrawglyph(g, term.c.x, term.c.y);
break; break;
case 3: /* Blinking Underline */ case 3: /* Blinking Underline */
case 4: /* Steady Underline */ case 4: /* Steady Underline */
XftDrawRect(xw.draw, &dc.col[defaultcs], XftDrawRect(xw.draw, &dc.col[defaultcs],
borderpx + curx * xw.cw, borderpx + curx * xw.cw,
borderpx + (term.c.y + 1) * xw.ch - cursorthickness, borderpx + (term.c.y + 1) * xw.ch - cursorthickness,
xw.cw, cursorthickness); xw.cw, cursorthickness);
break; break;
case 5: /* Blinking bar */ case 5: /* Blinking bar */
case 6: /* Steady bar */ case 6: /* Steady bar */
XftDrawRect(xw.draw, &dc.col[defaultcs], XftDrawRect(xw.draw, &dc.col[defaultcs],
borderpx + curx * xw.cw, borderpx + curx * xw.cw,
borderpx + term.c.y * xw.ch, borderpx + term.c.y * xw.ch,
cursorthickness, xw.ch); cursorthickness, xw.ch);
break; break;
} }
} else { } else {
XftDrawRect(xw.draw, &dc.col[defaultcs], XftDrawRect(xw.draw, &dc.col[defaultcs],