diff options
| -rw-r--r-- | st.h | 23 | ||||
| -rw-r--r-- | x.c | 24 |
2 files changed, 24 insertions, 23 deletions
| @@ -135,12 +135,6 @@ typedef struct { | |||
| 135 | } TermWindow; | 135 | } TermWindow; |
| 136 | 136 | ||
| 137 | typedef struct { | 137 | typedef struct { |
| 138 | uint b; | ||
| 139 | uint mask; | ||
| 140 | char *s; | ||
| 141 | } MouseShortcut; | ||
| 142 | |||
| 143 | typedef struct { | ||
| 144 | int mode; | 138 | int mode; |
| 145 | int type; | 139 | int type; |
| 146 | int snap; | 140 | int snap; |
| @@ -170,23 +164,6 @@ typedef union { | |||
| 170 | const void *v; | 164 | const void *v; |
| 171 | } Arg; | 165 | } Arg; |
| 172 | 166 | ||
| 173 | typedef struct { | ||
| 174 | uint mod; | ||
| 175 | KeySym keysym; | ||
| 176 | void (*func)(const Arg *); | ||
| 177 | const Arg arg; | ||
| 178 | } Shortcut; | ||
| 179 | |||
| 180 | typedef struct { | ||
| 181 | KeySym k; | ||
| 182 | uint mask; | ||
| 183 | char *s; | ||
| 184 | /* three valued logic variables: 0 indifferent, 1 on, -1 off */ | ||
| 185 | signed char appkey; /* application keypad */ | ||
| 186 | signed char appcursor; /* application cursor */ | ||
| 187 | signed char crlf; /* crlf mode */ | ||
| 188 | } Key; | ||
| 189 | |||
| 190 | void die(const char *, ...); | 167 | void die(const char *, ...); |
| 191 | void redraw(void); | 168 | void redraw(void); |
| 192 | 169 | ||
| @@ -20,6 +20,30 @@ static char *argv0; | |||
| 20 | #include "st.h" | 20 | #include "st.h" |
| 21 | #include "win.h" | 21 | #include "win.h" |
| 22 | 22 | ||
| 23 | /* types used in config.h */ | ||
| 24 | typedef struct { | ||
| 25 | uint mod; | ||
| 26 | KeySym keysym; | ||
| 27 | void (*func)(const Arg *); | ||
| 28 | const Arg arg; | ||
| 29 | } Shortcut; | ||
| 30 | |||
| 31 | typedef struct { | ||
| 32 | uint b; | ||
| 33 | uint mask; | ||
| 34 | char *s; | ||
| 35 | } MouseShortcut; | ||
| 36 | |||
| 37 | typedef struct { | ||
| 38 | KeySym k; | ||
| 39 | uint mask; | ||
| 40 | char *s; | ||
| 41 | /* three valued logic variables: 0 indifferent, 1 on, -1 off */ | ||
| 42 | signed char appkey; /* application keypad */ | ||
| 43 | signed char appcursor; /* application cursor */ | ||
| 44 | signed char crlf; /* crlf mode */ | ||
| 45 | } Key; | ||
| 46 | |||
| 23 | /* function definitions used in config.h */ | 47 | /* function definitions used in config.h */ |
| 24 | static void clipcopy(const Arg *); | 48 | static void clipcopy(const Arg *); |
| 25 | static void clippaste(const Arg *); | 49 | static void clippaste(const Arg *); |
