spice/client/x11/x_icon.cpp
Hans de Goede f8c6e1c42a spicec-x11: Put locks around xlib calls which wait for a reply
Since libX11-1.3.4 the multi-threading handling code of libX11 has been
changed, see:
http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=933aee1d5c53b0cc7d608011a29188b594c8d70b

This causes several issues. One of them is the display inside the
client not getting updated when there are no XEvents being generated,
this is caused by the following part of the referenced commit message:

Caveats:
- If one thread is waiting for events and another thread tries to read a reply,
  both will hang until an event arrives. Previously, if this happened it might
  work sometimes, but otherwise would trigger either an assertion failure or
  a permanent hang.

We were depending on the otherwise behavior and apparently were lucky.
This can be seen by starting F14 in runlevel 3 and then doing startx
and not touching the mouse / keyb afterwards. Once you move the mouse
(generate an event you see the UI contents being updated but not before.

Another thing both I and Alon (iirc) have seen are hangs where 2
threads are stuck in XSync waiting for a reply simultaneously. This might
be related to libxcb version, according to the libX11 commit a libxcb
newer then 1.6 was needed, and my system had 1.5 at the time I saw this
after updating to libxcb 1.7 I can no longer reproduce.

This patch tackles both problems (and is needed for the 1st one
indepently of the 2nd one possibly being fixed) by adding XLockDisplay
calls around all libX11 calls which wait for a reply or an event.
2010-10-11 22:36:42 +02:00

174 lines
5.2 KiB
C++

/*
Copyright (C) 2009 Red Hat, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "x_icon.h"
#include "platform.h"
#include "x_platform.h"
#include "res.h"
#include "utils.h"
#include "debug.h"
typedef std::map<int, XIcon*> IconsMap;
static IconsMap res_icons;
XIcon::XIcon(int id, const IconHeader *icon)
: _id (id)
, _raw_icon (icon)
{
res_icons[id] = this;
}
XIcon::~XIcon()
{
Display* x_display = XPlatform::get_display();
while (!_screen_icons.empty()) {
std::map<int, ScreenIcon>::iterator iter = _screen_icons.begin();
XFreePixmap(x_display, (*iter).second.pixmap);
XFreePixmap(x_display, (*iter).second.mask);
_screen_icons.erase(iter);
}
IconsMap::iterator iter = res_icons.find(_id);
res_icons.erase(iter);
}
void XIcon::get_pixmaps(int screen, Pixmap& out_pixmap, Pixmap& out_mask)
{
std::map<int, ScreenIcon>::iterator iter = _screen_icons.find(screen);
if (iter != _screen_icons.end()) {
out_pixmap = (*iter).second.pixmap;
out_mask = (*iter).second.mask;
return;
}
Display* x_display = XPlatform::get_display();
Window root_window = RootWindow(x_display, screen);
Pixmap pixmap = None;
Pixmap mask = None;
GC gc = NULL;
try {
XLockDisplay(x_display);
pixmap = XCreatePixmap(x_display, root_window, _raw_icon->width, _raw_icon->height, 24);
XUnlockDisplay(x_display);
if (pixmap == None) {
THROW("create pixmap failed");
}
XWindowAttributes attr;
XLockDisplay(x_display);
XGetWindowAttributes(x_display, root_window, &attr);
XUnlockDisplay(x_display);
XImage image;
memset(&image, 0, sizeof(image));
image.width = _raw_icon->width;
image.height = _raw_icon->height;
image.data = (char*)_raw_icon->pixmap;
image.byte_order = LSBFirst;
image.bitmap_unit = 32;
image.bitmap_bit_order = LSBFirst;
image.bitmap_pad = 32;
image.bytes_per_line = _raw_icon->width * 4;
image.depth = 24;
image.format = ZPixmap;
image.bits_per_pixel = 32;
image.red_mask = 0x00ff0000;
image.green_mask = 0x0000ff00;
image.blue_mask = 0x000000ff;
if (!XInitImage(&image)) {
THROW("init image failed");
}
XGCValues gc_vals;
gc_vals.function = GXcopy;
gc_vals.foreground = ~0;
gc_vals.background = 0;
gc_vals.plane_mask = AllPlanes;
XLockDisplay(x_display);
gc = XCreateGC(x_display, pixmap, GCFunction | GCForeground | GCBackground | GCPlaneMask,
&gc_vals);
XPutImage(x_display, pixmap, gc, &image, 0, 0, 0, 0, image.width, image.height);
// HDG: why ?? XFlush should suffice
XSync(x_display, False);
XFreeGC(x_display, gc);
gc = NULL;
mask = XCreatePixmap(x_display, root_window, _raw_icon->width, _raw_icon->height, 1);
XUnlockDisplay(x_display);
if (mask == None) {
THROW("create mask failed");
}
memset(&image, 0, sizeof(image));
image.width = _raw_icon->width;
image.height = _raw_icon->height;
image.data = (char*)_raw_icon->mask;
image.byte_order = LSBFirst;
image.bitmap_unit = 8;
image.bitmap_bit_order = MSBFirst;
image.bitmap_pad = 8;
image.bytes_per_line = _raw_icon->width / 8;
image.depth = 1;
image.format = XYBitmap;
if (!XInitImage(&image)) {
THROW("init image failed");
}
XLockDisplay(x_display);
gc = XCreateGC(x_display, mask, GCFunction | GCForeground | GCBackground | GCPlaneMask,
&gc_vals);
XPutImage(x_display, mask, gc, &image, 0, 0, 0, 0, image.width, image.height);
// HDG: why ?? XFlush should suffice
XSync(x_display, False);
XUnlockDisplay(x_display);
XFreeGC(x_display, gc);
} catch (...) {
if (gc) {
XFreeGC(x_display, gc);
}
if (mask) {
XFreePixmap(x_display, mask);
}
if (pixmap) {
XFreePixmap(x_display, pixmap);
}
throw;
}
_screen_icons[screen] = ScreenIcon(pixmap, mask);
out_pixmap = pixmap;
out_mask = mask;
}
Icon* Platform::load_icon(int id)
{
IconsMap::iterator iter = res_icons.find(id);
if (iter != res_icons.end()) {
return (*iter).second->ref();
}
const IconHeader *icon = res_get_icon(id);
if (!icon) {
return NULL;
}
XIcon *xicon = new XIcon(id, icon);
return xicon->ref();
}