Remove unneeded array-length variables

[st.git] / x.c

diff --git a/x.c b/x.c
index cb8c351..03555d1 100644 (file)
--- a/x.c
+++ b/x.c
@@ -31,14 +31,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
@@ -210,19 +202,33 @@ static char *opt_title = NULL;
 void
 clipcopy(const Arg *dummy)
 {
-       xclipcopy();
+       Atom clipboard;
+
+       if (sel.clipboard != NULL)
+               free(sel.clipboard);
+
+       if (sel.primary != NULL) {
+               sel.clipboard = xstrdup(sel.primary);
+               clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+               XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
+       }
 }
 
 void
 clippaste(const Arg *dummy)
 {
-       xclippaste();
+       Atom clipboard;
+
+       clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+       XConvertSelection(xw.dpy, clipboard, xsel.xtarget, clipboard,
+                       xw.win, CurrentTime);
 }
 
 void
 selpaste(const Arg *dummy)
 {
-       xselpaste();
+       XConvertSelection(xw.dpy, XA_PRIMARY, xsel.xtarget, XA_PRIMARY,
+                       xw.win, CurrentTime);
 }
 
 void
@@ -287,7 +293,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;
@@ -370,7 +376,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));
@@ -518,36 +524,10 @@ selnotify(XEvent *e)
        XDeleteProperty(xw.dpy, xw.win, (int)property);
 }
 
-void
-xselpaste(void)
-{
-       XConvertSelection(xw.dpy, XA_PRIMARY, xsel.xtarget, XA_PRIMARY,
-                       xw.win, CurrentTime);
-}
-
 void
 xclipcopy(void)
 {
-       Atom clipboard;
-
-       if (sel.clipboard != NULL)
-               free(sel.clipboard);
-
-       if (sel.primary != NULL) {
-               sel.clipboard = xstrdup(sel.primary);
-               clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-               XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
-       }
-}
-
-void
-xclippaste(void)
-{
-       Atom clipboard;
-
-       clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-       XConvertSelection(xw.dpy, clipboard, xsel.xtarget, clipboard,
-                       xw.win, CurrentTime);
+       clipcopy(NULL);
 }
 
 void
@@ -634,7 +614,7 @@ brelease(XEvent *e)
        }
 
        if (e->xbutton.button == Button2) {
-               xselpaste();
+               selpaste(NULL);
        } else if (e->xbutton.button == Button1) {
                if (sel.mode == SEL_READY) {
                        getbuttoninfo(e);
@@ -740,7 +720,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) {
@@ -1665,16 +1645,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;
 
@@ -1714,7 +1694,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;