mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed #5262: Vertical mouse wheel direction and whell step 

* Vertical wheel uses the inverted direction of horizontal wheel.
* The wheel step is now calculated from the value provided by wayland.
This commit is contained in:
Armin Novak 2019-02-20 08:56:36 +01:00
parent f0e9c95f44
commit 0a95e4aa78
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client/Wayland/wlf_input.c
View File

@ -123,6 +123,7 @@ BOOL wlf_handle_pointer_axis(freerdp* instance, const UwacPointerAxisEvent* ev)
rdpInput* input;
UINT16 flags = 0;
int direction;
uint32_t step;
uint32_t x, y;
if (!instance || !ev || !instance->input)
@ -136,27 +137,31 @@ BOOL wlf_handle_pointer_axis(freerdp* instance, const UwacPointerAxisEvent* ev)
input = instance->input;
direction = wl_fixed_to_int(ev->value);
switch (ev->axis)
{
case WL_POINTER_AXIS_VERTICAL_SCROLL:
flags |= PTR_FLAGS_WHEEL;
if (direction > 0)
flags |= PTR_FLAGS_WHEEL_NEGATIVE;
break;
case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
flags |= PTR_FLAGS_HWHEEL;
if (direction < 0)
flags |= PTR_FLAGS_WHEEL_NEGATIVE;
break;
default:
return FALSE;
}
direction = wl_fixed_to_int(ev->value);
flags |= 0x0078; /* TODO: Calculate the distance with the provided value size */
step = (uint32_t)abs(direction);
if (step > WheelRotationMask)
step = WheelRotationMask;
flags |= step;
if (direction < 0)
flags |= PTR_FLAGS_WHEEL_NEGATIVE;
return freerdp_input_send_mouse_event(input, flags, x, y);
return freerdp_input_send_mouse_event(input, flags, (UINT16)x, (UINT16)y);
}
BOOL wlf_handle_key(freerdp* instance, const UwacKeyEvent* ev)