src/video/x11/SDL_x11sym.h
changeset 5408 35a63789c3f2
parent 5262 b530ef003506
child 5470 8f5e10ec4faf
     1.1 --- a/src/video/x11/SDL_x11sym.h	Sun Feb 27 22:22:58 2011 -0800
     1.2 +++ b/src/video/x11/SDL_x11sym.h	Mon Feb 28 09:01:53 2011 -0800
     1.3 @@ -123,7 +123,6 @@
     1.4  SDL_X11_SYM(SDL_X11_XSynchronizeRetType,XSynchronize,(Display* a,Bool b),(a,b),return)
     1.5  SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return)
     1.6  SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return)
     1.7 -SDL_X11_SYM(XExtensionErrorHandler,XSetExtensionErrorHandler,(XExtensionErrorHandler a),(a),return)
     1.8  
     1.9  #if NeedWidePrototypes
    1.10  SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,unsigned int b,int c),(a,b,c),return)
    1.11 @@ -175,7 +174,25 @@
    1.12  SDL_X11_SYM(int,ipUnallocateAndSendData,(ChannelPtr a,IPCard b),(a,b),return)
    1.13  #endif
    1.14  
    1.15 -/* Xrandr support. */
    1.16 +/* Xinerama support */
    1.17 +#if SDL_VIDEO_DRIVER_X11_XINERAMA
    1.18 +SDL_X11_MODULE(XINERAMA)
    1.19 +SDL_X11_SYM(Bool,XineramaIsActive,(Display *a),(a),)
    1.20 +SDL_X11_SYM(Bool,XineramaQueryExtension,(Display *a,int *b,int *c),(a,b,c),)
    1.21 +SDL_X11_SYM(XineramaScreenInfo*,XineramaQueryScreens,(Display *a, int *b),(a,b),)
    1.22 +#endif
    1.23 +
    1.24 +/* XInput support for multiple mice, tablets, etc. */
    1.25 +#if SDL_VIDEO_DRIVER_X11_XINPUT
    1.26 +SDL_X11_MODULE(XINPUT)
    1.27 +SDL_X11_SYM(XDeviceInfo*,XListInputDevices,(Display *a,int *b),(a,b),return)
    1.28 +SDL_X11_SYM(void,XFreeDeviceList,(XDeviceInfo *a),(a),)
    1.29 +SDL_X11_SYM(int,XSelectExtensionEvent,(Display *a,Window b,XEventClass *c,int d),(a,b,c,d),return)
    1.30 +SDL_X11_SYM(XDevice*,XOpenDevice,(Display *a,XID b),(a,b),return)
    1.31 +SDL_X11_SYM(int,XCloseDevice,(Display* a,XDevice* b),(a,b),return)
    1.32 +#endif
    1.33 +
    1.34 +/* XRandR support */
    1.35  #if SDL_VIDEO_DRIVER_X11_XRANDR
    1.36  SDL_X11_MODULE(XRANDR)
    1.37  SDL_X11_SYM(Status,XRRQueryVersion,(Display *dpy,int *major_versionp,int *minor_versionp),(dpy,major_versionp,minor_versionp),return)
    1.38 @@ -188,18 +205,8 @@
    1.39  SDL_X11_SYM(void,XRRFreeScreenConfigInfo,(XRRScreenConfiguration *config),(config),)
    1.40  #endif
    1.41  
    1.42 -/* XInput support for multiple mice, tablets, etc. */
    1.43 -#if SDL_VIDEO_DRIVER_X11_XINPUT
    1.44 -SDL_X11_MODULE(XINPUT)
    1.45 -SDL_X11_SYM(XDeviceInfo*,XListInputDevices,(Display *a,int *b),(a,b),return)
    1.46 -SDL_X11_SYM(void,XFreeDeviceList,(XDeviceInfo *a),(a),)
    1.47 -SDL_X11_SYM(int,XSelectExtensionEvent,(Display *a,Window b,XEventClass *c,int d),(a,b,c,d),return)
    1.48 -SDL_X11_SYM(XDevice*,XOpenDevice,(Display *a,XID b),(a,b),return)
    1.49 -SDL_X11_SYM(int,XCloseDevice,(Display* a,XDevice* b),(a,b),return)
    1.50 -#endif
    1.51 -
    1.52  /* MIT-SCREEN-SAVER support */
    1.53 -#if SDL_VIDEO_DRIVER_X11_SCRNSAVER
    1.54 +#if SDL_VIDEO_DRIVER_X11_XSCRNSAVER
    1.55  SDL_X11_MODULE(XSS)
    1.56  SDL_X11_SYM(Bool,XScreenSaverQueryExtension,(Display *dpy,int *event_base,int *error_base),(dpy,event_base,error_base),return)
    1.57  SDL_X11_SYM(Status,XScreenSaverQueryVersion,(Display *dpy,int *major_versionp,int *minor_versionp),(dpy,major_versionp,minor_versionp),return)
    1.58 @@ -211,6 +218,16 @@
    1.59  SDL_X11_SYM(void,XShapeCombineMask,(Display *dpy,Window dest,int dest_kind,int x_off,int y_off,Pixmap src,int op),(dpy,dest,dest_kind,x_off,y_off,src,op),)
    1.60  #endif
    1.61  
    1.62 +#if SDL_VIDEO_DRIVER_X11_XVIDMODE
    1.63 +SDL_X11_MODULE(XVIDMODE)
    1.64 +SDL_X11_SYM(Bool,XF86VidModeGetAllModeLines,(Display *a,int b,int *c,XF86VidModeModeInfo ***d),(a,b,c,d),)
    1.65 +SDL_X11_SYM(Bool,XF86VidModeGetModeLine,(Display *a,int b,int *c,XF86VidModeModeLine *d),(a,b,c,d),)
    1.66 +SDL_X11_SYM(Bool,XF86VidModeGetViewPort,(Display *a,int b,int *c,int *d),(a,b,c,d),)
    1.67 +SDL_X11_SYM(Bool,XF86VidModeQueryExtension,(Display *a,int *b,int *c),(a,b,c),)
    1.68 +SDL_X11_SYM(Bool,XF86VidModeQueryVersion,(Display *a,int *b,int *c),(a,b,c),)
    1.69 +SDL_X11_SYM(Bool,XF86VidModeSwitchToMode,(Display *a,int b,XF86VidModeModeInfo *c),(a,b,c),)
    1.70 +#endif
    1.71 +
    1.72  /* *INDENT-ON* */
    1.73  
    1.74  /* vi: set ts=4 sw=4 expandtab: */