mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use wrapper functions for input event handling.

Browse Source
This commit is contained in:
Armin Novak 2018-03-05 09:59:41 +01:00
parent 87c44a0471
commit 733f58c4f9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/Wayland/wlf_input.c
View File

@ -30,7 +30,7 @@ BOOL wlf_handle_pointer_enter(freerdp* instance, UwacPointerEnterLeaveEvent* ev)
if (!instance || !ev || !instance->input) if (!instance || !ev || !instance->input)
return FALSE; 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) 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) if (!instance || !ev || !instance->input)
return FALSE; 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) 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 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; 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) BOOL wlf_handle_key(freerdp* instance, UwacKeyEvent* ev)
@ -128,6 +128,6 @@ BOOL wlf_keyboard_enter(freerdp* instance, UwacKeyboardEnterLeaveEvent* ev)
return FALSE; return FALSE;
input = instance->input; input = instance->input;
return input->FocusInEvent(input, 0) && return freerdp_input_send_focus_in_event(input, 0) &&
input->MouseEvent(input, PTR_FLAGS_MOVE, 0, 0); freerdp_input_send_mouse_event(input, PTR_FLAGS_MOVE, 0, 0);
} }