diff options
author | Devin J. Pohly <djpohly@gmail.com> | 2017-10-17 15:46:31 -0500 |
---|---|---|
committer | Devin J. Pohly <djpohly@gmail.com> | 2018-02-25 21:53:24 -0600 |
commit | 75c9a0ee1d232a1a177746d97a13cf92b03da44a (patch) | |
tree | 9446e71ea3864679dda61241f906c1d72227b744 | |
parent | 428f01969aaf48ffa2983746c0a397bcc8946799 (diff) | |
download | st-patched-75c9a0ee1d232a1a177746d97a13cf92b03da44a.tar.bz2 st-patched-75c9a0ee1d232a1a177746d97a13cf92b03da44a.tar.xz st-patched-75c9a0ee1d232a1a177746d97a13cf92b03da44a.zip |
Remove unneeded array-length variables
These were only used in x.c, which now has direct visibility of the
config.h arrays.
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
-rw-r--r-- | x.c | 22 |
1 files changed, 7 insertions, 15 deletions
@@ -31,14 +31,6 @@ static void zoomreset(const Arg *); | |||
31 | /* config.h for applying patches and the configuration. */ | 31 | /* config.h for applying patches and the configuration. */ |
32 | #include "config.h" | 32 | #include "config.h" |
33 | 33 | ||
34 | /* config.h array lengths */ | ||
35 | size_t colornamelen = LEN(colorname); | ||
36 | size_t mshortcutslen = LEN(mshortcuts); | ||
37 | size_t shortcutslen = LEN(shortcuts); | ||
38 | size_t selmaskslen = LEN(selmasks); | ||
39 | size_t keyslen = LEN(key); | ||
40 | size_t mappedkeyslen = LEN(mappedkeys); | ||
41 | |||
42 | /* XEMBED messages */ | 34 | /* XEMBED messages */ |
43 | #define XEMBED_FOCUS_IN 4 | 35 | #define XEMBED_FOCUS_IN 4 |
44 | #define XEMBED_FOCUS_OUT 5 | 36 | #define XEMBED_FOCUS_OUT 5 |
@@ -301,7 +293,7 @@ getbuttoninfo(XEvent *e) | |||
301 | selnormalize(); | 293 | selnormalize(); |
302 | 294 | ||
303 | sel.type = SEL_REGULAR; | 295 | sel.type = SEL_REGULAR; |
304 | for (type = 1; type < selmaskslen; ++type) { | 296 | for (type = 1; type < LEN(selmasks); ++type) { |
305 | if (match(selmasks[type], state)) { | 297 | if (match(selmasks[type], state)) { |
306 | sel.type = type; | 298 | sel.type = type; |
307 | break; | 299 | break; |
@@ -384,7 +376,7 @@ bpress(XEvent *e) | |||
384 | return; | 376 | return; |
385 | } | 377 | } |
386 | 378 | ||
387 | for (ms = mshortcuts; ms < mshortcuts + mshortcutslen; ms++) { | 379 | for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) { |
388 | if (e->xbutton.button == ms->b | 380 | if (e->xbutton.button == ms->b |
389 | && match(ms->mask, e->xbutton.state)) { | 381 | && match(ms->mask, e->xbutton.state)) { |
390 | ttysend(ms->s, strlen(ms->s)); | 382 | ttysend(ms->s, strlen(ms->s)); |
@@ -728,7 +720,7 @@ xloadcols(void) | |||
728 | static int loaded; | 720 | static int loaded; |
729 | Color *cp; | 721 | Color *cp; |
730 | 722 | ||
731 | dc.collen = MAX(colornamelen, 256); | 723 | dc.collen = MAX(LEN(colorname), 256); |
732 | dc.col = xmalloc(dc.collen * sizeof(Color)); | 724 | dc.col = xmalloc(dc.collen * sizeof(Color)); |
733 | 725 | ||
734 | if (loaded) { | 726 | if (loaded) { |
@@ -1653,16 +1645,16 @@ kmap(KeySym k, uint state) | |||
1653 | int i; | 1645 | int i; |
1654 | 1646 | ||
1655 | /* Check for mapped keys out of X11 function keys. */ | 1647 | /* Check for mapped keys out of X11 function keys. */ |
1656 | for (i = 0; i < mappedkeyslen; i++) { | 1648 | for (i = 0; i < LEN(mappedkeys); i++) { |
1657 | if (mappedkeys[i] == k) | 1649 | if (mappedkeys[i] == k) |
1658 | break; | 1650 | break; |
1659 | } | 1651 | } |
1660 | if (i == mappedkeyslen) { | 1652 | if (i == LEN(mappedkeys)) { |
1661 | if ((k & 0xFFFF) < 0xFD00) | 1653 | if ((k & 0xFFFF) < 0xFD00) |
1662 | return NULL; | 1654 | return NULL; |
1663 | } | 1655 | } |
1664 | 1656 | ||
1665 | for (kp = key; kp < key + keyslen; kp++) { | 1657 | for (kp = key; kp < key + LEN(key); kp++) { |
1666 | if (kp->k != k) | 1658 | if (kp->k != k) |
1667 | continue; | 1659 | continue; |
1668 | 1660 | ||
@@ -1702,7 +1694,7 @@ kpress(XEvent *ev) | |||
1702 | 1694 | ||
1703 | len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status); | 1695 | len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status); |
1704 | /* 1. shortcuts */ | 1696 | /* 1. shortcuts */ |
1705 | for (bp = shortcuts; bp < shortcuts + shortcutslen; bp++) { | 1697 | for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) { |
1706 | if (ksym == bp->keysym && match(bp->mod, e->state)) { | 1698 | if (ksym == bp->keysym && match(bp->mod, e->state)) { |
1707 | bp->func(&(bp->arg)); | 1699 | bp->func(&(bp->arg)); |
1708 | return; | 1700 | return; |