diff options
| author | Devin J. Pohly <djpohly@gmail.com> | 2017-11-06 18:30:45 -0600 |
|---|---|---|
| committer | Devin J. Pohly <djpohly@gmail.com> | 2018-02-25 21:53:24 -0600 |
| commit | 8b564c1a3f51c08e64c2f589852a02b8595d44ca (patch) | |
| tree | 1f3b59838d9ba37accf56c7c570529921514e495 | |
| parent | 3bb900cd6c1c7a5364bd79bce63fdd8711bc878b (diff) | |
| download | st-8b564c1a3f51c08e64c2f589852a02b8595d44ca.tar.gz st-8b564c1a3f51c08e64c2f589852a02b8595d44ca.zip | |
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.c | 5 | ||||
| -rw-r--r-- | win.h | 5 | ||||
| -rw-r--r-- | x.c | 5 |
3 files changed, 5 insertions, 10 deletions
| @@ -21,13 +21,8 @@ | |||
| 21 | #include <time.h> | 21 | #include <time.h> |
| 22 | #include <unistd.h> | 22 | #include <unistd.h> |
| 23 | #include <libgen.h> | 23 | #include <libgen.h> |
| 24 | #include <fontconfig/fontconfig.h> | ||
| 25 | #include <wchar.h> | 24 | #include <wchar.h> |
| 26 | 25 | ||
| 27 | /* X11 */ | ||
| 28 | #include <X11/cursorfont.h> | ||
| 29 | #include <X11/Xft/Xft.h> | ||
| 30 | |||
| 31 | #include "st.h" | 26 | #include "st.h" |
| 32 | #include "win.h" | 27 | #include "win.h" |
| 33 | 28 | ||
| @@ -1,10 +1,5 @@ | |||
| 1 | /* See LICENSE for license details. */ | 1 | /* See LICENSE for license details. */ |
| 2 | 2 | ||
| 3 | /* X modifiers */ | ||
| 4 | #define XK_ANY_MOD UINT_MAX | ||
| 5 | #define XK_NO_MOD 0 | ||
| 6 | #define XK_SWITCH_MOD (1<<13) | ||
| 7 | |||
| 8 | void draw(void); | 3 | void draw(void); |
| 9 | void drawregion(int, int, int, int); | 4 | void drawregion(int, int, int, int); |
| 10 | 5 | ||
| @@ -44,6 +44,11 @@ typedef struct { | |||
| 44 | signed char crlf; /* crlf mode */ | 44 | signed char crlf; /* crlf mode */ |
| 45 | } Key; | 45 | } Key; |
| 46 | 46 | ||
| 47 | /* X modifiers */ | ||
| 48 | #define XK_ANY_MOD UINT_MAX | ||
| 49 | #define XK_NO_MOD 0 | ||
| 50 | #define XK_SWITCH_MOD (1<<13) | ||
| 51 | |||
| 47 | /* function definitions used in config.h */ | 52 | /* function definitions used in config.h */ |
| 48 | static void clipcopy(const Arg *); | 53 | static void clipcopy(const Arg *); |
| 49 | static void clippaste(const Arg *); | 54 | static void clippaste(const Arg *); |
