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

Merge pull request #981 from whot/wip/simplify-ifdefs 

Remove some #defines that had no useful effect
This commit is contained in:
Povilas Kanapickas 2020-12-09 23:52:47 +02:00 committed by GitHub
parent 99edadb0b1 1474f04f53
commit 829ff7975b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 42 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -195,9 +195,8 @@ if (UNIX)
check_include_files ("X11/extensions/XInput2.h" HAVE_XI2)
check_include_files ("dns_sd.h" HAVE_DNSSD)
if (HAVE_X11_EXTENSIONS_DPMS_H)
# Assume that function prototypes declared, when include exists.
set (HAVE_DPMS_PROTOTYPES 1)
if (NOT HAVE_X11_EXTENSIONS_XTEST_H)
message (FATAL_ERROR "Missing header: X11/extensions/XTest.h")
endif()
if (NOT HAVE_X11_XKBLIB_H)

9
res/config.h.in
View File

@ -19,9 +19,6 @@
/* Define if your compiler has standard C++ library support. */
#cmakedefine HAVE_CXX_STDLIB ${HAVE_CXX_STDLIB}
/* Define if the <X11/extensions/dpms.h> header file declares function prototypes. */
#cmakedefine HAVE_DPMS_PROTOTYPES ${HAVE_DPMS_PROTOTYPES}
/* Define if you have a working `getpwuid_r` function. */
#cmakedefine HAVE_GETPWUID_R ${HAVE_GETPWUID_R}
@ -115,9 +112,6 @@
/* Define to 1 if you have the <X11/extensions/XKBstr.h> header file. */
#cmakedefine HAVE_X11_EXTENSIONS_XKBSTR_H ${HAVE_X11_EXTENSIONS_XKBSTR_H}
/* Define to 1 if you have the <X11/extensions/XTest.h> header file. */
#cmakedefine HAVE_X11_EXTENSIONS_XTEST_H ${HAVE_X11_EXTENSIONS_XTEST_H}
/* Define to 1 if you have the <X11/XKBlib.h> header file. */
#cmakedefine HAVE_X11_XKBLIB_H ${HAVE_X11_XKBLIB_H}
@ -160,8 +154,5 @@
/* Define to 1 if your <sys/time.h> declares `struct tm`. */
#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. */
#cmakedefine size_t ${size_t}

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

@ -3,39 +3,31 @@
#include "config.h"
#if X_DISPLAY_MISSING
# error X11 is required to build barrier
#else
# include <X11/X.h>
# 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
# error The XTest extension is required to build barrier
# endif
# if HAVE_X11_EXTENSIONS_XINERAMA_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
#include <X11/X.h>
#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
#include <X11/extensions/XTest.h>
#if HAVE_X11_EXTENSIONS_XINERAMA_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
class IXWindowsImpl {

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

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

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

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

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

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

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

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

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

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

22
src/lib/platform/XWindowsScreenSaver.cpp
View File

@ -26,31 +26,11 @@
#include "base/TMethodEventJob.h"
#include <X11/Xatom.h>
#if HAVE_X11_EXTENSIONS_XTEST_H
# include <X11/extensions/XTest.h>
#else
# error The XTest extension is required to build barrier
#endif
#include <X11/extensions/XTest.h>
#if HAVE_X11_EXTENSIONS_DPMS_H
extern "C" {
# include <X11/Xmd.h>
# include <X11/extensions/dpms.h>
# if !HAVE_DPMS_PROTOTYPES
# undef DPMSModeOn
# undef DPMSModeStandby
# undef DPMSModeSuspend
# undef DPMSModeOff
# define DPMSModeOn 0
# define DPMSModeStandby 1
# define DPMSModeSuspend 2
# define DPMSModeOff 3
extern Bool DPMSQueryExtension(Display *, int *, int *);
extern Bool DPMSCapable(Display *);
extern Status DPMSEnable(Display *);
extern Status DPMSDisable(Display *);
extern Status DPMSForceLevel(Display *, CARD16);
extern Status DPMSInfo(Display *, CARD16 *, BOOL *);
# endif
}
#endif

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

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

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

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