Mercurial > sdl-ios-xcode

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 27cb878a278e
comparison
equal deleted inserted replaced
2762:90de10bc38ec 2763:6fc50bdd88c0
142 SDL_X11_SYM(SDL_X11_XSynchronizeRetType,XSynchronize,(Display* a,Bool b),(a,b),return) 142 SDL_X11_SYM(SDL_X11_XSynchronizeRetType,XSynchronize,(Display* a,Bool b),(a,b),return)
143 SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return) 143 SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return)
144 SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return) 144 SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return)
145 SDL_X11_SYM(XExtensionErrorHandler,XSetExtensionErrorHandler,(XExtensionErrorHandler a),(a),return) 145 SDL_X11_SYM(XExtensionErrorHandler,XSetExtensionErrorHandler,(XExtensionErrorHandler a),(a),return)
146 146
147 /*SDL_X11_SYM(XDeviceInfo* , XListInputDevices, (Display* a, int* b), (a,b),return)
148 SDL_X11_SYM(void, XFreeDeviceList, (XDeviceInfo* a), (a),)
149 SDL_X11_SYM(int, XSelectExtensionEvent,(Display* a, Window b, XEventClass* c, int d),(a,b,c,d),return)
150 SDL_X11_SYM(XDevice* ,XOpenDevice,(Display* a, XID b), (a,b),return)*/
151
152 #if NeedWidePrototypes 147 #if NeedWidePrototypes
153 SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,unsigned int b,int c),(a,b,c),return) 148 SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,unsigned int b,int c),(a,b,c),return)
154 #else 149 #else
155 SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,KeyCode b,int c),(a,b,c),return) 150 SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,KeyCode b,int c),(a,b,c),return)
156 #endif 151 #endif
216 SDL_X11_SYM(Status,DPMSInfo,(Display *dpy,CARD16 *state,BOOL *onoff),(dpy,state,onoff),return) 211 SDL_X11_SYM(Status,DPMSInfo,(Display *dpy,CARD16 *state,BOOL *onoff),(dpy,state,onoff),return)
217 SDL_X11_SYM(Status,DPMSEnable,(Display *dpy),(dpy),return) 212 SDL_X11_SYM(Status,DPMSEnable,(Display *dpy),(dpy),return)
218 SDL_X11_SYM(Status,DPMSDisable,(Display *dpy),(dpy),return) 213 SDL_X11_SYM(Status,DPMSDisable,(Display *dpy),(dpy),return)
219 #endif 214 #endif
220 215
216 /* XInput support for multiple mice, tablets, etc. */
217 #if SDL_VIDEO_DRIVER_X11_XINPUT
218 SDL_X11_MODULE(XINPUT)
219 SDL_X11_SYM(XDeviceInfo*,XListInputDevices,(Display *a,int *b),(a,b),return)
220 SDL_X11_SYM(void,XFreeDeviceList,(XDeviceInfo *a),(a),)
221 SDL_X11_SYM(int,XSelectExtensionEvent,(Display *a,Window b,XEventClass *c,int d),(a,b,c,d),return)
222 SDL_X11_SYM(XDevice*,XOpenDevice,(Display *a,XID b),(a,b),return)
223 #endif
224
221 /* *INDENT-ON* */ 225 /* *INDENT-ON* */
222 226
223 /* vi: set ts=4 sw=4 expandtab: */ 227 /* vi: set ts=4 sw=4 expandtab: */