comparison src/video/x11/SDL_x11dyn.h @ 2763:6fc50bdd88c0

Some cleanups on the new XInput code. One or two things got moved around, but largely this is hooked up correctly in the Unix configure system now: it can be dynamically loaded and fallback gracefully if not available, or libXi can be directly linked to libSDL. XInput support can be --disable'd from the configure script, too (defaults to enabled). Please note that while the framework is in place to gracefully fallback, the current state of the source requires XInput. We'll need to adjust a few things still to correct this.
author Ryan C. Gordon <icculus@icculus.org>
date Wed, 17 Sep 2008 08:20:57 +0000
parents 44e49d3fa6cf
children 99210400e8b9
comparison
equal deleted inserted replaced
2762:90de10bc38ec 2763:6fc50bdd88c0
27 #include <X11/Xlib.h> 27 #include <X11/Xlib.h>
28 #include <X11/Xutil.h> 28 #include <X11/Xutil.h>
29 #include <X11/Xatom.h> 29 #include <X11/Xatom.h>
30 #include <X11/Xlibint.h> 30 #include <X11/Xlibint.h>
31 #include <X11/Xproto.h> 31 #include <X11/Xproto.h>
32 //#include <X11/extensions/XInput.h>
33 #include "../Xext/extensions/Xext.h" 32 #include "../Xext/extensions/Xext.h"
34 #include "../Xext/extensions/extutil.h" 33 #include "../Xext/extensions/extutil.h"
35 34
36 #ifndef NO_SHARED_MEMORY 35 #ifndef NO_SHARED_MEMORY
37 #include <sys/ipc.h> 36 #include <sys/ipc.h>
39 #include <X11/extensions/XShm.h> 38 #include <X11/extensions/XShm.h>
40 #endif 39 #endif
41 40
42 #if SDL_VIDEO_DRIVER_X11_XRANDR 41 #if SDL_VIDEO_DRIVER_X11_XRANDR
43 #include <X11/extensions/Xrandr.h> 42 #include <X11/extensions/Xrandr.h>
43 #endif
44
45 #if SDL_VIDEO_DRIVER_X11_XINPUT
46 #include <X11/extensions/XInput.h>
44 #endif 47 #endif
45 48
46 /* 49 /*
47 * When using the "dynamic X11" functionality, we duplicate all the Xlib 50 * When using the "dynamic X11" functionality, we duplicate all the Xlib
48 * symbols that would be referenced by SDL inside of SDL itself. 51 * symbols that would be referenced by SDL inside of SDL itself.