[hackers] [st] Move X-related config.h types into x.c || Devin J. Pohly

From: <git_AT_suckless.org>
Date: Fri, 9 Mar 2018 15:37:37 +0100 (CET)

commit 416dd257274fd334be082b1138338adffa3e2d5e
Author: Devin J. Pohly <djpohly_AT_gmail.com>
AuthorDate: Tue Oct 17 16:46:26 2017 -0500
Commit: Devin J. Pohly <djpohly_AT_gmail.com>
CommitDate: Sun Feb 25 21:53:24 2018 -0600

    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_AT_gmail.com>

diff --git a/st.h b/st.h
index 9314607..71c79f4 100644
--- a/st.h
+++ b/st.h
_AT_@ -135,12 +135,6 @@ typedef struct {
 } TermWindow;
 
 typedef struct {
- uint b;
- uint mask;
- char *s;
-} MouseShortcut;
-
-typedef struct {
         int mode;
         int type;
         int snap;
_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 03555d1..24f6991 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 *);
Received on Fri Mar 09 2018 - 15:37:37 CET