Move X-related config.h types into x.c

No need to expose Shortcut, MouseShortcut, and Key anymore.

Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
dev
Devin J. Pohly 2017-10-17 16:46:26 -05:00
parent 75c9a0ee1d
commit 416dd25727
2 changed files with 24 additions and 23 deletions

23
st.h
View File

@ -134,12 +134,6 @@ typedef struct {
int cursor; /* cursor style */ int cursor; /* cursor style */
} TermWindow; } TermWindow;
typedef struct {
uint b;
uint mask;
char *s;
} MouseShortcut;
typedef struct { typedef struct {
int mode; int mode;
int type; int type;
@ -170,23 +164,6 @@ typedef union {
const void *v; const void *v;
} Arg; } Arg;
typedef struct {
uint mod;
KeySym keysym;
void (*func)(const Arg *);
const Arg arg;
} Shortcut;
typedef struct {
KeySym k;
uint mask;
char *s;
/* three valued logic variables: 0 indifferent, 1 on, -1 off */
signed char appkey; /* application keypad */
signed char appcursor; /* application cursor */
signed char crlf; /* crlf mode */
} Key;
void die(const char *, ...); void die(const char *, ...);
void redraw(void); void redraw(void);

24
x.c
View File

@ -20,6 +20,30 @@ static char *argv0;
#include "st.h" #include "st.h"
#include "win.h" #include "win.h"
/* types used in config.h */
typedef struct {
uint mod;
KeySym keysym;
void (*func)(const Arg *);
const Arg arg;
} Shortcut;
typedef struct {
uint b;
uint mask;
char *s;
} MouseShortcut;
typedef struct {
KeySym k;
uint mask;
char *s;
/* three valued logic variables: 0 indifferent, 1 on, -1 off */
signed char appkey; /* application keypad */
signed char appcursor; /* application cursor */
signed char crlf; /* crlf mode */
} Key;
/* function definitions used in config.h */ /* function definitions used in config.h */
static void clipcopy(const Arg *); static void clipcopy(const Arg *);
static void clippaste(const Arg *); static void clippaste(const Arg *);