diff options
| author | Christoph Lohmann <20h@r-36.net> | 2015-10-05 20:48:24 +0200 |
|---|---|---|
| committer | Christoph Lohmann <20h@r-36.net> | 2015-10-05 20:48:24 +0200 |
| commit | 5ece2b5f4a2e56ddfb82e797dc973fca38c5273d (patch) | |
| tree | 8c01219e491d87308ac0c467fcd9a5576dd530b9 | |
| parent | 2bef36ab81c356b106f00221038b743819cd20bd (diff) | |
| download | st-patched-5ece2b5f4a2e56ddfb82e797dc973fca38c5273d.tar.bz2 st-patched-5ece2b5f4a2e56ddfb82e797dc973fca38c5273d.tar.xz st-patched-5ece2b5f4a2e56ddfb82e797dc973fca38c5273d.zip | |
More style changes. We forgot some switches.
| -rw-r--r-- | st.c | 66 |
1 files changed, 33 insertions, 33 deletions
| @@ -2433,15 +2433,15 @@ csihandle(void) | |||
| 2433 | break; | 2433 | break; |
| 2434 | case ' ': | 2434 | case ' ': |
| 2435 | switch (csiescseq.mode[1]) { | 2435 | switch (csiescseq.mode[1]) { |
| 2436 | case 'q': /* DECSCUSR -- Set Cursor Style */ | 2436 | case 'q': /* DECSCUSR -- Set Cursor Style */ |
| 2437 | DEFAULT(csiescseq.arg[0], 1); | 2437 | DEFAULT(csiescseq.arg[0], 1); |
| 2438 | if (!BETWEEN(csiescseq.arg[0], 0, 6)) { | 2438 | if (!BETWEEN(csiescseq.arg[0], 0, 6)) { |
| 2439 | goto unknown; | ||
| 2440 | } | ||
| 2441 | xw.cursor = csiescseq.arg[0]; | ||
| 2442 | break; | ||
| 2443 | default: | ||
| 2444 | goto unknown; | 2439 | goto unknown; |
| 2440 | } | ||
| 2441 | xw.cursor = csiescseq.arg[0]; | ||
| 2442 | break; | ||
| 2443 | default: | ||
| 2444 | goto unknown; | ||
| 2445 | } | 2445 | } |
| 2446 | break; | 2446 | break; |
| 2447 | } | 2447 | } |
| @@ -3851,32 +3851,32 @@ xdrawcursor(void) | |||
| 3851 | /* draw the new one */ | 3851 | /* draw the new one */ |
| 3852 | if (xw.state & WIN_FOCUSED) { | 3852 | if (xw.state & WIN_FOCUSED) { |
| 3853 | switch (xw.cursor) { | 3853 | switch (xw.cursor) { |
| 3854 | case 0: /* Blinking Block */ | 3854 | case 0: /* Blinking Block */ |
| 3855 | case 1: /* Blinking Block (Default) */ | 3855 | case 1: /* Blinking Block (Default) */ |
| 3856 | case 2: /* Steady Block */ | 3856 | case 2: /* Steady Block */ |
| 3857 | if (IS_SET(MODE_REVERSE)) { | 3857 | if (IS_SET(MODE_REVERSE)) { |
| 3858 | g.mode |= ATTR_REVERSE; | 3858 | g.mode |= ATTR_REVERSE; |
| 3859 | g.fg = defaultcs; | 3859 | g.fg = defaultcs; |
| 3860 | g.bg = defaultfg; | 3860 | g.bg = defaultfg; |
| 3861 | } | 3861 | } |
| 3862 | 3862 | ||
| 3863 | g.mode |= term.line[term.c.y][curx].mode & ATTR_WIDE; | 3863 | g.mode |= term.line[term.c.y][curx].mode & ATTR_WIDE; |
| 3864 | xdrawglyph(g, term.c.x, term.c.y); | 3864 | xdrawglyph(g, term.c.x, term.c.y); |
| 3865 | break; | 3865 | break; |
| 3866 | case 3: /* Blinking Underline */ | 3866 | case 3: /* Blinking Underline */ |
| 3867 | case 4: /* Steady Underline */ | 3867 | case 4: /* Steady Underline */ |
| 3868 | XftDrawRect(xw.draw, &dc.col[defaultcs], | 3868 | XftDrawRect(xw.draw, &dc.col[defaultcs], |
| 3869 | borderpx + curx * xw.cw, | 3869 | borderpx + curx * xw.cw, |
| 3870 | borderpx + (term.c.y + 1) * xw.ch - cursorthickness, | 3870 | borderpx + (term.c.y + 1) * xw.ch - cursorthickness, |
| 3871 | xw.cw, cursorthickness); | 3871 | xw.cw, cursorthickness); |
| 3872 | break; | 3872 | break; |
| 3873 | case 5: /* Blinking bar */ | 3873 | case 5: /* Blinking bar */ |
| 3874 | case 6: /* Steady bar */ | 3874 | case 6: /* Steady bar */ |
| 3875 | XftDrawRect(xw.draw, &dc.col[defaultcs], | 3875 | XftDrawRect(xw.draw, &dc.col[defaultcs], |
| 3876 | borderpx + curx * xw.cw, | 3876 | borderpx + curx * xw.cw, |
| 3877 | borderpx + term.c.y * xw.ch, | 3877 | borderpx + term.c.y * xw.ch, |
| 3878 | cursorthickness, xw.ch); | 3878 | cursorthickness, xw.ch); |
| 3879 | break; | 3879 | break; |
| 3880 | } | 3880 | } |
| 3881 | } else { | 3881 | } else { |
| 3882 | XftDrawRect(xw.draw, &dc.col[defaultcs], | 3882 | XftDrawRect(xw.draw, &dc.col[defaultcs], |