Call xsetcursor to set win.cursor in main
In xsetcursor, remove "DEFAULT(cursor, 1)" because 0 is a valid value. Increase max allowed value of cursor from 6 to 7 (st extension).
This commit is contained in:
parent
475a0a36cb
commit
dec6b530a4
9
x.c
9
x.c
@ -1526,8 +1526,8 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
|||||||
/* draw the new one */
|
/* draw the new one */
|
||||||
if (IS_SET(MODE_FOCUSED)) {
|
if (IS_SET(MODE_FOCUSED)) {
|
||||||
switch (win.cursor) {
|
switch (win.cursor) {
|
||||||
case 7: /* st extension: snowman (U+2603) */
|
case 7: /* st extension */
|
||||||
g.u = 0x2603;
|
g.u = 0x2603; /* snowman (U+2603) */
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
case 0: /* Blinking Block */
|
case 0: /* Blinking Block */
|
||||||
case 1: /* Blinking Block (Default) */
|
case 1: /* Blinking Block (Default) */
|
||||||
@ -1690,8 +1690,7 @@ xsetmode(int set, unsigned int flags)
|
|||||||
int
|
int
|
||||||
xsetcursor(int cursor)
|
xsetcursor(int cursor)
|
||||||
{
|
{
|
||||||
DEFAULT(cursor, 1);
|
if (!BETWEEN(cursor, 0, 7)) /* 7: st extension */
|
||||||
if (!BETWEEN(cursor, 0, 6))
|
|
||||||
return 1;
|
return 1;
|
||||||
win.cursor = cursor;
|
win.cursor = cursor;
|
||||||
return 0;
|
return 0;
|
||||||
@ -1983,7 +1982,7 @@ main(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
xw.l = xw.t = 0;
|
xw.l = xw.t = 0;
|
||||||
xw.isfixed = False;
|
xw.isfixed = False;
|
||||||
win.cursor = cursorshape;
|
xsetcursor(cursorshape);
|
||||||
|
|
||||||
ARGBEGIN {
|
ARGBEGIN {
|
||||||
case 'a':
|
case 'a':
|
||||||
|
Loading…
Reference in New Issue
Block a user