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 /st.h | |
parent | 32d3b1d00f66eda4f5446f3b32cabed2c9a77a40 (diff) | |
download | st-patched-65976c1a29f2945c3cfb6af74cd6440cf193021d.tar.bz2 st-patched-65976c1a29f2945c3cfb6af74cd6440cf193021d.tar.xz st-patched-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 'st.h')
-rw-r--r-- | st.h | 50 |
1 files changed, 14 insertions, 36 deletions
@@ -190,6 +190,13 @@ typedef struct { | |||
190 | void die(const char *, ...); | 190 | void die(const char *, ...); |
191 | void redraw(void); | 191 | void redraw(void); |
192 | 192 | ||
193 | void iso14755(const Arg *); | ||
194 | void numlock(const Arg *); | ||
195 | void printscreen(const Arg *); | ||
196 | void printsel(const Arg *); | ||
197 | void sendbreak(const Arg *); | ||
198 | void toggleprinter(const Arg *); | ||
199 | |||
193 | int tattrset(int); | 200 | int tattrset(int); |
194 | void tnew(int, int); | 201 | void tnew(int, int); |
195 | void tresize(int, int); | 202 | void tresize(int, int); |
@@ -225,42 +232,13 @@ extern pid_t pid; | |||
225 | extern int oldbutton; | 232 | extern int oldbutton; |
226 | 233 | ||
227 | /* config.h globals */ | 234 | /* config.h globals */ |
228 | extern char font[]; | 235 | extern char *shell; |
229 | extern int borderpx; | 236 | extern char *utmp; |
230 | extern float cwscale; | 237 | extern char *stty_args; |
231 | extern float chscale; | 238 | extern char *vtiden; |
232 | extern unsigned int doubleclicktimeout; | 239 | extern char *worddelimiters; |
233 | extern unsigned int tripleclicktimeout; | ||
234 | extern int allowaltscreen; | 240 | extern int allowaltscreen; |
235 | extern unsigned int xfps; | 241 | extern char *termname; |
236 | extern unsigned int actionfps; | 242 | extern unsigned int tabspaces; |
237 | extern unsigned int cursorthickness; | ||
238 | extern int bellvolume; | ||
239 | extern unsigned int blinktimeout; | ||
240 | extern char termname[]; | ||
241 | extern const char *colorname[]; | ||
242 | extern size_t colornamelen; | ||
243 | extern unsigned int defaultfg; | 243 | extern unsigned int defaultfg; |
244 | extern unsigned int defaultbg; | 244 | extern unsigned int defaultbg; |
245 | extern unsigned int defaultcs; | ||
246 | extern unsigned int defaultrcs; | ||
247 | extern unsigned int cursorshape; | ||
248 | extern unsigned int cols; | ||
249 | extern unsigned int rows; | ||
250 | extern unsigned int mouseshape; | ||
251 | extern unsigned int mousefg; | ||
252 | extern unsigned int mousebg; | ||
253 | extern unsigned int defaultattr; | ||
254 | extern MouseShortcut mshortcuts[]; | ||
255 | extern size_t mshortcutslen; | ||
256 | extern Shortcut shortcuts[]; | ||
257 | extern size_t shortcutslen; | ||
258 | extern KeySym mappedkeys[]; | ||
259 | extern size_t mappedkeyslen; | ||
260 | extern uint ignoremod; | ||
261 | extern uint forceselmod; | ||
262 | extern Key key[]; | ||
263 | extern size_t keyslen; | ||
264 | extern uint selmasks[]; | ||
265 | extern size_t selmaskslen; | ||
266 | extern char ascii_printable[]; | ||