frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

This commit is contained in:
Keith Packard 2006-10-25 09:48:23 -07:00
parent 59511974db
commit e21604914d
6 changed files with 27 additions and 56 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; 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 * This function assumes that only a single depth can be
* displayed at a time, but that all visuals of that depth * displayed at a time, but that all visuals of that depth
@ -85,7 +100,7 @@ miRandRInit (ScreenPtr pScreen)
#if RANDR_12_INTERFACE #if RANDR_12_INTERFACE
pScrPriv->rrCrtcSet = miRRCrtcSet; pScrPriv->rrCrtcSet = miRRCrtcSet;
pScrPriv->rrCrtcSetGamma = miRRCrtcSetGamma; pScrPriv->rrCrtcSetGamma = miRRCrtcSetGamma;
pScrPriv->rrOutputSetProperty = miRROutput pScrPriv->rrOutputSetProperty = miRROutputSetProperty;
RRScreenSetSizeRange (pScreen, RRScreenSetSizeRange (pScreen,

54
randr/randr.c
View File

@ -42,9 +42,6 @@
int RRGeneration; int RRGeneration;
int RRNScreens; int RRNScreens;
static int ProcRRDispatch (ClientPtr pClient);
static int SProcRRDispatch (ClientPtr pClient);
#define wrap(priv,real,mem,func) {\ #define wrap(priv,real,mem,func) {\
priv->mem = real->mem; \ priv->mem = real->mem; \
real->mem = func; \ real->mem = func; \
@ -54,6 +51,9 @@ static int SProcRRDispatch (ClientPtr pClient);
real->mem = priv->mem; \ real->mem = priv->mem; \
} }
static int ProcRRDispatch (ClientPtr pClient);
static int SProcRRDispatch (ClientPtr pClient);
int RREventBase; int RREventBase;
int RRErrorBase; int RRErrorBase;
RESTYPE RRClientType, RREventType; /* resource types for event masks */ RESTYPE RRClientType, RREventType; /* resource types for event masks */
@ -466,54 +466,6 @@ ProcRRDispatch (ClientPtr client)
return (*ProcRandrVector[stuff->data]) (client); return (*ProcRandrVector[stuff->data]) (client);
} }
static int
SProcRRGetScreenInfo (ClientPtr client)
{
register int n;
REQUEST(xRRGetScreenInfoReq);
swaps(&stuff->length, n);
swapl(&stuff->window, n);
return ProcRRGetScreenInfo(client);
}
static int
SProcRRSetScreenConfig (ClientPtr client)
{
register int n;
REQUEST(xRRSetScreenConfigReq);
if (RRClientKnowsRates (client))
{
REQUEST_SIZE_MATCH (xRRSetScreenConfigReq);
swaps (&stuff->rate, n);
}
else
{
REQUEST_SIZE_MATCH (xRR1_0SetScreenConfigReq);
}
swaps(&stuff->length, n);
swapl(&stuff->drawable, n);
swapl(&stuff->timestamp, n);
swaps(&stuff->sizeID, n);
swaps(&stuff->rotation, n);
return ProcRRSetScreenConfig(client);
}
static int
SProcRRSelectInput (ClientPtr client)
{
register int n;
REQUEST(xRRSelectInputReq);
swaps(&stuff->length, n);
swapl(&stuff->window, n);
swaps(&stuff->enable, n);
return ProcRRSelectInput(client);
}
static int static int
SProcRRDispatch (ClientPtr client) SProcRRDispatch (ClientPtr client)
{ {

2
randr/rrcrtc.c
View File

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

6
randr/rrscreen.c
View File

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

1
randr/rrsdispatch.c
View File

@ -77,6 +77,7 @@ SProcRRSelectInput (ClientPtr client)
swaps(&stuff->length, n); swaps(&stuff->length, n);
swapl(&stuff->window, n); swapl(&stuff->window, n);
swaps(&stuff->enable, n);
return (*ProcRandrVector[stuff->randrReqType]) (client); return (*ProcRandrVector[stuff->randrReqType]) (client);
} }

3
randr/rrxinerama.c
View File

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