replace X11 headers with libs/fvwm_x11.h

fvwmorg · Dec 1, 2020 · 0bb15b2 · 0bb15b2
1 parent 59748fd
commit 0bb15b2
Show file tree

Hide file tree

Showing 89 changed files with 153 additions and 265 deletions.
diff --git a/fvwm/builtins.c b/fvwm/builtins.c
@@ -23,8 +23,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <X11/keysym.h>
 
+#include "libs/fvwm_x11.h"
 #include "libs/fvwmlib.h"
 #include "libs/fvwmsignal.h"
 #include "libs/setpgrp.h"
@@ -271,7 +271,7 @@ static void obsolete_imagepaths( const char* pre_path )
  *
  */
 static char *ReadTitleButton(
-	char *s, TitleButton *tb, Boolean append, int button)
+	char *s, TitleButton *tb, Bool append, int button)
 {
 	char *end = NULL;
 	char *spec;

diff --git a/fvwm/colorset.c b/fvwm/colorset.c
@@ -26,9 +26,7 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <X11/Xatom.h>
-
+#include "libs/fvwm_x11.h"
 #include "libs/fvwmlib.h"
 #include "libs/Parse.h"
 #include "libs/PictureBase.h"

diff --git a/fvwm/colorset.h b/fvwm/colorset.h
@@ -4,7 +4,7 @@
 #define FVWM_COLORSET_H
 
 /* ---------------------------- included header files ---------------------- */
-#include <X11/X.h>
+#include "libs/fvwm_x11.h"
 
 /* ---------------------------- global definitions ------------------------- */
 

diff --git a/fvwm/cursor.h b/fvwm/cursor.h
@@ -4,7 +4,7 @@
 #define FVWM_CURSOR_H
 
 /* ---------------------------- included header files ---------------------- */
-#include <X11/Xlib.h>
+#include "libs/fvwm_x11.h"
 
 /* ---------------------------- global definitions ------------------------- */
 

diff --git a/fvwm/decorations.c b/fvwm/decorations.c
@@ -18,9 +18,8 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <X11/Xproto.h>
-#include <X11/Xatom.h>
 
+#include "libs/fvwm_x11.h"
 #include "libs/fvwmlib.h"
 #include "libs/FShape.h"
 #include "libs/Parse.h"

diff --git a/fvwm/events.c b/fvwm/events.c
@@ -54,8 +54,8 @@
 #include <unistd.h>
 #include <assert.h>
 #include <stdbool.h>
-#include <X11/Xatom.h>
 
+#include "libs/fvwm_x11.h"
 #include "libs/ftime.h"
 #include "libs/fvwmlib.h"
 #include "libs/System.h"

diff --git a/fvwm/ewmh.c b/fvwm/ewmh.c
@@ -53,8 +53,7 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <X11/Xatom.h>
-
+#include "libs/fvwm_x11.h"
 #include "libs/fvwmlib.h"
 #include "fvwm.h"
 #include "execcontext.h"

diff --git a/fvwm/ewmh.h b/fvwm/ewmh.h
@@ -24,7 +24,6 @@ Bool EWMH_CMD_Style(char *token, window_style *ptmpstyle, int on);
 /* Extended window manager hints support */
 
 #include "libs/FScreen.h"
-#include <X11/Xmd.h>
 
 void EWMH_SetCurrentDesktop(struct monitor *);
 void EWMH_SetNumberOfDesktops(struct monitor *);

diff --git a/fvwm/ewmh_conf.c b/fvwm/ewmh_conf.c
@@ -18,9 +18,7 @@
 
 #include <stdio.h>
 
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-
+#include "libs/fvwm_x11.h"
 #include "libs/fvwmlib.h"
 #include "libs/Parse.h"
 #include "libs/Strings.h"

diff --git a/fvwm/ewmh_events.c b/fvwm/ewmh_events.c
@@ -18,9 +18,7 @@
 
 #include <stdio.h>
 
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-
+#include "libs/fvwm_x11.h"
 #include "libs/fvwmlib.h"
 #include "libs/Strings.h"
 #include "fvwm.h"

diff --git a/fvwm/ewmh_names.c b/fvwm/ewmh_names.c
@@ -17,9 +17,7 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-
+#include "libs/fvwm_x11.h"
 #include "libs/fvwmlib.h"
 #include "libs/Flocale.h"
 #include "libs/FlocaleCharset.h"

diff --git a/fvwm/externs.h b/fvwm/externs.h
@@ -29,8 +29,7 @@
 #ifndef FVWM_EXTERNS_H
 #define FVWM_EXTERNS_H
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
+#include "libs/fvwm_x11.h"
 
 void Done(int, char *) __attribute__((__noreturn__));
 void set_init_function_name(int n, const char *name);

diff --git a/fvwm/functions.c b/fvwm/functions.c
@@ -23,8 +23,7 @@
 
 #include <stdio.h>
 
-#include <X11/keysym.h>
-
+#include "libs/fvwm_x11.h"
 #include "libs/fvwmlib.h"
 #include "libs/charmap.h"
 #include "libs/wcontext.h"

diff --git a/fvwm/fvwm.h b/fvwm/fvwm.h
@@ -33,10 +33,7 @@
 
 /* ---------------------------- included header files ---------------------- */
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/cursorfont.h>
-#include <X11/Intrinsic.h>
+#include "libs/fvwm_x11.h"
 #include "libs/PictureBase.h"
 #include "libs/Fft.h"
 #include "libs/FRender.h"

diff --git a/fvwm/fvwm3.c b/fvwm/fvwm3.c
@@ -29,9 +29,7 @@
 #include <sys/systeminfo.h>
 #endif
 
-#include <X11/Xproto.h>
-#include <X11/Xatom.h>
-
+#include "libs/fvwm_x11.h"
 #include "libs/fvwmlib.h"
 #include "libs/envvar.h"
 #include "libs/Strings.h"

diff --git a/fvwm/icccm2.c b/fvwm/icccm2.c
@@ -19,8 +19,8 @@
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#include <X11/Xatom.h>
 
+#include "libs/fvwm_x11.h"
 #include "libs/FEvent.h"
 #include "fvwm.h"
 #include "externs.h"

diff --git a/fvwm/icccm2.h b/fvwm/icccm2.h
@@ -2,7 +2,8 @@
 
 #ifndef FVWM_ICCCM2_H
 #define FVWM_ICCCM2_H
-#include <X11/Xlib.h>
+
+#include "libs/fvwm_x11.h"
 
 extern void SetupICCCM2(Bool replace_wm);
 extern void CloseICCCM2(void);

diff --git a/fvwm/icons.c b/fvwm/icons.c
@@ -402,7 +402,7 @@ ICON_DBG((stderr,"ciw: iph%s used '%s'\n",
 	{
 		int newWidth = fw->icon_g.picture_w_g.width;
 		int newHeight = fw->icon_g.picture_w_g.height;
-		Boolean resize = False;
+		Bool resize = False;
 
 		if (newWidth < fw->min_icon_width)
 		{

diff --git a/fvwm/menubindings.c b/fvwm/menubindings.c
@@ -18,8 +18,8 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <X11/keysym.h>
 
+#include "libs/fvwm_x11.h"
 #include "libs/Parse.h"
 #include "libs/Bindings.h"
 #include "libs/charmap.h"

diff --git a/fvwm/menubindings.h b/fvwm/menubindings.h
@@ -2,7 +2,7 @@
 
 #ifndef FVWM_MENU_BINDINGS_H
 #define FVWM_MENU_BINDINGS_H
-#include <X11/Xlib.h>
+
 #include "libs/Bindings.h"
 
 /* ---------------------------- included header files ---------------------- */

diff --git a/fvwm/menugeometry.c b/fvwm/menugeometry.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 
-#include <X11/keysym.h>
+#include "libs/fvwm_x11.h"
 
 #include "fvwm.h"
 #include "externs.h"

diff --git a/fvwm/menugeometry.h b/fvwm/menugeometry.h
@@ -4,7 +4,7 @@
 #define FVWM_MENU_GEOMETRY_H
 
 /* ---------------------------- included header files ---------------------- */
-#include <X11/Xlib.h>
+#include "libs/fvwm_x11.h"
 
 /* ---------------------------- global definitions ------------------------- */
 

diff --git a/fvwm/menuparameters.h b/fvwm/menuparameters.h
@@ -4,7 +4,7 @@
 #define FVWM_MENU_PARAMETERS_H
 
 /* ---------------------------- included header files ---------------------- */
-#include <X11/Xlib.h>
+#include "libs/fvwm_x11.h"
 #include "execcontext.h"
 
 /* ---------------------------- forward declarations ----------------------- */

diff --git a/fvwm/menuroot.h b/fvwm/menuroot.h
@@ -4,8 +4,7 @@
 #define FVWM_MENU_ROOT_H
 
 /* ---------------------------- included header files ---------------------- */
-#include <X11/Xlib.h>
-#include <X11/Intrinsic.h>
+#include "libs/fvwm_x11.h"
 #include "menudim.h"
 #include "libs/PictureBase.h"
 /* ---------------------------- forward declarations ----------------------- */

diff --git a/fvwm/menus.c b/fvwm/menus.c
@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include <X11/keysym.h>
 
 #include "libs/ftime.h"
 #include "libs/fvwmlib.h"

diff --git a/fvwm/menustyle.c b/fvwm/menustyle.c
@@ -19,8 +19,7 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include <X11/keysym.h>
-
+#include "libs/fvwm_x11.h"
 #include "libs/fvwmlib.h"
 #include "libs/Parse.h"
 #include "libs/ColorUtils.h"
@@ -151,7 +150,7 @@ static void menustyle_copy_face(MenuFace *destmf, MenuFace *origmf)
  * Reads a menu face line into a structure (veliaa@rpi.edu)
  *
  */
-static Boolean menustyle_parse_face(char *s, MenuFace *mf, int verbose)
+static Bool menustyle_parse_face(char *s, MenuFace *mf, int verbose)
 {
 	char *style;
 	char *token;

diff --git a/fvwm/misc.c b/fvwm/misc.c
@@ -19,8 +19,8 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <X11/Xatom.h>
 
+#include "libs/fvwm_x11.h"
 #include "libs/ftime.h"
 #include "libs/Parse.h"
 #include "libs/Target.h"

diff --git a/fvwm/misc.h b/fvwm/misc.h
@@ -3,7 +3,6 @@
 #ifndef FVWM_MISC_H
 #define FVWM_MISC_H
 
-#include <X11/Xlib.h>
 #include "fvwm.h"
 
 /* ---------------------------- included header files ---------------------- */

diff --git a/fvwm/move_resize.c b/fvwm/move_resize.c
@@ -23,7 +23,6 @@
 
 #include <stdio.h>
 #include <math.h>
-#include <X11/keysym.h>
 
 #include "libs/fvwmlib.h"
 #include "libs/Picture.h"

diff --git a/fvwm/screen.h b/fvwm/screen.h
@@ -33,8 +33,6 @@
 
 #include "config.h"
 
-#include <X11/Intrinsic.h>
-
 #include "update.h"
 #include "style.h"
 #include "fvwm.h"

diff --git a/fvwm/session.c b/fvwm/session.c
@@ -27,8 +27,8 @@
 #endif
 #include <signal.h>
 #include <fcntl.h>
-#include <X11/Xatom.h>
 
+#include "libs/fvwm_x11.h"
 #include "libs/fvwmlib.h"
 #include "libs/FSMlib.h"
 #include "libs/Strings.h"

diff --git a/fvwm/virtual.c b/fvwm/virtual.c
@@ -19,7 +19,6 @@
 
 #include <stdio.h>
 
-#include <X11/keysym.h>
 #include "libs/fvwmlib.h"
 #include "libs/FGettext.h"
 #include "libs/Grab.h"

diff --git a/libs/Bindings.h b/libs/Bindings.h
@@ -3,7 +3,7 @@
 #ifndef FVWMLIB_BINDINGS_H_H
 #define FVWMLIB_BINDINGS_H_H
 
-#include <X11/Xutil.h>	/* XClassHint */
+#include "fvwm_x11.h"
 
 /* ---------------------------- global definitions ------------------------- */
 

diff --git a/libs/ClientMsg.h b/libs/ClientMsg.h
@@ -15,9 +15,7 @@
 #ifndef FVWMLIB_CLIENTMSG_H
 #define FVWMLIB_CLIENTMSG_H
 
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
+#include "fvwm_x11.h"
 
 void send_clientmessage(Display *disp, Window w, Atom a, Time timestamp);
 

diff --git a/libs/ColorUtils.h b/libs/ColorUtils.h
@@ -1,9 +1,7 @@
 #ifndef FVWMLIB_COLORUTILS_H
 #define FVWMLIB_COLORUTILS_H
 
-#include <X11/Xlib.h>
-#include <X11/Intrinsic.h>
-
+#include "fvwm_x11.h"
 /*
  * Stuff for dealing w/ bitmaps & pixmaps:
  */

diff --git a/libs/Colorset.h b/libs/Colorset.h
@@ -7,8 +7,7 @@
 
 #ifndef FVWMLIB_COLORSETS_H
 #define FVWMLIB_COLORSETS_H
-#include <X11/Xlib.h>
-#include <X11/Intrinsic.h>
+#include "fvwm_x11.h"
 #include "PictureBase.h"
 
 typedef struct Colorset

diff --git a/libs/CombineChars.h b/libs/CombineChars.h
@@ -10,7 +10,7 @@
 #define FVWMLIB_COMBINECHARS_H
 
 #include "config.h"
-#include <X11/Xutil.h>
+#include "fvwm_x11.h"
 
 typedef struct
 {

diff --git a/libs/Event.h b/libs/Event.h
@@ -1,7 +1,7 @@
 #ifndef FVWMLIB_EVENT_H
 #define FVWMLIB_EVENT_H
 
-#include <X11/Xlib.h>
+#include "fvwm_x11.h"
 
 /*
  * Return the subwindow member of an event if the event type has one.

diff --git a/libs/FBidi.h b/libs/FBidi.h
@@ -66,7 +66,6 @@
 #define FVWMLIB_FBIDI_H
 
 #include "config.h"
-#include <X11/Xlib.h>
 #include "CombineChars.h"
 
 #if HAVE_BIDI