morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

X11: Lock display during event processing

Browse Source 
* Added a X11 lock debug messages for incorrect locking.
* Lock X11 display during XEvent processing
This commit is contained in:
Armin Novak
2020-02-27 08:27:56 +01:00
committed by akallabeth
parent a328d428b6
commit db80f97d50
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/X11/xf_client.c
View File

@@ -498,17 +498,16 @@ static BOOL xf_process_x_events(freerdp* instance)
{
xf_lock_x11(xfc, FALSE);
pending_status = XPending(xfc->display);
xf_unlock_x11(xfc, FALSE);
if (pending_status)
{
ZeroMemory(&xevent, sizeof(xevent));
XNextEvent(xfc->display, &xevent);
status = xf_event_process(instance, &xevent);
if (!status)
return status;
}
xf_unlock_x11(xfc, FALSE);
if (!status)
break;
}
return status;
@@ -811,10 +810,17 @@ void xf_lock_x11(xfContext* xfc, BOOL display)
if (display)
XLockDisplay(xfc->display);
}
if (xfc->locked)
WLog_WARN(TAG, "X11 trying to lock although already locked!");
xfc->locked = TRUE;
}
void xf_unlock_x11(xfContext* xfc, BOOL display)
{
if (!xfc->locked)
WLog_WARN(TAG, "X11: trying to unlock although not locked!");
if (!xfc->UseXThreads)
{
ReleaseMutex(xfc->mutex);
@@ -824,6 +830,7 @@ void xf_unlock_x11(xfContext* xfc, BOOL display)
if (display)
XUnlockDisplay(xfc->display);
}
xfc->locked = FALSE;
}
static BOOL xf_get_pixmap_info(xfContext* xfc)

1
client/X11/xfreerdp.h
View File

@@ -247,6 +247,7 @@ struct xf_context
/* value to be sent over wire for each logical client mouse button */
button_map button_map[NUM_BUTTONS_MAPPED];
BYTE savedMaximizedState;
BOOL locked;
};
BOOL xf_create_window(xfContext* xfc);