Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Rename event converter functions

Browse source 
Rename "XXX_from_sdl_to_android" to "convert_XXX", to avoid huge
function names.
This commit is contained in:
Romain Vimont 2019-09-15 16:32:46 +02:00
parent 9463850c24
commit ffdbf5990b
3 changed files with 18 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/event_converter.c
View file

@ -31,7 +31,6 @@ autocomplete_metastate(enum android_metastate metastate) {
return metastate; return metastate;
} }
static enum android_metastate static enum android_metastate
convert_meta_state(SDL_Keymod mod) { convert_meta_state(SDL_Keymod mod) {
enum android_metastate metastate = 0; enum android_metastate metastate = 0;
@ -158,8 +157,7 @@ convert_mouse_buttons(uint32_t state) {
} }
bool bool
input_key_from_sdl_to_android(const SDL_KeyboardEvent *from, convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to) {
struct control_msg *to) {
to->type = CONTROL_MSG_TYPE_INJECT_KEYCODE; to->type = CONTROL_MSG_TYPE_INJECT_KEYCODE;
if (!convert_keycode_action(from->type, &to->inject_keycode.action)) { 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 bool
mouse_button_from_sdl_to_android(const SDL_MouseButtonEvent *from, convert_mouse_button(const SDL_MouseButtonEvent *from, struct size screen_size,
struct size screen_size, struct control_msg *to) {
struct control_msg *to) {
to->type = CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT; to->type = CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT;
if (!convert_mouse_action(from->type, &to->inject_mouse_event.action)) { 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 bool
mouse_motion_from_sdl_to_android(const SDL_MouseMotionEvent *from, convert_mouse_motion(const SDL_MouseMotionEvent *from, struct size screen_size,
struct size screen_size, struct control_msg *to) {
struct control_msg *to) {
to->type = CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT; to->type = CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT;
to->inject_mouse_event.action = AMOTION_EVENT_ACTION_MOVE; to->inject_mouse_event.action = AMOTION_EVENT_ACTION_MOVE;
to->inject_mouse_event.buttons = convert_mouse_buttons(from->state); 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 bool
mouse_wheel_from_sdl_to_android(const SDL_MouseWheelEvent *from, convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct position position,
struct position position, struct control_msg *to) {
struct control_msg *to) {
to->type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT; to->type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT;
to->inject_scroll_event.position = position; to->inject_scroll_event.position = position;

18
app/src/event_converter.h
View file

@ -17,25 +17,21 @@ struct complete_mouse_wheel_event {
}; };
bool bool
input_key_from_sdl_to_android(const SDL_KeyboardEvent *from, convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to);
struct control_msg *to);
bool bool
mouse_button_from_sdl_to_android(const SDL_MouseButtonEvent *from, convert_mouse_button(const SDL_MouseButtonEvent *from, struct size screen_size,
struct size screen_size, struct control_msg *to);
struct control_msg *to);
// the video size may be different from the real device size, so we need the // 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 // size to which the absolute position apply, to scale it accordingly
bool bool
mouse_motion_from_sdl_to_android(const SDL_MouseMotionEvent *from, convert_mouse_motion(const SDL_MouseMotionEvent *from, struct size screen_size,
struct size screen_size, struct control_msg *to);
struct control_msg *to);
// on Android, a scroll event requires the current mouse position // on Android, a scroll event requires the current mouse position
bool bool
mouse_wheel_from_sdl_to_android(const SDL_MouseWheelEvent *from, convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct position position,
struct position position, struct control_msg *to);
struct control_msg *to);
#endif #endif

12
app/src/input_manager.c
View file

@ -373,7 +373,7 @@ input_manager_process_key(struct input_manager *input_manager,
} }
struct control_msg msg; 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)) { if (!controller_push_msg(controller, &msg)) {
LOGW("Could not request 'inject keycode'"); LOGW("Could not request 'inject keycode'");
} }
@ -388,9 +388,7 @@ input_manager_process_mouse_motion(struct input_manager *input_manager,
return; return;
} }
struct control_msg msg; struct control_msg msg;
if (mouse_motion_from_sdl_to_android(event, if (convert_mouse_motion(event, input_manager->screen->frame_size, &msg)) {
input_manager->screen->frame_size,
&msg)) {
if (!controller_push_msg(input_manager->controller, &msg)) { if (!controller_push_msg(input_manager->controller, &msg)) {
LOGW("Could not request 'inject mouse motion event'"); 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; struct control_msg msg;
if (mouse_button_from_sdl_to_android(event, if (convert_mouse_button(event, input_manager->screen->frame_size, &msg)) {
input_manager->screen->frame_size,
&msg)) {
if (!controller_push_msg(input_manager->controller, &msg)) { if (!controller_push_msg(input_manager->controller, &msg)) {
LOGW("Could not request 'inject mouse button event'"); 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), .point = get_mouse_point(input_manager->screen),
}; };
struct control_msg msg; 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)) { if (!controller_push_msg(input_manager->controller, &msg)) {
LOGW("Could not request 'inject mouse wheel event'"); LOGW("Could not request 'inject mouse wheel event'");
} }