diff options
Diffstat (limited to 'randr')
| -rw-r--r-- | randr/mirrcrtc.c | 7 | ||||
| -rw-r--r-- | randr/randrstr.h | 4 | ||||
| -rw-r--r-- | randr/rrcrtc.c | 9 | ||||
| -rw-r--r-- | randr/rrscreen.c | 6 |
4 files changed, 10 insertions, 16 deletions
diff --git a/randr/mirrcrtc.c b/randr/mirrcrtc.c index a9ee6b445..d493a0e88 100644 --- a/randr/mirrcrtc.c +++ b/randr/mirrcrtc.c @@ -28,6 +28,11 @@ miRRSetScreenConfig(ScreenPtr screen, { RRScreenConfigRec old_screen_config; + /* XXX deal with separate pixmap/screen sizes */ + if (screen_config->screen_pixmap_width != screen_config->screen_width || + screen_config->screen_pixmap_height != screen_config->screen_height) + return FALSE; + RRScreenCurrentConfig(screen, &old_screen_config); /* Check and see if nothing has changed */ @@ -42,8 +47,6 @@ miRRSetScreenConfig(ScreenPtr screen, return RRScreenSizeSet(screen, screen_config->screen_width, screen_config->screen_height, - screen_config->screen_pixmap_width, - screen_config->screen_pixmap_height, screen_config->mm_width, screen_config->mm_height); } diff --git a/randr/randrstr.h b/randr/randrstr.h index 7c553f21f..8240824db 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -191,8 +191,6 @@ struct _rrOutput { typedef Bool (*RRScreenSetSizeProcPtr) (ScreenPtr pScreen, CARD16 width, CARD16 height, - CARD16 pixWidth, - CARD16 pixHeight, CARD32 mmWidth, CARD32 mmHeight); @@ -480,8 +478,6 @@ extern _X_EXPORT Bool RRScreenSizeSet (ScreenPtr pScreen, CARD16 width, CARD16 height, - CARD16 pixWidth, - CARD16 pixHeight, CARD32 mmWidth, CARD32 mmHeight); diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index 97aa3d7fa..0b2bc28c5 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -435,9 +435,10 @@ RRCrtcCurrentConfig(RRCrtcPtr crtc, crtc_config->sprite_position_f_transform = crtc->client_sprite_f_position_transform; crtc_config->sprite_image_f_transform = crtc->client_sprite_f_image_transform; - crtc_config->pixmap = crtc->scanoutPixmap; - crtc_config->pixmap_x = crtc->x; - crtc_config->pixmap_y = crtc->y; + /* XXX add pixmap stuff */ + crtc_config->pixmap = NULL; + crtc_config->pixmap_x = 0; + crtc_config->pixmap_y = 0; return TRUE; } @@ -1509,8 +1510,6 @@ RRConvertCrtcConfig(ClientPtr client, ScreenPtr screen, if (x->pixmap == None) pixmap = NULL; - else if (x->pixmap == RR_CurrentScanoutPixmap) - pixmap = crtc->scanoutPixmap; else { rc = dixLookupResourceByType((pointer *) &pixmap, x->pixmap, diff --git a/randr/rrscreen.c b/randr/rrscreen.c index 0efc62e87..c7387267a 100644 --- a/randr/rrscreen.c +++ b/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 @@ -321,7 +318,6 @@ ProcRRSetScreenSize (ClientPtr client) } if (!RRScreenSizeSet (pScreen, stuff->width, stuff->height, - stuff->width, stuff->height, stuff->widthInMillimeters, stuff->heightInMillimeters)) { @@ -965,7 +961,7 @@ ProcRRSetScreenConfig (ClientPtr client) goto sendReply; } } - if (!RRScreenSizeSet (pScreen, width, height, width, height, + if (!RRScreenSizeSet (pScreen, width, height, pScreen->mmWidth, pScreen->mmHeight)) { rep.status = RRSetConfigFailed; |