From ffdbf5990ba82fa206248b4a411442a6885dbcca Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Sun, 15 Sep 2019 16:32:46 +0200 Subject: [PATCH] Rename event converter functions Rename "XXX_from_sdl_to_android" to "convert_XXX", to avoid huge function names. --- app/src/event_converter.c | 19 +++++++------------ app/src/event_converter.h | 18 +++++++----------- app/src/input_manager.c | 12 ++++-------- 3 files changed, 18 insertions(+), 31 deletions(-) diff --git a/app/src/event_converter.c b/app/src/event_converter.c index 17351645..dea61eee 100644 --- a/app/src/event_converter.c +++ b/app/src/event_converter.c @@ -31,7 +31,6 @@ autocomplete_metastate(enum android_metastate metastate) { return metastate; } - static enum android_metastate convert_meta_state(SDL_Keymod mod) { enum android_metastate metastate = 0; @@ -158,8 +157,7 @@ convert_mouse_buttons(uint32_t state) { } bool -input_key_from_sdl_to_android(const SDL_KeyboardEvent *from, - struct control_msg *to) { +convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to) { to->type = CONTROL_MSG_TYPE_INJECT_KEYCODE; if (!convert_keycode_action(from->type, &to->inject_keycode.action)) { @@ -177,9 +175,8 @@ input_key_from_sdl_to_android(const SDL_KeyboardEvent *from, } bool -mouse_button_from_sdl_to_android(const SDL_MouseButtonEvent *from, - struct size screen_size, - struct control_msg *to) { +convert_mouse_button(const SDL_MouseButtonEvent *from, struct size screen_size, + struct control_msg *to) { to->type = CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT; if (!convert_mouse_action(from->type, &to->inject_mouse_event.action)) { @@ -196,9 +193,8 @@ mouse_button_from_sdl_to_android(const SDL_MouseButtonEvent *from, } bool -mouse_motion_from_sdl_to_android(const SDL_MouseMotionEvent *from, - struct size screen_size, - struct control_msg *to) { +convert_mouse_motion(const SDL_MouseMotionEvent *from, struct size screen_size, + struct control_msg *to) { to->type = CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT; to->inject_mouse_event.action = AMOTION_EVENT_ACTION_MOVE; to->inject_mouse_event.buttons = convert_mouse_buttons(from->state); @@ -210,9 +206,8 @@ mouse_motion_from_sdl_to_android(const SDL_MouseMotionEvent *from, } bool -mouse_wheel_from_sdl_to_android(const SDL_MouseWheelEvent *from, - struct position position, - struct control_msg *to) { +convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct position position, + struct control_msg *to) { to->type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT; to->inject_scroll_event.position = position; diff --git a/app/src/event_converter.h b/app/src/event_converter.h index 5989e163..2d7aa1ae 100644 --- a/app/src/event_converter.h +++ b/app/src/event_converter.h @@ -17,25 +17,21 @@ struct complete_mouse_wheel_event { }; bool -input_key_from_sdl_to_android(const SDL_KeyboardEvent *from, - struct control_msg *to); +convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to); bool -mouse_button_from_sdl_to_android(const SDL_MouseButtonEvent *from, - struct size screen_size, - struct control_msg *to); +convert_mouse_button(const SDL_MouseButtonEvent *from, struct size screen_size, + struct control_msg *to); // the video size may be different from the real device size, so we need the // size to which the absolute position apply, to scale it accordingly bool -mouse_motion_from_sdl_to_android(const SDL_MouseMotionEvent *from, - struct size screen_size, - struct control_msg *to); +convert_mouse_motion(const SDL_MouseMotionEvent *from, struct size screen_size, + struct control_msg *to); // on Android, a scroll event requires the current mouse position bool -mouse_wheel_from_sdl_to_android(const SDL_MouseWheelEvent *from, - struct position position, - struct control_msg *to); +convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct position position, + struct control_msg *to); #endif diff --git a/app/src/input_manager.c b/app/src/input_manager.c index 506c5798..faacd29e 100644 --- a/app/src/input_manager.c +++ b/app/src/input_manager.c @@ -373,7 +373,7 @@ input_manager_process_key(struct input_manager *input_manager, } struct control_msg msg; - if (input_key_from_sdl_to_android(event, &msg)) { + if (convert_input_key(event, &msg)) { if (!controller_push_msg(controller, &msg)) { LOGW("Could not request 'inject keycode'"); } @@ -388,9 +388,7 @@ input_manager_process_mouse_motion(struct input_manager *input_manager, return; } struct control_msg msg; - if (mouse_motion_from_sdl_to_android(event, - input_manager->screen->frame_size, - &msg)) { + if (convert_mouse_motion(event, input_manager->screen->frame_size, &msg)) { if (!controller_push_msg(input_manager->controller, &msg)) { LOGW("Could not request 'inject mouse motion event'"); } @@ -434,9 +432,7 @@ input_manager_process_mouse_button(struct input_manager *input_manager, } struct control_msg msg; - if (mouse_button_from_sdl_to_android(event, - input_manager->screen->frame_size, - &msg)) { + if (convert_mouse_button(event, input_manager->screen->frame_size, &msg)) { if (!controller_push_msg(input_manager->controller, &msg)) { LOGW("Could not request 'inject mouse button event'"); } @@ -451,7 +447,7 @@ input_manager_process_mouse_wheel(struct input_manager *input_manager, .point = get_mouse_point(input_manager->screen), }; struct control_msg msg; - if (mouse_wheel_from_sdl_to_android(event, position, &msg)) { + if (convert_mouse_wheel(event, position, &msg)) { if (!controller_push_msg(input_manager->controller, &msg)) { LOGW("Could not request 'inject mouse wheel event'"); }