github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed window check

Browse Source 
Ignore mouse events not originating in session window
This commit is contained in:
akallabeth 2022-01-21 17:18:18 +01:00 committed by akallabeth
parent 855c9d3f4c
commit d4be1717c2
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client/X11/xf_input.c
View File

@ -50,7 +50,7 @@
#define MIN_FINGER_DIST 5 #define MIN_FINGER_DIST 5
static int xf_input_event(xfContext* xfc, XIDeviceEvent* event, int evtype); static int xf_input_event(xfContext* xfc, const XEvent* xevent, XIDeviceEvent* event, int evtype);
static const char* xf_input_get_class_string(int class) static const char* xf_input_get_class_string(int class)
{ {
@ -429,7 +429,7 @@ static int xf_input_handle_event_local(xfContext* xfc, const XEvent* event)
break; break;
default: default:
xf_input_event(xfc, cookie.cc->data, cookie.cc->evtype); xf_input_event(xfc, event, cookie.cc->data, cookie.cc->evtype);
break; break;
} }
} }
@ -545,8 +545,21 @@ static int xf_input_touch_remote(xfContext* xfc, XIDeviceEvent* event, int evtyp
return 0; return 0;
} }
int xf_input_event(xfContext* xfc, XIDeviceEvent* event, int evtype) int xf_input_event(xfContext* xfc, const XEvent* xevent, XIDeviceEvent* event, int evtype)
{ {
Window w;
WINPR_ASSERT(xfc);
WINPR_ASSERT(xevent);
WINPR_ASSERT(event);
w = xevent->xany.window;
if (w != xfc->window)
{
if (!xfc->remote_app)
return 0;
}
xf_input_show_cursor(xfc); xf_input_show_cursor(xfc);
switch (evtype) switch (evtype)
@ -613,7 +626,7 @@ static int xf_input_handle_event_remote(xfContext* xfc, const XEvent* event)
break; break;
default: default:
xf_input_event(xfc, cookie.cc->data, cookie.cc->evtype); xf_input_event(xfc, event, cookie.cc->data, cookie.cc->evtype);
break; break;
} }
} }