mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-14 00:01:20 +00:00
Allow RandR objects to be created before the associated ScreenRec.
xf86 drivers need to create RandR object in the PreInit stage, before the ScreenRec is allocated. Changing the RandR DIX code to permit this required the addition of functions that later associate the objects with the related screen. An additional change is that modes are now global, and no longer associated with a specific screen. This change actually makes mode management cleaner as there is no more per-screen list of modes to deal with. This changes the RandR 1.2 ABI/API for drivers.
This commit is contained in:
parent
20e9144c07
commit
ec77a95a02
9 changed files with 254 additions and 169 deletions
|
|
@ -79,7 +79,6 @@ struct _rrMode {
|
|||
xRRModeInfo mode;
|
||||
char *name;
|
||||
void *devPrivate;
|
||||
ScreenPtr screen;
|
||||
Bool userDefined;
|
||||
};
|
||||
|
||||
|
|
@ -210,10 +209,6 @@ typedef struct _rrScrPriv {
|
|||
CARD16 width, height; /* last known screen size */
|
||||
Bool layoutChanged; /* screen layout changed */
|
||||
|
||||
/* modes, outputs and crtcs */
|
||||
int numModes;
|
||||
RRModePtr *modes;
|
||||
|
||||
int numOutputs;
|
||||
RROutputPtr *outputs;
|
||||
|
||||
|
|
@ -457,9 +452,16 @@ RRCrtcChanged (RRCrtcPtr crtc, Bool layoutChanged);
|
|||
* Create a CRTC
|
||||
*/
|
||||
RRCrtcPtr
|
||||
RRCrtcCreate (ScreenPtr pScreen,
|
||||
void *devPrivate);
|
||||
RRCrtcCreate (void *devPrivate);
|
||||
|
||||
/*
|
||||
* Attach a CRTC to a screen. Once done, this cannot be
|
||||
* undone without destroying the CRTC; it is separate from Create
|
||||
* only to allow an xf86-based driver to create objects in preinit
|
||||
*/
|
||||
Bool
|
||||
RRCrtcAttachScreen (RRCrtcPtr crtc, ScreenPtr pScreen);
|
||||
|
||||
/*
|
||||
* Notify the extension that the Crtc has been reconfigured,
|
||||
* the driver calls this whenever it has updated the mode
|
||||
|
|
@ -556,8 +558,7 @@ RRClientKnowsRates (ClientPtr pClient);
|
|||
*/
|
||||
|
||||
RRModePtr
|
||||
RRModeGet (ScreenPtr pScreen,
|
||||
xRRModeInfo *modeInfo,
|
||||
RRModeGet (xRRModeInfo *modeInfo,
|
||||
const char *name);
|
||||
|
||||
void
|
||||
|
|
@ -570,6 +571,12 @@ RRModePruneUnused (ScreenPtr pScreen);
|
|||
void
|
||||
RRModeDestroy (RRModePtr mode);
|
||||
|
||||
/*
|
||||
* Return a list of modes that are valid for some output in pScreen
|
||||
*/
|
||||
RRModePtr *
|
||||
RRModesForScreen (ScreenPtr pScreen, int *num_ret);
|
||||
|
||||
/*
|
||||
* Initialize mode type
|
||||
*/
|
||||
|
|
@ -601,11 +608,18 @@ RROutputChanged (RROutputPtr output);
|
|||
*/
|
||||
|
||||
RROutputPtr
|
||||
RROutputCreate (ScreenPtr pScreen,
|
||||
const char *name,
|
||||
RROutputCreate (const char *name,
|
||||
int nameLength,
|
||||
void *devPrivate);
|
||||
|
||||
/*
|
||||
* Attach an output to a screen, again split from creation so
|
||||
* xf86 DDXen can create randr resources before the ScreenRec
|
||||
* exists
|
||||
*/
|
||||
Bool
|
||||
RROutputAttachScreen (RROutputPtr output, ScreenPtr pScreen);
|
||||
|
||||
/*
|
||||
* Notify extension that output parameters have been changed
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue