commit dec6b530a4fddf405c1822b2cac6e2036d3c8b75
from: Steve Ward <planet36@gmail.com>
via: Hiltjo Posthuma <hiltjo@codemadness.org>
date: Sun May 24 11:45:42 2020 UTC

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).

commit - 475a0a36cb4fda1da30f014da65988e99b222876
commit + dec6b530a4fddf405c1822b2cac6e2036d3c8b75
blob - 1dc44d65cd2fc114ec9791df6e325d2bd7dfdc04
blob + 210f184a31f3a8a83705f44d9c1ce0432deb38fa
--- x.c
+++ x.c
@@ -1526,8 +1526,8 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, G
 	/* draw the new one */
 	if (IS_SET(MODE_FOCUSED)) {
 		switch (win.cursor) {
-		case 7: /* st extension: snowman (U+2603) */
-			g.u = 0x2603;
+		case 7: /* st extension */
+			g.u = 0x2603; /* snowman (U+2603) */
 			/* FALLTHROUGH */
 		case 0: /* Blinking Block */
 		case 1: /* Blinking Block (Default) */
@@ -1690,8 +1690,7 @@ xsetmode(int set, unsigned int flags)
 int
 xsetcursor(int cursor)
 {
-	DEFAULT(cursor, 1);
-	if (!BETWEEN(cursor, 0, 6))
+	if (!BETWEEN(cursor, 0, 7)) /* 7: st extension */
 		return 1;
 	win.cursor = cursor;
 	return 0;
@@ -1983,7 +1982,7 @@ main(int argc, char *argv[])
 {
 	xw.l = xw.t = 0;
 	xw.isfixed = False;
-	win.cursor = cursorshape;
+	xsetcursor(cursorshape);
 
 	ARGBEGIN {
 	case 'a':