smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: remove unset X_DISPLAY_MISSING checks

Browse source
This commit is contained in:
sithlord48 2025-06-13 21:54:15 -04:00 committed by Nick Bolton
parent 89abcfb238
commit da5a2088c8
9 changed files with 4 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/lib/Config.h.in
View file

@ -46,7 +46,4 @@
/* Define this if the XKB extension is available. */ /* Define this if the XKB extension is available. */
#cmakedefine HAVE_XKB_EXTENSION @HAVE_XKB_EXTENSION@ #cmakedefine HAVE_XKB_EXTENSION @HAVE_XKB_EXTENSION@
/* Define to 1 if the X Window System is missing or not being used. */
#cmakedefine X_DISPLAY_MISSING @X_DISPLAY_MISSING@
// clang-format on // clang-format on

4
src/lib/platform/XWindowsClipboard.h
View file

@ -14,11 +14,7 @@
#include <map> #include <map>
#include <vector> #include <vector>
#if X_DISPLAY_MISSING
#error X11 is required to build deskflow
#else
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif
class IXWindowsClipboardConverter; class IXWindowsClipboardConverter;

4
src/lib/platform/XWindowsEventQueueBuffer.h
View file

@ -12,11 +12,7 @@
#include <vector> #include <vector>
#if X_DISPLAY_MISSING
#error X11 is required to build deskflow
#else
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif
class IEventQueue; class IEventQueue;

8
src/lib/platform/XWindowsKeyState.cpp
View file

@ -20,21 +20,17 @@
#include "deskflow/ClientArgs.h" #include "deskflow/ClientArgs.h"
#include "platform/XWindowsUtil.h" #include "platform/XWindowsUtil.h"
#include <X11/X.h>
#include <X11/Xutil.h>
#include <algorithm> #include <algorithm>
#include <cstddef> #include <cstddef>
#include <map> #include <map>
#if X_DISPLAY_MISSING
#error X11 is required to build deskflow
#else
#include <X11/X.h>
#include <X11/Xutil.h>
#define XK_MISCELLANY #define XK_MISCELLANY
#define XK_XKB_KEYS #define XK_XKB_KEYS
#include <X11/keysymdef.h> #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;

4
src/lib/platform/XWindowsKeyState.h
View file

@ -12,9 +12,6 @@
#include <map> #include <map>
#include <vector> #include <vector>
#if X_DISPLAY_MISSING
#error X11 is required to build deskflow
#else
#include <X11/Xlib.h> #include <X11/Xlib.h>
#if HAVE_X11_EXTENSIONS_XTEST_H #if HAVE_X11_EXTENSIONS_XTEST_H
#include <X11/extensions/XTest.h> #include <X11/extensions/XTest.h>
@ -24,7 +21,6 @@
#if HAVE_XKB_EXTENSION #if HAVE_XKB_EXTENSION
#include <X11/extensions/XKBstr.h> #include <X11/extensions/XKBstr.h>
#endif #endif
#endif
class IEventQueue; class IEventQueue;

8
src/lib/platform/XWindowsScreen.cpp
View file

@ -26,14 +26,11 @@
#include "platform/XWindowsScreenSaver.h" #include "platform/XWindowsScreenSaver.h"
#include "platform/XWindowsUtil.h" #include "platform/XWindowsUtil.h"
#include <X11/X.h>
#include <X11/Xutil.h>
#include <algorithm> #include <algorithm>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#if X_DISPLAY_MISSING
#error X11 is required to build deskflow
#else
#include <X11/X.h>
#include <X11/Xutil.h>
#define XK_MISCELLANY #define XK_MISCELLANY
#define XK_XKB_KEYS #define XK_XKB_KEYS
#include <X11/keysymdef.h> #include <X11/keysymdef.h>
@ -64,7 +61,6 @@ extern "C"
#ifdef HAVE_XI2 #ifdef HAVE_XI2
#include <X11/extensions/XInput2.h> #include <X11/extensions/XInput2.h>
#endif #endif
#endif
static int xi_opcode; static int xi_opcode;

4
src/lib/platform/XWindowsScreen.h
View file

@ -16,11 +16,7 @@
#include <set> #include <set>
#include <vector> #include <vector>
#if X_DISPLAY_MISSING
#error X11 is required to build deskflow
#else
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif
class XWindowsClipboard; class XWindowsClipboard;
class XWindowsKeyState; class XWindowsKeyState;

4
src/lib/platform/XWindowsScreenSaver.h
View file

@ -12,11 +12,7 @@
#include <map> #include <map>
#if X_DISPLAY_MISSING
#error X11 is required to build deskflow
#else
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif
class Event; class Event;
class EventQueueTimer; class EventQueueTimer;

4
src/lib/platform/XWindowsUtil.h
View file

@ -13,11 +13,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#if X_DISPLAY_MISSING
#error X11 is required to build deskflow
#else
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif
//! X11 utility functions //! X11 utility functions
class XWindowsUtil class XWindowsUtil