jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

X11rdp: do not Enqueue motion unless mouse position actually changes, fixes some context menus not always working

Browse Source
This commit is contained in:
Jay Sorg 2015-07-19 11:52:17 -07:00
parent a330789e5b
commit dbf959f5fa
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xorg/X11R7.6/rdp/rdpinput.c
View File

@ -59,6 +59,8 @@ extern int g_alt_down; /* in rdpmain.c */
extern int g_ctrl_down; /* in rdpmain.c */ extern int g_ctrl_down; /* in rdpmain.c */
static int g_old_button_mask = 0; static int g_old_button_mask = 0;
static int g_old_x = 0;
static int g_old_y = 0;
/* this is toggled every time num lock key is released, not like the /* this is toggled every time num lock key is released, not like the
above *_down vars */ above *_down vars */
static int g_scroll_lock_down = 0; static int g_scroll_lock_down = 0;
@ -858,7 +860,12 @@ rdpDeferredInputCallback(OsTimerPtr timer, CARD32 now, pointer arg)
{ {
LLOGLN(10, ("rdpDeferredInputCallback:")); LLOGLN(10, ("rdpDeferredInputCallback:"));
g_timer_schedualed = 0; g_timer_schedualed = 0;
if ((g_old_x != g_x) || (g_old_y != g_y))
{
rdpEnqueueMotion(g_x, g_y); rdpEnqueueMotion(g_x, g_y);
g_old_x = g_x;
g_old_y = g_x;
}
return 0; return 0;
} }
@ -886,7 +893,12 @@ PtrAddEvent(int buttonMask, int x, int y)
g_timer_schedualed = 0; g_timer_schedualed = 0;
TimerCancel(g_timer); TimerCancel(g_timer);
} }
if ((g_old_x != x) || (g_old_y != y))
{
rdpEnqueueMotion(x, y); rdpEnqueueMotion(x, y);
g_old_x = x;
g_old_y = y;
}
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
{ {
if ((buttonMask ^ g_old_button_mask) & (1 << i)) if ((buttonMask ^ g_old_button_mask) & (1 << i))