diff options
author | Devin J. Pohly <djpohly@gmail.com> | 2017-10-11 08:47:14 -0500 |
---|---|---|
committer | Devin J. Pohly <djpohly@gmail.com> | 2018-02-25 21:53:24 -0600 |
commit | ed132e11271d18a5d8aa163096bc6192c694bc47 (patch) | |
tree | 81b7a8ef14efadfaee06e7848a1c7ab953cd5ce6 /st.h | |
parent | dbe8676d7d69651132bde2b6d9ec3787cbbc552a (diff) | |
download | st-patched-ed132e11271d18a5d8aa163096bc6192c694bc47.tar.bz2 st-patched-ed132e11271d18a5d8aa163096bc6192c694bc47.tar.xz st-patched-ed132e11271d18a5d8aa163096bc6192c694bc47.zip |
Move key-matching functions into x.c
Modifiers and keysyms are specific to X, and the functions match and
kmap are only used in x.c. Needed to global-ize the key arrays and
lengths from config.h (for now).
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
Diffstat (limited to 'st.h')
-rw-r--r-- | st.h | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -176,6 +176,16 @@ typedef struct { | |||
176 | const Arg arg; | 176 | const Arg arg; |
177 | } Shortcut; | 177 | } Shortcut; |
178 | 178 | ||
179 | typedef struct { | ||
180 | KeySym k; | ||
181 | uint mask; | ||
182 | char *s; | ||
183 | /* three valued logic variables: 0 indifferent, 1 on, -1 off */ | ||
184 | signed char appkey; /* application keypad */ | ||
185 | signed char appcursor; /* application cursor */ | ||
186 | signed char crlf; /* crlf mode */ | ||
187 | } Key; | ||
188 | |||
179 | void die(const char *, ...); | 189 | void die(const char *, ...); |
180 | void redraw(void); | 190 | void redraw(void); |
181 | 191 | ||
@@ -184,7 +194,6 @@ void tnew(int, int); | |||
184 | void tresize(int, int); | 194 | void tresize(int, int); |
185 | void tsetdirt(int, int); | 195 | void tsetdirt(int, int); |
186 | void tsetdirtattr(int); | 196 | void tsetdirtattr(int); |
187 | int match(uint, uint); | ||
188 | void ttynew(void); | 197 | void ttynew(void); |
189 | size_t ttyread(void); | 198 | size_t ttyread(void); |
190 | void ttyresize(int, int); | 199 | void ttyresize(int, int); |
@@ -193,9 +202,7 @@ void ttywrite(const char *, size_t); | |||
193 | 202 | ||
194 | void resettitle(void); | 203 | void resettitle(void); |
195 | 204 | ||
196 | char *kmap(KeySym, uint); | ||
197 | void selclear(void); | 205 | void selclear(void); |
198 | |||
199 | void selinit(void); | 206 | void selinit(void); |
200 | void selnormalize(void); | 207 | void selnormalize(void); |
201 | int selected(int, int); | 208 | int selected(int, int); |
@@ -255,7 +262,12 @@ extern MouseShortcut mshortcuts[]; | |||
255 | extern size_t mshortcutslen; | 262 | extern size_t mshortcutslen; |
256 | extern Shortcut shortcuts[]; | 263 | extern Shortcut shortcuts[]; |
257 | extern size_t shortcutslen; | 264 | extern size_t shortcutslen; |
265 | extern KeySym mappedkeys[]; | ||
266 | extern size_t mappedkeyslen; | ||
267 | extern uint ignoremod; | ||
258 | extern uint forceselmod; | 268 | extern uint forceselmod; |
269 | extern Key key[]; | ||
270 | extern size_t keyslen; | ||
259 | extern uint selmasks[]; | 271 | extern uint selmasks[]; |
260 | extern size_t selmaskslen; | 272 | extern size_t selmaskslen; |
261 | extern char ascii_printable[]; | 273 | extern char ascii_printable[]; |