aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin J. Pohly <djpohly@gmail.com>2017-11-06 18:30:45 -0600
committerDevin J. Pohly <djpohly@gmail.com>2018-02-25 21:53:24 -0600
commit8b564c1a3f51c08e64c2f589852a02b8595d44ca (patch)
tree1f3b59838d9ba37accf56c7c570529921514e495
parent3bb900cd6c1c7a5364bd79bce63fdd8711bc878b (diff)
downloadst-8b564c1a3f51c08e64c2f589852a02b8595d44ca.tar.gz
st-8b564c1a3f51c08e64c2f589852a02b8595d44ca.tar.bz2
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>
-rw-r--r--st.c5
-rw-r--r--win.h5
-rw-r--r--x.c5
3 files changed, 5 insertions, 10 deletions
diff --git a/st.c b/st.c
index bcb6473..9cfa547 100644
--- 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 f95a679..123662e 100644
--- 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 a332ac9..e5b236d 100644
--- 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 *);