diff options
| author | sefler <sefler@126.com> | 2022-09-13 07:06:42 +0300 |
|---|---|---|
| committer | sefler <sefler@126.com> | 2022-09-13 07:50:51 +0300 |
| commit | 52611f408a568ef98c9e98c7c6dde878212e8587 (patch) | |
| tree | cea48c10e6d8014e04015e1ac3579496132542d3 | |
| parent | ce08e5ef4d74f1f7a6cc66dffcca62f9fcdcc44f (diff) | |
Revert "mouse: workaround for too fast vertical scroll"
This reverts commit 6e136ac8ffb4fdeba5e610bd2475d1db59175611.
| -rw-r--r-- | module/rdp.h | 1 | ||||
| -rw-r--r-- | module/rdpClientCon.c | 20 | ||||
| -rw-r--r-- | module/rdpInput.c | 24 |
3 files changed, 0 insertions, 45 deletions
diff --git a/module/rdp.h b/module/rdp.h index 66e1f20..050f962 100644 --- a/module/rdp.h +++ b/module/rdp.h @@ -288,7 +288,6 @@ struct _rdpRec int do_dirty_ons; /* boolean */ int disconnect_scheduled; /* boolean */ int do_kill_disconnected; /* boolean */ - int do_touchpad_scroll_hack; /* boolean */ OsTimerPtr disconnectTimer; int disconnect_timeout_s; diff --git a/module/rdpClientCon.c b/module/rdpClientCon.c index 504d261..e4e0317 100644 --- a/module/rdpClientCon.c +++ b/module/rdpClientCon.c @@ -1473,26 +1473,6 @@ rdpClientConInit(rdpPtr dev) LLOGLN(0, ("rdpClientConInit: kill disconnected [%d] timeout [%d] sec", dev->do_kill_disconnected, dev->disconnect_timeout_s)); - /* neutrinolabs/xorgxrdp#150 */ - ptext = getenv("XRDP_XORG_TOUCHPAD_SCROLL_HACK"); - if (ptext != 0) - { - i = atoi(ptext); - if (i != 0 || - 0 == strcasecmp(ptext, "true") || - 0 == strcasecmp(ptext, "yes") || - 0 == strcasecmp(ptext, "on")) - { - dev->do_touchpad_scroll_hack = 1; - } - else - { - dev->do_touchpad_scroll_hack = 0; - } - } - - LLOGLN(0, ("rdpClientConInit: do_touchpad_scroll_hack [%d]", - dev->do_touchpad_scroll_hack)); return 0; } diff --git a/module/rdpInput.c b/module/rdpInput.c index edb4b01..daedf39 100644 --- a/module/rdpInput.c +++ b/module/rdpInput.c @@ -115,30 +115,6 @@ rdpInputMouseEvent(rdpPtr dev, int msg, { dev->last_event_time_ms = GetTimeInMillis(); - /* - * Workaround for too fast vertical scroll on touchpad. - * Provided by @seflerZ on neutrinolabs/xorgxrdp#150 - */ - if (dev->do_touchpad_scroll_hack) - { - if (msg == WM_BUTTON4UP || - msg == WM_BUTTON4DOWN || - msg == WM_BUTTON5UP || - msg == WM_BUTTON5DOWN) - { - - if (dev->last_event_time_ms - dev->last_wheel_time_ms < 10) - { - return 0; - } - } - - if (msg == WM_BUTTON4UP || msg == WM_BUTTON5UP) - { - dev->last_wheel_time_ms = dev->last_event_time_ms; - } - } - if (g_input_proc[1].proc != 0) { return g_input_proc[1].proc(dev, msg, param1, param2, param3, param4); |