diff options
| author | Keith Packard <keithp@keithp.com> | 2010-12-05 20:57:47 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-12-06 20:09:04 -0800 |
| commit | 752c368421c1c824752cf467fba9318d75d2ca2c (patch) | |
| tree | 719b2c506194607708369cc782de39e3cc792c5a /randr/rrcrtc.c | |
| parent | a88d70fb20a2bc3152b84adff4380857e6cfadf5 (diff) | |
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 <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Diffstat (limited to 'randr/rrcrtc.c')
| -rw-r--r-- | randr/rrcrtc.c | 9 |
1 files changed, 5 insertions, 4 deletions
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, |