[hackers] [st] [PATCH 4/4] move X-related config.h types into x.c

From: Devin J. Pohly <djpohly_AT_gmail.com>
Date: Tue, 17 Oct 2017 23:00:46 -0500

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

---
 st.h | 23 -----------------------
 x.c  | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/st.h b/st.h
index 9314607..71c79f4 100644
--- a/st.h
+++ b/st.h
_AT_@ -134,12 +134,6 @@ typedef struct {
 	int cursor; /* cursor style */
 } TermWindow;
 
-typedef struct {
-	uint b;
-	uint mask;
-	char *s;
-} MouseShortcut;
-
 typedef struct {
 	int mode;
 	int type;
_AT_@ -170,23 +164,6 @@ typedef union {
 	const void *v;
 } 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 redraw(void);
 
diff --git a/x.c b/x.c
index 2b6df06..d4338d6 100644
--- a/x.c
+++ b/x.c
_AT_@ -20,6 +20,30 @@ static char *argv0;
 #include "st.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 */
 static void clipcopy(const Arg *);
 static void clippaste(const Arg *);
-- 
2.14.2

Received on Wed Oct 18 2017 - 06:00:46 CEST