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>
This commit is contained in:
		
							
								
								
									
										5
									
								
								st.c
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								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"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										5
									
								
								win.h
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								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);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										5
									
								
								x.c
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								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 *);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user