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>
master
Devin J. Pohly 7 years ago
parent 3bb900cd6c
commit 8b564c1a3f

@ -21,13 +21,8 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <libgen.h> #include <libgen.h>
#include <fontconfig/fontconfig.h>
#include <wchar.h> #include <wchar.h>
/* X11 */
#include <X11/cursorfont.h>
#include <X11/Xft/Xft.h>
#include "st.h" #include "st.h"
#include "win.h" #include "win.h"

@ -1,10 +1,5 @@
/* See LICENSE for license details. */ /* 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 draw(void);
void drawregion(int, int, int, int); void drawregion(int, int, int, int);

5
x.c

@ -44,6 +44,11 @@ typedef struct {
signed char crlf; /* crlf mode */ signed char crlf; /* crlf mode */
} Key; } 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 */ /* 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 *);

Loading…
Cancel
Save