fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-02-15 13:50:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge master back in and clean up some unfinished code (closes 8745)

Browse source
This commit is contained in:
Keith Packard 2006-10-25 09:48:23 -07:00
parent a153871447
commit 368cf03d33
5 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
randr/mirandr.c
View file

@ -57,6 +57,21 @@ miRRCrtcSet (ScreenPtr pScreen,
return TRUE;
}
static Bool
miRRCrtcSetGamma (ScreenPtr pScreen,
RRCrtcPtr crtc)
{
return TRUE;
}
static Bool
miRROutputSetProperty (ScreenPtr pScreen,
RROutputPtr output,
Atom property)
{
return TRUE;
}
/*
* This function assumes that only a single depth can be
* displayed at a time, but that all visuals of that depth
@ -85,7 +100,7 @@ miRandRInit (ScreenPtr pScreen)
#if RANDR_12_INTERFACE
pScrPriv->rrCrtcSet = miRRCrtcSet;
pScrPriv->rrCrtcSetGamma = miRRCrtcSetGamma;
pScrPriv->rrOutputSetProperty = miRROutput
pScrPriv->rrOutputSetProperty = miRROutputSetProperty;
RRScreenSetSizeRange (pScreen,

6
randr/randr.c
View file

@ -42,9 +42,6 @@
int RRGeneration;
int RRNScreens;
static int ProcRRDispatch (ClientPtr pClient);
static int SProcRRDispatch (ClientPtr pClient);
#define wrap(priv,real,mem,func) {\
priv->mem = real->mem; \
real->mem = func; \
@ -54,6 +51,9 @@ static int SProcRRDispatch (ClientPtr pClient);
real->mem = priv->mem; \
}
static int ProcRRDispatch (ClientPtr pClient);
static int SProcRRDispatch (ClientPtr pClient);
int RREventBase;
int RRErrorBase;
RESTYPE RRClientType, RREventType; /* resource types for event masks */

2
randr/rrcrtc.c
View file

@ -280,7 +280,7 @@ RRCrtcSet (RRCrtcPtr crtc,
* Old 1.0 interface tied screen size to mode size
*/
if (ret)
RRCrtcNotify (crtc, mode, x, y, rotation,
RRCrtcNotify (crtc, mode, x, y, rotation, 1, &outputs[0].output);
return ret;
}
#endif

6
randr/rrscreen.c
View file

@ -164,7 +164,7 @@ RRScreenSizeNotify (ScreenPtr pScreen)
pScrPriv->width = pScreen->width;
pScrPriv->height = pScreen->height;
pScrPriv->changed = TRUE;
pScrPriv->sizeChanged = TRUE;
/* pScrPriv->sizeChanged = TRUE; */
RRTellChanged (pScreen);
RRSendConfigNotify (pScreen);
@ -850,7 +850,7 @@ ProcRRSetScreenConfig (ClientPtr client)
for (c = 0; c < pScrPriv->numCrtcs; c++)
{
rep.status = RRCrtcSet (pScrPriv->->crtc, NULL, 0, 0, RR_Rotate_0,
rep.status = RRCrtcSet (pScrPriv->crtcs[c], NULL, 0, 0, RR_Rotate_0,
0, NULL);
if (rep.status != Success)
goto sendReply;
@ -858,7 +858,7 @@ ProcRRSetScreenConfig (ClientPtr client)
if (!RRScreenSizeSet (pScreen, mode->mode.width, mode->mode.height,
pScreen->mmWidth, pScreen->mmHeight))
{
rep.status RRSetConfigFailed;
rep.status = RRSetConfigFailed;
goto sendReply;
}
}

3
randr/rrxinerama.c
View file

@ -259,6 +259,9 @@ ProcRRXineramaQueryScreens(ClientPtr client)
REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
if (RRXineramaScreenActive (pScreen))
RRGetInfo (pScreen);
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
rep.number = RRXineramaScreenCount (pScreen);