diff options
| author | Yaniv Kamay <ykamay@redhat.com> | 2009-10-27 00:14:57 +0200 |
|---|---|---|
| committer | Yaniv Kamay <ykamay@redhat.com> | 2009-10-27 13:34:36 +0200 |
| commit | bac204a1e4e0ffff2a61bd4ec4ffc95397019f8f (patch) | |
| tree | a77e81ead809200a2babfeb2a69a1761e13e73fa /client | |
| parent | 402a201ce6f56dbbedb641edc912295d79bf7a3b (diff) | |
| download | spice-bac204a1e4e0ffff2a61bd4ec4ffc95397019f8f.tar.gz spice-bac204a1e4e0ffff2a61bd4ec4ffc95397019f8f.tar.xz spice-bac204a1e4e0ffff2a61bd4ec4ffc95397019f8f.zip | |
fix bad initialization of XDisplay in case crt have more then one output
Diffstat (limited to 'client')
| -rw-r--r-- | client/x11/platform.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp index c99595a3..f0c68235 100644 --- a/client/x11/platform.cpp +++ b/client/x11/platform.cpp @@ -1741,33 +1741,33 @@ void XMonitor::update_position() } if (crtc_info->noutput > 1) { + //todo: set valid subpixel order in case all outputs share the same type _subpixel_order = RED_SUBPIXEL_ORDER_UNKNOWN; - return; - } - - AutoOutputInfo output_info(XRRGetOutputInfo(display, res.get(), crtc_info->outputs[0])); + } else { + AutoOutputInfo output_info(XRRGetOutputInfo(display, res.get(), crtc_info->outputs[0])); - switch (output_info->subpixel_order) { - case SubPixelUnknown: - _subpixel_order = RED_SUBPIXEL_ORDER_UNKNOWN; - break; - case SubPixelHorizontalRGB: - _subpixel_order = RED_SUBPIXEL_ORDER_H_RGB; - break; - case SubPixelHorizontalBGR: - _subpixel_order = RED_SUBPIXEL_ORDER_H_BGR; - break; - case SubPixelVerticalRGB: - _subpixel_order = RED_SUBPIXEL_ORDER_V_RGB; - break; - case SubPixelVerticalBGR: - _subpixel_order = RED_SUBPIXEL_ORDER_V_BGR; + switch (output_info->subpixel_order) { + case SubPixelUnknown: + _subpixel_order = RED_SUBPIXEL_ORDER_UNKNOWN; break; - case SubPixelNone: - _subpixel_order = RED_SUBPIXEL_ORDER_NONE; - break; - default: - THROW("invalid subpixel order"); + case SubPixelHorizontalRGB: + _subpixel_order = RED_SUBPIXEL_ORDER_H_RGB; + break; + case SubPixelHorizontalBGR: + _subpixel_order = RED_SUBPIXEL_ORDER_H_BGR; + break; + case SubPixelVerticalRGB: + _subpixel_order = RED_SUBPIXEL_ORDER_V_RGB; + break; + case SubPixelVerticalBGR: + _subpixel_order = RED_SUBPIXEL_ORDER_V_BGR; + break; + case SubPixelNone: + _subpixel_order = RED_SUBPIXEL_ORDER_NONE; + break; + default: + THROW("invalid subpixel order"); + } } _mode = crtc_info->mode; |