src/video/x11/SDL_x11sym.h
changeset 6311 4e5e46f43438
parent 6168 47dc1acea66f
child 6313 d86efd889847
     1.1 --- a/src/video/x11/SDL_x11sym.h	Fri May 25 18:21:22 2012 -0400
     1.2 +++ b/src/video/x11/SDL_x11sym.h	Wed May 30 11:25:35 2012 -0400
     1.3 @@ -103,7 +103,7 @@
     1.4  SDL_X11_SYM(int,XUnmapWindow,(Display* a,Window b),(a,b),return)
     1.5  SDL_X11_SYM(int,XWarpPointer,(Display* a,Window b,Window c,int d,int e,unsigned int f,unsigned int g,int h,int i),(a,b,c,d,e,f,g,h,i),return)
     1.6  SDL_X11_SYM(VisualID,XVisualIDFromVisual,(Visual* a),(a),return)
     1.7 -SDL_X11_SYM(XExtDisplayInfo*,XextAddDisplay,(XExtensionInfo* a,Display* b,char* c,XExtensionHooks* d,int e,XPointer f),(a,b,c,d,e,f),return)
     1.8 +SDL_X11_SYM(XExtDisplayInfo*,XextAddDisplay,(XExtensionInfo* a,Display* b,_Xconst char* c,XExtensionHooks* d,int e,XPointer f),(a,b,c,d,e,f),return)
     1.9  SDL_X11_SYM(XExtensionInfo*,XextCreateExtension,(void),(),return)
    1.10  SDL_X11_SYM(void,XextDestroyExtension,(XExtensionInfo* a),(a),)
    1.11  SDL_X11_SYM(XExtDisplayInfo*,XextFindDisplay,(XExtensionInfo* a,Display* b),(a,b),return)
    1.12 @@ -123,6 +123,11 @@
    1.13  SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return)
    1.14  SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return)
    1.15  
    1.16 +#if SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
    1.17 +SDL_X11_SYM(Bool,XGetEventData,(Display* a,XGenericEventCookie* b),(a,b),return)
    1.18 +SDL_X11_SYM(void,XFreeEventData,(Display* a,XGenericEventCookie* b),(a,b),)    
    1.19 +#endif
    1.20 +
    1.21  #if NeedWidePrototypes
    1.22  SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,unsigned int b,int c),(a,b,c),return)
    1.23  #else
    1.24 @@ -190,14 +195,14 @@
    1.25  SDL_X11_SYM(XineramaScreenInfo*,XineramaQueryScreens,(Display *a, int *b),(a,b),return)
    1.26  #endif
    1.27  
    1.28 -/* XInput support for multiple mice, tablets, etc. */
    1.29 -#if SDL_VIDEO_DRIVER_X11_XINPUT
    1.30 -SDL_X11_MODULE(XINPUT)
    1.31 -SDL_X11_SYM(XDeviceInfo*,XListInputDevices,(Display *a,int *b),(a,b),return)
    1.32 -SDL_X11_SYM(void,XFreeDeviceList,(XDeviceInfo *a),(a),)
    1.33 -SDL_X11_SYM(int,XSelectExtensionEvent,(Display *a,Window b,XEventClass *c,int d),(a,b,c,d),return)
    1.34 -SDL_X11_SYM(XDevice*,XOpenDevice,(Display *a,XID b),(a,b),return)
    1.35 -SDL_X11_SYM(int,XCloseDevice,(Display* a,XDevice* b),(a,b),return)
    1.36 +/* XInput2 support for multiple mice, tablets, etc. */
    1.37 +#if SDL_VIDEO_DRIVER_X11_XINPUT2
    1.38 +SDL_X11_MODULE(XINPUT2)
    1.39 +SDL_X11_SYM(XIDeviceInfo*,XIQueryDevice,(Display *a,int b,int *c),(a,b,c),return)
    1.40 +SDL_X11_SYM(void,XIFreeDeviceInfo,(XIDeviceInfo *a),(a),)
    1.41 +SDL_X11_SYM(int,XISelectEvents,(Display *a,Window b,XIEventMask *c,int d),(a,b,c,d),return)
    1.42 +SDL_X11_SYM(Status,XIQueryVersion,(Display *a,int *b,int *c),(a,b,c),return)
    1.43 +SDL_X11_SYM(XIEventMask*,XIGetSelectedEvents,(Display *a,Window b,int *c),(a,b,c),return)
    1.44  #endif
    1.45  
    1.46  /* XRandR support */