Remove X and fontconfig from st.c

None of the X-related includes are needed any longer.  In addition, move
the X modifier defines into x.c, as they are not used outside.

Signed-off-by: Devin J. Pohly <djpohly@gmail.com>

diff --git a/st.c b/st.c
index bcb64732947a484a682febd25f31fa828dd0fb7b..9cfa5470925cd360469c7ae1d3471a336c366e56 100644 (file)
--- a/st.c
+++ b/st.c
@@ -21,13 +21,8 @@
 #include <time.h>
 #include <unistd.h>
 #include <libgen.h>
-#include <fontconfig/fontconfig.h>
 #include <wchar.h>
 
-/* X11 */
-#include <X11/cursorfont.h>
-#include <X11/Xft/Xft.h>
-
 #include "st.h"
 #include "win.h"
 

diff --git a/win.h b/win.h
index f95a6790db7a19936b2ab84f0079ef6d6ce78d60..123662e97a462fdf9e1b0a233cd17b3e9cbf3d3b 100644 (file)
--- a/win.h
+++ b/win.h
@@ -1,10 +1,5 @@
 /* See LICENSE for license details. */
 
-/* X modifiers */
-#define XK_ANY_MOD    UINT_MAX
-#define XK_NO_MOD     0
-#define XK_SWITCH_MOD (1<<13)
-
 void draw(void);
 void drawregion(int, int, int, int);
 

diff --git a/x.c b/x.c
index a332ac9386272404aa3d563cfd11ed7740959484..e5b236de5cfb8cda3ad271a7e3c9fda3889d17f9 100644 (file)
--- a/x.c
+++ b/x.c
@@ -44,6 +44,11 @@ typedef struct {
        signed char crlf;      /* crlf mode          */
 } Key;
 
+/* X modifiers */
+#define XK_ANY_MOD    UINT_MAX
+#define XK_NO_MOD     0
+#define XK_SWITCH_MOD (1<<13)
+
 /* function definitions used in config.h */
 static void clipcopy(const Arg *);
 static void clippaste(const Arg *);