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

1 files changed, 4 insertions, 5 deletions

diff --git a/x.c b/x.c
index 1dc44d6..210f184 100644
--- a/x.c
+++ b/x.c
@@ -1526,8 +1526,8 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
         /* 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':