diff options
| author | Matthias Hopf <mhopf@suse.de> | 2008-03-10 19:29:07 +0100 |
|---|---|---|
| committer | Matthias Hopf <mhopf@suse.de> | 2008-03-12 11:37:28 +0100 |
| commit | 2036851125226065891f13583ade3ce559e7bd37 (patch) | |
| tree | 3ce7ef1406eb3fbce83031b301f5681fc6e502b3 | |
| parent | c7536f4b87e089a7e7c43026b189922fec70c565 (diff) | |
Return randr interface version in xf86CrtcScreenInit()
Necessary to allow drivers to be run-time backwards compatible when using the
modes/ functions w/o providing their own copy.
| -rw-r--r-- | hw/xfree86/modes/xf86Crtc.c | 13 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86Crtc.h | 4 | ||||
| -rw-r--r-- | randr/randrstr.h | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index 0bef5b42f..39e84e641 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -694,7 +694,12 @@ xf86CrtcCloseScreen (int index, ScreenPtr screen) /* * Called at ScreenInit time to set up */ -_X_EXPORT Bool +_X_EXPORT +#ifdef RANDR_13_INTERFACE +int +#else +Bool +#endif xf86CrtcScreenInit (ScreenPtr screen) { ScrnInfoPtr scrn = xf86Screens[screen->myNum]; @@ -727,7 +732,11 @@ xf86CrtcScreenInit (ScreenPtr screen) config->CloseScreen = screen->CloseScreen; screen->CloseScreen = xf86CrtcCloseScreen; +#ifdef RANDR_13_INTERFACE + return RANDR_INTERFACE_VERSION; +#else return TRUE; +#endif } static DisplayModePtr @@ -2228,7 +2237,7 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation) } } xf86DisableUnusedFunctions(pScrn); -#if RANDR_12_INTERFACE +#ifdef RANDR_12_INTERFACE xf86RandR12TellChanged (pScrn->pScreen); #endif return ok; diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h index b87a32548..a542e7f39 100644 --- a/hw/xfree86/modes/xf86Crtc.h +++ b/hw/xfree86/modes/xf86Crtc.h @@ -692,7 +692,11 @@ xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY); void xf86SetScrnInfoModes (ScrnInfoPtr pScrn); +#ifdef RANDR_13_INTERFACE +int +#else Bool +#endif xf86CrtcScreenInit (ScreenPtr pScreen); Bool diff --git a/randr/randrstr.h b/randr/randrstr.h index 3b48f5c2b..4d7c9ccfc 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -56,6 +56,8 @@ #define RANDR_12_INTERFACE 1 #define RANDR_13_INTERFACE 1 /* requires RANDR_12_INTERFACE */ +#define RANDR_INTERFACE_VERSION 0x0103 + typedef XID RRMode; typedef XID RROutput; typedef XID RRCrtc; |