Remove X and fontconfig from st.c

[st.git] / x.c

diff --git a/x.c b/x.c
index 46356fe..e5b236d 100644 (file)
--- a/x.c
+++ b/x.c
@@ -20,6 +20,35 @@ static char *argv0;
 #include "st.h"
 #include "win.h"
 
+/* types used in config.h */
+typedef struct {
+       uint mod;
+       KeySym keysym;
+       void (*func)(const Arg *);
+       const Arg arg;
+} Shortcut;
+
+typedef struct {
+       uint b;
+       uint mask;
+       char *s;
+} MouseShortcut;
+
+typedef struct {
+       KeySym k;
+       uint mask;
+       char *s;
+       /* three valued logic variables: 0 indifferent, 1 on, -1 off */
+       signed char appkey;    /* application keypad */
+       signed char appcursor; /* application cursor */
+       signed char crlf;      /* crlf mode          */
+} Key;
+
+/* X modifiers */
+#define XK_ANY_MOD    UINT_MAX
+#define XK_NO_MOD     0
+#define XK_SWITCH_MOD (1<<13)
+
 /* function definitions used in config.h */
 static void clipcopy(const Arg *);
 static void clippaste(const Arg *);
@@ -31,14 +60,6 @@ static void zoomreset(const Arg *);
 /* config.h for applying patches and the configuration. */
 #include "config.h"
 
-/* config.h array lengths */
-size_t colornamelen = LEN(colorname);
-size_t mshortcutslen = LEN(mshortcuts);
-size_t shortcutslen = LEN(shortcuts);
-size_t selmaskslen = LEN(selmasks);
-size_t keyslen = LEN(key);
-size_t mappedkeyslen = LEN(mappedkeys);
-
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4
 #define XEMBED_FOCUS_OUT 5
@@ -132,7 +153,7 @@ static void propnotify(XEvent *);
 static void selnotify(XEvent *);
 static void selclear_(XEvent *);
 static void selrequest(XEvent *);
-static void selcopy(Time);
+static void setsel(char *, Time);
 static void getbuttoninfo(XEvent *);
 static void mousereport(XEvent *);
 static char *kmap(KeySym, uint);
@@ -171,6 +192,7 @@ static void (*handler[LASTEvent])(XEvent *) = {
 static DC dc;
 static XWindow xw;
 static XSelection xsel;
+static TermWindow win;
 
 enum window_state {
        WIN_VISIBLE = 1,
@@ -301,7 +323,7 @@ getbuttoninfo(XEvent *e)
        selnormalize();
 
        sel.type = SEL_REGULAR;
-       for (type = 1; type < selmaskslen; ++type) {
+       for (type = 1; type < LEN(selmasks); ++type) {
                if (match(selmasks[type], state)) {
                        sel.type = type;
                        break;
@@ -384,7 +406,7 @@ bpress(XEvent *e)
                return;
        }
 
-       for (ms = mshortcuts; ms < mshortcuts + mshortcutslen; ms++) {
+       for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
                if (e->xbutton.button == ms->b
                                && match(ms->mask, e->xbutton.state)) {
                        ttysend(ms->s, strlen(ms->s));
@@ -423,12 +445,6 @@ bpress(XEvent *e)
        }
 }
 
-void
-selcopy(Time t)
-{
-       xsetsel(getsel(), t);
-}
-
 void
 propnotify(XEvent *e)
 {
@@ -603,7 +619,7 @@ selrequest(XEvent *e)
 }
 
 void
-xsetsel(char *str, Time t)
+setsel(char *str, Time t)
 {
        free(sel.primary);
        sel.primary = str;
@@ -613,6 +629,12 @@ xsetsel(char *str, Time t)
                selclear_(NULL);
 }
 
+void
+xsetsel(char *str)
+{
+       setsel(str, CurrentTime);
+}
+
 void
 brelease(XEvent *e)
 {
@@ -626,7 +648,7 @@ brelease(XEvent *e)
        } else if (e->xbutton.button == Button1) {
                if (sel.mode == SEL_READY) {
                        getbuttoninfo(e);
-                       selcopy(e->xbutton.time);
+                       setsel(getsel(), e->xbutton.time);
                } else
                        selclear_(NULL);
                sel.mode = SEL_IDLE;
@@ -728,7 +750,7 @@ xloadcols(void)
        static int loaded;
        Color *cp;
 
-       dc.collen = MAX(colornamelen, 256);
+       dc.collen = MAX(LEN(colorname), 256);
        dc.col = xmalloc(dc.collen * sizeof(Color));
 
        if (loaded) {
@@ -1599,6 +1621,16 @@ xsetpointermotion(int set)
        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)
 {
@@ -1653,16 +1685,16 @@ kmap(KeySym k, uint state)
        int i;
 
        /* Check for mapped keys out of X11 function keys. */
-       for (i = 0; i < mappedkeyslen; i++) {
+       for (i = 0; i < LEN(mappedkeys); i++) {
                if (mappedkeys[i] == k)
                        break;
        }
-       if (i == mappedkeyslen) {
+       if (i == LEN(mappedkeys)) {
                if ((k & 0xFFFF) < 0xFD00)
                        return NULL;
        }
 
-       for (kp = key; kp < key + keyslen; kp++) {
+       for (kp = key; kp < key + LEN(key); kp++) {
                if (kp->k != k)
                        continue;
 
@@ -1702,7 +1734,7 @@ kpress(XEvent *ev)
 
        len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
        /* 1. shortcuts */
-       for (bp = shortcuts; bp < shortcuts + shortcutslen; bp++) {
+       for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
                if (ksym == bp->keysym && match(bp->mod, e->state)) {
                        bp->func(&(bp->arg));
                        return;