diff options
author | Devin J. Pohly <djpohly@gmail.com> | 2017-10-17 15:21:04 -0500 |
---|---|---|
committer | Devin J. Pohly <djpohly@gmail.com> | 2018-02-25 21:53:24 -0600 |
commit | 65976c1a29f2945c3cfb6af74cd6440cf193021d (patch) | |
tree | 670d2b3063767c1363322d6db5e73447e682081a /x.c | |
parent | 32d3b1d00f66eda4f5446f3b32cabed2c9a77a40 (diff) | |
download | st-65976c1a29f2945c3cfb6af74cd6440cf193021d.tar.gz st-65976c1a29f2945c3cfb6af74cd6440cf193021d.zip |
Move config.h include from st.c to x.c
config.h includes references to KeySyms and other X stuff. Until we
come up with a cleaner way to separate configuration, it is simpler
(leads to more code removal) to have this here.
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
Diffstat (limited to 'x.c')
-rw-r--r-- | x.c | 37 |
1 files changed, 37 insertions, 0 deletions
@@ -20,6 +20,25 @@ static char *argv0; | |||
20 | #include "st.h" | 20 | #include "st.h" |
21 | #include "win.h" | 21 | #include "win.h" |
22 | 22 | ||
23 | /* function definitions used in config.h */ | ||
24 | static void clipcopy(const Arg *); | ||
25 | static void clippaste(const Arg *); | ||
26 | static void selpaste(const Arg *); | ||
27 | static void zoom(const Arg *); | ||
28 | static void zoomabs(const Arg *); | ||
29 | static void zoomreset(const Arg *); | ||
30 | |||
31 | /* config.h for applying patches and the configuration. */ | ||
32 | #include "config.h" | ||
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 | |||
23 | /* XEMBED messages */ | 42 | /* XEMBED messages */ |
24 | #define XEMBED_FOCUS_IN 4 | 43 | #define XEMBED_FOCUS_IN 4 |
25 | #define XEMBED_FOCUS_OUT 5 | 44 | #define XEMBED_FOCUS_OUT 5 |
@@ -189,6 +208,24 @@ static char *opt_name = NULL; | |||
189 | static char *opt_title = NULL; | 208 | static char *opt_title = NULL; |
190 | 209 | ||
191 | void | 210 | void |
211 | clipcopy(const Arg *dummy) | ||
212 | { | ||
213 | xclipcopy(); | ||
214 | } | ||
215 | |||
216 | void | ||
217 | clippaste(const Arg *dummy) | ||
218 | { | ||
219 | xclippaste(); | ||
220 | } | ||
221 | |||
222 | void | ||
223 | selpaste(const Arg *dummy) | ||
224 | { | ||
225 | xselpaste(); | ||
226 | } | ||
227 | |||
228 | void | ||
192 | zoom(const Arg *arg) | 229 | zoom(const Arg *arg) |
193 | { | 230 | { |
194 | Arg larg; | 231 | Arg larg; |