diff options
| -rw-r--r-- | randr/mirandr.c | 17 | ||||
| -rw-r--r-- | randr/randr.c | 54 | ||||
| -rw-r--r-- | randr/rrcrtc.c | 2 | ||||
| -rw-r--r-- | randr/rrscreen.c | 6 | ||||
| -rw-r--r-- | randr/rrsdispatch.c | 1 | ||||
| -rw-r--r-- | randr/rrxinerama.c | 3 |
6 files changed, 27 insertions, 56 deletions
diff --git a/randr/mirandr.c b/randr/mirandr.c index fab0fd1bd..8d79e8a11 100644 --- a/randr/mirandr.c +++ b/randr/mirandr.c @@ -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, diff --git a/randr/randr.c b/randr/randr.c index 5494428fc..7b39e8045 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -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 */ @@ -467,54 +467,6 @@ ProcRRDispatch (ClientPtr 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 SProcRRDispatch (ClientPtr client) { REQUEST(xReq); diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index c662899a4..ee51cc23a 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -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 diff --git a/randr/rrscreen.c b/randr/rrscreen.c index 6d38e96b5..b4d361846 100644 --- a/randr/rrscreen.c +++ b/randr/rrscreen.c @@ -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; } } diff --git a/randr/rrsdispatch.c b/randr/rrsdispatch.c index bf81f8bdb..67af75306 100644 --- a/randr/rrsdispatch.c +++ b/randr/rrsdispatch.c @@ -77,6 +77,7 @@ SProcRRSelectInput (ClientPtr client) swaps(&stuff->length, n); swapl(&stuff->window, n); + swaps(&stuff->enable, n); return (*ProcRandrVector[stuff->randrReqType]) (client); } diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c index 31f60cca1..a8e4b390b 100644 --- a/randr/rrxinerama.c +++ b/randr/rrxinerama.c @@ -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); |