From 752c368421c1c824752cf467fba9318d75d2ca2c Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 5 Dec 2010 20:57:47 -0800 Subject: Separate out screen size and screen pixmap sizes in RRScreenSizeSet This provides for separate sizes for the screen scanout and rendering buffer and the application-visible screen size. Signed-off-by: Keith Packard Reviewed-by: Aaron Plattner --- randr/rrcrtc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'randr/rrcrtc.c') diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index 0b2bc28c5..97aa3d7fa 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -435,10 +435,9 @@ 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; - /* XXX add pixmap stuff */ - crtc_config->pixmap = NULL; - crtc_config->pixmap_x = 0; - crtc_config->pixmap_y = 0; + crtc_config->pixmap = crtc->scanoutPixmap; + crtc_config->pixmap_x = crtc->x; + crtc_config->pixmap_y = crtc->y; return TRUE; } @@ -1510,6 +1509,8 @@ 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, -- cgit v1.2.3