Make win variable internal to x.c

[st.git] / st.c

diff --git a/st.c b/st.c
index ec747cc..fdf697b 100644 (file)
--- a/st.c
+++ b/st.c
@@ -170,7 +170,6 @@ static char *base64dec(const char *);
 static ssize_t xwrite(int, const char *, size_t);
 
 /* Globals */
 static ssize_t xwrite(int, const char *, size_t);
 
 /* Globals */

-TermWindow win;

 Term term;
 Selection sel;
 int cmdfd;
 Term term;
 Selection sel;
 int cmdfd;


@@ -1683,11 +1682,8 @@ csihandle(void)
        case ' ':
                switch (csiescseq.mode[1]) {
                case 'q': /* DECSCUSR -- Set Cursor Style */
        case ' ':
                switch (csiescseq.mode[1]) {
                case 'q': /* DECSCUSR -- Set Cursor Style */

-                       DEFAULT(csiescseq.arg[0], 1);
-                       if (!BETWEEN(csiescseq.arg[0], 0, 6)) {
+                       if (xsetcursor(csiescseq.arg[0]))

                                goto unknown;
                                goto unknown;

-                       }
-                       win.cursor = csiescseq.arg[0];

                        break;
                default:
                        goto unknown;
                        break;
                default:
                        goto unknown;