pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-09 05:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spicec-x11: Add missing XLockDisplay around XRRSet* calls

Browse Source 
XRRSet* calls wait for a XReply, so add a missing XLockDisplay,
this fixes a hang (due to a race so not always) when switching between
windowed and fullscreen mode.
This commit is contained in:
Hans de Goede 2010-10-17 10:41:13 +02:00
parent 607d58f4eb
commit 203a39761f
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/x11/platform.cpp
View File

@ -1026,8 +1026,10 @@ bool DynamicScreen::set_screen_size(int size_index)
XRRConfigCurrentConfiguration(config, &rotation);
Monitor::self_monitors_change++;
XLockDisplay(get_display());
/*what status*/
XRRSetScreenConfig(get_display(), config, root_window, size_index, rotation, CurrentTime);
XUnlockDisplay(get_display());
process_monitor_configure_events(platform_win);
Monitor::self_monitors_change--;
XRRFreeScreenConfigInfo(config);
@ -1300,7 +1302,9 @@ void MultyMonScreen::set_size(int width, int height)
int width_mm = (int)((double)_saved_width_mm / _saved_width * width);
set_height(height);
int height_mm = (int)((double)_saved_height_mm / _saved_height * height);
XLockDisplay(get_display());
XRRSetScreenSize(get_display(), root_window, width, height, width_mm, height_mm);
XUnlockDisplay(get_display());
X_DEBUG_SYNC(get_display());
}
@ -1329,9 +1333,11 @@ void MultyMonScreen::restore()
disable();
Window root_window = RootWindow(get_display(), get_screen());
XLockDisplay(get_display());
XRRSetScreenSize(get_display(), root_window, _saved_width,
_saved_height,
_saved_width_mm, _saved_height_mm);
XUnlockDisplay(get_display());
XMonitorsList::iterator iter = _monitors.begin();
for (; iter != _monitors.end(); iter++) {
(*iter)->revert();
@ -2150,8 +2156,10 @@ void XMonitor::disable()
if (!res.valid()) {
THROW("get screen resources failed");
}
XLockDisplay(display);
XRRSetCrtcConfig(display, res.get(), _crtc, CurrentTime,
0, 0, None, RR_Rotate_0, NULL, 0);
XUnlockDisplay(display);
XMonitorsList::iterator iter = _clones.begin();
for (; iter != _clones.end(); iter++) {
@ -2174,10 +2182,12 @@ void XMonitor::enable()
if (!res.valid()) {
THROW("get screen resources failed");
}
XLockDisplay(display);
XRRSetCrtcConfig(display, res.get(), _crtc, CurrentTime,
_position.x, _position.y,
_mode, _rotation,
_outputs, _noutput);
XUnlockDisplay(display);
XMonitorsList::iterator iter = _clones.begin();
for (; iter != _clones.end(); iter++) {