Commit a43eb735 authored by Jeremy Huddleston Sequoia's avatar Jeremy Huddleston Sequoia
Browse files

XQuartz: Short-circuit activateX:



This also avoids a deadlock when calling activateX: before the server
thread has initialized

Signed-off-by: Jeremy Huddleston Sequoia's avatarJeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit cb6a32da)

Conflicts:

	hw/xquartz/X11Application.m
parent 62159b3a
......@@ -190,7 +190,11 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
- (void) activateX:(OSX_BOOL)state {
size_t i;
DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active)
if (_x_active == state)
return;
DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active);
if (state) {
if(bgMouseLocationUpdated) {
DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, bgMouseLocation.x, bgMouseLocation.y, 0.0, 0.0, 0.0);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment