diff options
Diffstat (limited to 'xorg-server/randr/rrscreen.c')
| -rw-r--r-- | xorg-server/randr/rrscreen.c | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/xorg-server/randr/rrscreen.c b/xorg-server/randr/rrscreen.c index 0efc62e87..1bc1a9ea1 100644 --- a/xorg-server/randr/rrscreen.c +++ b/xorg-server/randr/rrscreen.c @@ -168,8 +168,6 @@ Bool RRScreenSizeSet (ScreenPtr pScreen, CARD16 width, CARD16 height, - CARD16 pixWidth, - CARD16 pixHeight, CARD32 mmWidth, CARD32 mmHeight) { @@ -180,7 +178,6 @@ RRScreenSizeSet (ScreenPtr pScreen, { return (*pScrPriv->rrScreenSetSize) (pScreen, width, height, - pixWidth, pixHeight, mmWidth, mmHeight); } #endif @@ -194,24 +191,6 @@ RRScreenSizeSet (ScreenPtr pScreen, } /* - * Compute an RRScreenConfig from the current screen information - */ -void -RRScreenCurrentConfig(ScreenPtr screen, - RRScreenConfigPtr screen_config) -{ - PixmapPtr screen_pixmap = screen->GetScreenPixmap(screen); - WindowPtr root = screen->root; - - screen_config->screen_pixmap_width = screen_pixmap->drawable.width; - screen_config->screen_pixmap_height = screen_pixmap->drawable.height; - screen_config->screen_width = root->drawable.width; - screen_config->screen_height = root->drawable.height; - screen_config->mm_width = screen->mmWidth; - screen_config->mm_height = screen->mmHeight; -} - -/* * Retrieve valid screen size range */ int @@ -321,7 +300,6 @@ ProcRRSetScreenSize (ClientPtr client) } if (!RRScreenSizeSet (pScreen, stuff->width, stuff->height, - stuff->width, stuff->height, stuff->widthInMillimeters, stuff->heightInMillimeters)) { @@ -798,10 +776,8 @@ ProcRRSetScreenConfig (ClientPtr client) } rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, DixWriteAccess); - if (rc != Success) { - client->errorValue = stuff->drawable; + if (rc != Success) return rc; - } pScreen = pDraw->pScreen; @@ -958,14 +934,14 @@ ProcRRSetScreenConfig (ClientPtr client) for (c = 0; c < pScrPriv->numCrtcs; c++) { if (!RRCrtcSet (pScrPriv->crtcs[c], NULL, 0, 0, RR_Rotate_0, - 0, NULL, NULL)) + 0, NULL)) { rep.status = RRSetConfigFailed; /* XXX recover from failure */ goto sendReply; } } - if (!RRScreenSizeSet (pScreen, width, height, width, height, + if (!RRScreenSizeSet (pScreen, width, height, pScreen->mmWidth, pScreen->mmHeight)) { rep.status = RRSetConfigFailed; @@ -974,7 +950,7 @@ ProcRRSetScreenConfig (ClientPtr client) } } - if (!RRCrtcSet (crtc, mode, 0, 0, stuff->rotation, 1, &output, NULL)) + if (!RRCrtcSet (crtc, mode, 0, 0, stuff->rotation, 1, &output)) rep.status = RRSetConfigFailed; else { pScrPriv->lastSetTime = time; |