rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Undef X_DISPLAY_MISSING 

As of f815f9840d several years ago nothing sets
this #define anywhere anymore.
This commit is contained in:
Peter Hutterer 2020-12-09 14:18:02 +10:00
parent 06951ea9f0
commit 38390f9b88
9 changed files with 45 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/config.h.in
View File

@ -160,8 +160,5 @@
/* Define to 1 if your <sys/time.h> declares `struct tm`. */ /* Define to 1 if your <sys/time.h> declares `struct tm`. */
#cmakedefine TM_IN_SYS_TIME ${TM_IN_SYS_TIME} #cmakedefine TM_IN_SYS_TIME ${TM_IN_SYS_TIME}
/* Define to 1 if the X Window System is missing or not being used. */
#cmakedefine X_DISPLAY_MISSING ${X_DISPLAY_MISSING}
/* Define to `unsigned int` if <sys/types.h> does not define. */ /* Define to `unsigned int` if <sys/types.h> does not define. */
#cmakedefine size_t ${size_t} #cmakedefine size_t ${size_t}

60
src/lib/platform/IXWindowsImpl.h
View File

@ -3,39 +3,35 @@
#include "config.h" #include "config.h"
#if X_DISPLAY_MISSING #include <X11/X.h>
# error X11 is required to build barrier #include <X11/Xutil.h>
#define XK_MISCELLANY
#define XK_XKB_KEYS
#include <X11/keysymdef.h>
#if HAVE_X11_EXTENSIONS_DPMS_H
extern "C" {
# include <X11/extensions/dpms.h>
}
#endif
#if HAVE_X11_EXTENSIONS_XTEST_H
# include <X11/extensions/XTest.h>
#else #else
# include <X11/X.h> # error The XTest extension is required to build barrier
# include <X11/Xutil.h> #endif
# define XK_MISCELLANY #if HAVE_X11_EXTENSIONS_XINERAMA_H
# define XK_XKB_KEYS // Xinerama.h may lack extern "C" for inclusion by C++
# include <X11/keysymdef.h> extern "C" {
# if HAVE_X11_EXTENSIONS_DPMS_H # include <X11/extensions/Xinerama.h>
extern "C" { }
# include <X11/extensions/dpms.h> #endif
} #if HAVE_X11_EXTENSIONS_XRANDR_H
# endif # include <X11/extensions/Xrandr.h>
# if HAVE_X11_EXTENSIONS_XTEST_H #endif
# include <X11/extensions/XTest.h> #if HAVE_XKB_EXTENSION
# else # include <X11/XKBlib.h>
# error The XTest extension is required to build barrier #endif
# endif #ifdef HAVE_XI2
# if HAVE_X11_EXTENSIONS_XINERAMA_H # include <X11/extensions/XInput2.h>
// Xinerama.h may lack extern "C" for inclusion by C++
extern "C" {
# include <X11/extensions/Xinerama.h>
}
# endif
# if HAVE_X11_EXTENSIONS_XRANDR_H
# include <X11/extensions/Xrandr.h>
# endif
# if HAVE_XKB_EXTENSION
# include <X11/XKBlib.h>
# endif
# ifdef HAVE_XI2
# include <X11/extensions/XInput2.h>
# endif
#endif #endif
class IXWindowsImpl { class IXWindowsImpl {

6
src/lib/platform/XWindowsClipboard.h
View File

@ -25,11 +25,7 @@
#include "common/stdvector.h" #include "common/stdvector.h"
#include "XWindowsImpl.h" #include "XWindowsImpl.h"
#if X_DISPLAY_MISSING #include <X11/Xlib.h>
# error X11 is required to build barrier
#else
# include <X11/Xlib.h>
#endif
class IXWindowsClipboardConverter; class IXWindowsClipboardConverter;

6
src/lib/platform/XWindowsEventQueueBuffer.h
View File

@ -23,11 +23,7 @@
#include "common/stdvector.h" #include "common/stdvector.h"
#include "XWindowsImpl.h" #include "XWindowsImpl.h"
#if X_DISPLAY_MISSING #include <X11/Xlib.h>
# error X11 is required to build barrier
#else
# include <X11/Xlib.h>
#endif
class IEventQueue; class IEventQueue;

14
src/lib/platform/XWindowsKeyState.cpp
View File

@ -24,18 +24,14 @@
#include <cstddef> #include <cstddef>
#include <algorithm> #include <algorithm>
#if X_DISPLAY_MISSING #include <X11/X.h>
# error X11 is required to build barrier #include <X11/Xutil.h>
#else #define XK_MISCELLANY
# include <X11/X.h> #define XK_XKB_KEYS
# include <X11/Xutil.h> #include <X11/keysymdef.h>
# define XK_MISCELLANY
# define XK_XKB_KEYS
# include <X11/keysymdef.h>
#if HAVE_XKB_EXTENSION #if HAVE_XKB_EXTENSION
# include <X11/XKBlib.h> # include <X11/XKBlib.h>
#endif #endif
#endif
static const size_t ModifiersFromXDefaultSize = 32; static const size_t ModifiersFromXDefaultSize = 32;

18
src/lib/platform/XWindowsKeyState.h
View File

@ -23,18 +23,14 @@
#include "common/stdvector.h" #include "common/stdvector.h"
#include "XWindowsImpl.h" #include "XWindowsImpl.h"
#if X_DISPLAY_MISSING #include <X11/Xlib.h>
# error X11 is required to build barrier #if HAVE_X11_EXTENSIONS_XTEST_H
# include <X11/extensions/XTest.h>
#else #else
# include <X11/Xlib.h> # error The XTest extension is required to build barrier
# if HAVE_X11_EXTENSIONS_XTEST_H #endif
# include <X11/extensions/XTest.h> #if HAVE_XKB_EXTENSION
# else # include <X11/extensions/XKBstr.h>
# error The XTest extension is required to build barrier
# endif
# if HAVE_XKB_EXTENSION
# include <X11/extensions/XKBstr.h>
# endif
#endif #endif
class IEventQueue; class IEventQueue;

6
src/lib/platform/XWindowsScreen.h
View File

@ -24,11 +24,7 @@
#include "common/stdvector.h" #include "common/stdvector.h"
#include "XWindowsImpl.h" #include "XWindowsImpl.h"
#if X_DISPLAY_MISSING #include <X11/Xlib.h>
# error X11 is required to build barrier
#else
# include <X11/Xlib.h>
#endif
class XWindowsClipboard; class XWindowsClipboard;
class XWindowsKeyState; class XWindowsKeyState;

6
src/lib/platform/XWindowsScreenSaver.h
View File

@ -23,11 +23,7 @@
#include "common/stdmap.h" #include "common/stdmap.h"
#include "XWindowsImpl.h" #include "XWindowsImpl.h"
#if X_DISPLAY_MISSING #include <X11/Xlib.h>
# error X11 is required to build barrier
#else
# include <X11/Xlib.h>
#endif
class Event; class Event;
class EventQueueTimer; class EventQueueTimer;

6
src/lib/platform/XWindowsUtil.h
View File

@ -22,11 +22,7 @@
#include "common/stdmap.h" #include "common/stdmap.h"
#include "common/stdvector.h" #include "common/stdvector.h"
#if X_DISPLAY_MISSING #include <X11/Xlib.h>
# error X11 is required to build barrier
#else
# include <X11/Xlib.h>
#endif
#include <string> #include <string>