pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-29 17:07:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

client: Handle async errors from xshm setup

Browse Source 
XShmAttach can fail asynchronously, so we need to check the
errors in the x error handler during the XSync.
This commit is contained in:
Alexander Larsson 2010-08-25 12:15:17 +02:00
parent 7c7e3efff3
commit 2df2b3df1e
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
client/x11/platform.cpp
View File

@ -109,6 +109,8 @@ static Atom utf8_atom;
#ifdef USE_XRANDR_1_2
static bool clipboard_inited = false;
#endif
static Bool handle_x_error = false;
static int x_error_code;
class DefaultEventListener: public Platform::EventListener {
public:
@ -219,6 +221,18 @@ Display* XPlatform::get_display()
return x_display;
}
static void handle_x_errors_start(void)
{
handle_x_error = True;
x_error_code = 0;
}
static int handle_x_errors_stop(void)
{
handle_x_error = False;
return x_error_code;
}
bool XPlatform::is_x_shm_avail()
{
return x_shm_avail;
@ -277,9 +291,16 @@ XImage *XPlatform::create_x_shm_image(RedDrawable::Format format,
goto err2;
}
handle_x_errors_start();
/* Ensure the xserver has attached the xshm segment */
XSync (XPlatform::get_display(), False);
if (handle_x_errors_stop()) {
x_shm_avail = false;
goto err2;
}
/* Mark segment as released so that it will be destroyed when
the xserver releases the segment. This way we won't leak
the segment if the client crashes. */
@ -2493,6 +2514,13 @@ static int x_error_handler(Display* display, XErrorEvent* error_event)
char request_str[256];
char number_str[32];
if (handle_x_error) {
if (error_event->error_code) {
x_error_code = error_event->error_code;
}
return 0;
}
char* display_name = XDisplayString(display);
XGetErrorText(display, error_event->error_code, error_str, sizeof(error_str));