diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-11-16 09:48:33 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-11-16 17:39:21 -0800 |
| commit | 07b26e690cd9a4fc626132feed0702515cbe5a88 (patch) | |
| tree | 5bd7d3fbd6a484f26f584a5b7d5ec32f725e75c6 /randr/randrstr.h | |
| parent | 6ff7f2ad6a5e2e769244590578e6809974b5235d (diff) | |
Remove RandR output options.
RandR output options are now expected to be handled by properties instead.
(cherry picked from commit 8b2a7e94a1dc2776ab2cfaaebb309be02502602a)
Diffstat (limited to 'randr/randrstr.h')
| -rw-r--r-- | randr/randrstr.h | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/randr/randrstr.h b/randr/randrstr.h index 2c3e0e71c..19af9b979 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -72,7 +72,6 @@ extern int (*SProcRandrVector[RRNumberRequests])(ClientPtr); typedef struct _rrMode RRModeRec, *RRModePtr; typedef struct _rrCrtc RRCrtcRec, *RRCrtcPtr; typedef struct _rrOutput RROutputRec, *RROutputPtr; -typedef struct _rrOutputConfig RROutputConfigRec, *RROutputConfigPtr; struct _rrMode { int refcnt; @@ -109,8 +108,6 @@ struct _rrOutput { int mmWidth; int mmHeight; RRCrtcPtr crtc; - CARD32 currentOptions; - CARD32 possibleOptions; int numCrtcs; RRCrtcPtr *crtcs; int numClones; @@ -123,11 +120,6 @@ struct _rrOutput { void *devPrivate; }; -struct _rrOutputConfig { - RROutputPtr output; - CARD32 options; -}; - #if RANDR_12_INTERFACE typedef Bool (*RRScreenSetSizeProcPtr) (ScreenPtr pScreen, CARD16 width, @@ -142,7 +134,7 @@ typedef Bool (*RRCrtcSetProcPtr) (ScreenPtr pScreen, int y, Rotation rotation, int numOutputs, - RROutputConfigPtr outputs); + RROutputPtr *outputs); typedef Bool (*RRCrtcSetGammaProcPtr) (ScreenPtr pScreen, RRCrtcPtr crtc); @@ -369,7 +361,7 @@ miRRCrtcSet (ScreenPtr pScreen, int y, Rotation rotation, int numOutput, - RROutputConfigPtr outputs); + RROutputPtr *outputs); /* randr.c */ /* @@ -490,7 +482,7 @@ RRCrtcSet (RRCrtcPtr crtc, int y, Rotation rotation, int numOutput, - RROutputConfigPtr outputs); + RROutputPtr *outputs); /* * Request that the Crtc gamma be changed @@ -641,10 +633,6 @@ RROutputSetCrtcs (RROutputPtr output, RRCrtcPtr *crtcs, int numCrtcs); -Bool -RROutputSetPossibleOptions (RROutputPtr output, - CARD32 possibleOptions); - void RROutputSetCrtc (RROutputPtr output, RRCrtcPtr crtc); @@ -657,10 +645,6 @@ RROutputSetSubpixelOrder (RROutputPtr output, int subpixelOrder); Bool -RROutputSetCurrentOptions (RROutputPtr output, - CARD32 currentOptions); - -Bool RROutputSetPhysicalSize (RROutputPtr output, int mmWidth, int mmHeight); @@ -739,8 +723,6 @@ Query state: RRScreenSetSizeRange RROutputSetCrtcs RROutputSetCrtc - RROutputSetPossibleOptions - RRSetCurrentOptions RRModeGet RROutputSetModes RROutputSetConnection |