From 733f58c4f90485483428462fb4f0d3f53383385c Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Mon, 5 Mar 2018 09:59:41 +0100 Subject: [PATCH] Use wrapper functions for input event handling. --- client/Wayland/wlf_input.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/Wayland/wlf_input.c b/client/Wayland/wlf_input.c index c547dbdf6..2516cb450 100644 --- a/client/Wayland/wlf_input.c +++ b/client/Wayland/wlf_input.c @@ -30,7 +30,7 @@ BOOL wlf_handle_pointer_enter(freerdp* instance, UwacPointerEnterLeaveEvent* ev) if (!instance || !ev || !instance->input) return FALSE; - return instance->input->MouseEvent(instance->input, PTR_FLAGS_MOVE, ev->x, ev->y); + return freerdp_input_send_mouse_event(instance->input, PTR_FLAGS_MOVE, ev->x, ev->y); } BOOL wlf_handle_pointer_motion(freerdp* instance, UwacPointerMotionEvent* ev) @@ -38,7 +38,7 @@ BOOL wlf_handle_pointer_motion(freerdp* instance, UwacPointerMotionEvent* ev) if (!instance || !ev || !instance->input) return FALSE; - return instance->input->MouseEvent(instance->input, PTR_FLAGS_MOVE, ev->x, ev->y); + return freerdp_input_send_mouse_event(instance->input, PTR_FLAGS_MOVE, ev->x, ev->y); } BOOL wlf_handle_pointer_buttons(freerdp* instance, UwacPointerButtonEvent* ev) @@ -74,7 +74,7 @@ BOOL wlf_handle_pointer_buttons(freerdp* instance, UwacPointerButtonEvent* ev) return TRUE; } - return input->MouseEvent(input, flags, ev->x, ev->y); + return freerdp_input_send_mouse_event(input, flags, ev->x, ev->y); } @@ -100,7 +100,7 @@ BOOL wlf_handle_pointer_axis(freerdp* instance, UwacPointerAxisEvent* ev) flags |= PTR_FLAGS_WHEEL_NEGATIVE | 0x0088; } - return input->MouseEvent(input, flags, ev->x, ev->y); + return freerdp_input_send_mouse_event(input, flags, ev->x, ev->y); } BOOL wlf_handle_key(freerdp* instance, UwacKeyEvent* ev) @@ -128,6 +128,6 @@ BOOL wlf_keyboard_enter(freerdp* instance, UwacKeyboardEnterLeaveEvent* ev) return FALSE; input = instance->input; - return input->FocusInEvent(input, 0) && - input->MouseEvent(input, PTR_FLAGS_MOVE, 0, 0); + return freerdp_input_send_focus_in_event(input, 0) && + freerdp_input_send_mouse_event(input, PTR_FLAGS_MOVE, 0, 0); }