There was only a single reference to the `win` variable in st.c, so
exporting that to x.c allows us to rid ourselves of another extern.
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
static ssize_t xwrite(int, const char *, size_t);
/* Globals */
-TermWindow win;
Term term;
Selection sel;
int cmdfd;
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;
- }
- win.cursor = csiescseq.arg[0];
break;
default:
goto unknown;
char *xstrdup(char *);
/* Globals */
-extern TermWindow win;
extern Term term;
extern Selection sel;
extern int cmdfd;
void xloadcols(void);
int xsetcolorname(int, const char *);
void xsettitle(char *);
+int xsetcursor(int);
void xsetpointermotion(int);
void xsetsel(char *, Time);
static DC dc;
static XWindow xw;
static XSelection xsel;
+static TermWindow win;
enum window_state {
WIN_VISIBLE = 1,
XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
}
+int
+xsetcursor(int cursor)
+{
+ DEFAULT(cursor, 1);
+ if (!BETWEEN(cursor, 0, 6))
+ return 1;
+ win.cursor = cursor;
+ return 0;
+}
+
void
xseturgency(int add)
{