diff --git a/app/src/control_msg.c b/app/src/control_msg.c index 75c74628..d093183a 100644 --- a/app/src/control_msg.c +++ b/app/src/control_msg.c @@ -89,7 +89,7 @@ to_fixed_point_16(float f) { } size_t -control_msg_serialize(const struct control_msg *msg, unsigned char *buf) { +sc_control_msg_serialize(const struct sc_control_msg *msg, unsigned char *buf) { buf[0] = msg->type; switch (msg->type) { case CONTROL_MSG_TYPE_INJECT_KEYCODE: @@ -151,7 +151,7 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) { } void -control_msg_log(const struct control_msg *msg) { +sc_control_msg_log(const struct sc_control_msg *msg) { #define LOG_CMSG(fmt, ...) LOGV("input: " fmt, ## __VA_ARGS__) switch (msg->type) { case CONTROL_MSG_TYPE_INJECT_KEYCODE: @@ -237,7 +237,7 @@ control_msg_log(const struct control_msg *msg) { } void -control_msg_destroy(struct control_msg *msg) { +sc_control_msg_destroy(struct sc_control_msg *msg) { switch (msg->type) { case CONTROL_MSG_TYPE_INJECT_TEXT: free(msg->inject_text.text); diff --git a/app/src/control_msg.h b/app/src/control_msg.h index 0eadd4f2..2ac96064 100644 --- a/app/src/control_msg.h +++ b/app/src/control_msg.h @@ -20,7 +20,7 @@ #define POINTER_ID_MOUSE UINT64_C(-1) #define POINTER_ID_VIRTUAL_FINGER UINT64_C(-2) -enum control_msg_type { +enum sc_control_msg_type { CONTROL_MSG_TYPE_INJECT_KEYCODE, CONTROL_MSG_TYPE_INJECT_TEXT, CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT, @@ -47,8 +47,8 @@ enum get_clipboard_copy_key { GET_CLIPBOARD_COPY_KEY_CUT, }; -struct control_msg { - enum control_msg_type type; +struct sc_control_msg { + enum sc_control_msg_type type; union { struct { enum android_keyevent_action action; @@ -93,12 +93,12 @@ struct control_msg { // buf size must be at least CONTROL_MSG_MAX_SIZE // return the number of bytes written size_t -control_msg_serialize(const struct control_msg *msg, unsigned char *buf); +sc_control_msg_serialize(const struct sc_control_msg *msg, unsigned char *buf); void -control_msg_log(const struct control_msg *msg); +sc_control_msg_log(const struct sc_control_msg *msg); void -control_msg_destroy(struct control_msg *msg); +sc_control_msg_destroy(struct sc_control_msg *msg); #endif diff --git a/app/src/controller.c b/app/src/controller.c index 531b5fb9..9135d967 100644 --- a/app/src/controller.c +++ b/app/src/controller.c @@ -38,9 +38,9 @@ sc_controller_destroy(struct sc_controller *controller) { sc_cond_destroy(&controller->msg_cond); sc_mutex_destroy(&controller->mutex); - struct control_msg msg; + struct sc_control_msg msg; while (cbuf_take(&controller->queue, &msg)) { - control_msg_destroy(&msg); + sc_control_msg_destroy(&msg); } receiver_destroy(&controller->receiver); @@ -48,9 +48,9 @@ sc_controller_destroy(struct sc_controller *controller) { bool sc_controller_push_msg(struct sc_controller *controller, - const struct control_msg *msg) { + const struct sc_control_msg *msg) { if (sc_get_log_level() <= SC_LOG_LEVEL_VERBOSE) { - control_msg_log(msg); + sc_control_msg_log(msg); } sc_mutex_lock(&controller->mutex); @@ -64,9 +64,10 @@ sc_controller_push_msg(struct sc_controller *controller, } static bool -process_msg(struct sc_controller *controller, const struct control_msg *msg) { +process_msg(struct sc_controller *controller, + const struct sc_control_msg *msg) { static unsigned char serialized_msg[CONTROL_MSG_MAX_SIZE]; - size_t length = control_msg_serialize(msg, serialized_msg); + size_t length = sc_control_msg_serialize(msg, serialized_msg); if (!length) { return false; } @@ -89,14 +90,14 @@ run_controller(void *data) { sc_mutex_unlock(&controller->mutex); break; } - struct control_msg msg; + struct sc_control_msg msg; bool non_empty = cbuf_take(&controller->queue, &msg); assert(non_empty); (void) non_empty; sc_mutex_unlock(&controller->mutex); bool ok = process_msg(controller, &msg); - control_msg_destroy(&msg); + sc_control_msg_destroy(&msg); if (!ok) { LOGD("Could not write msg to socket"); break; diff --git a/app/src/controller.h b/app/src/controller.h index 06ceb782..f8bc7c02 100644 --- a/app/src/controller.h +++ b/app/src/controller.h @@ -12,7 +12,7 @@ #include "util/net.h" #include "util/thread.h" -struct sc_control_msg_queue CBUF(struct control_msg, 64); +struct sc_control_msg_queue CBUF(struct sc_control_msg, 64); struct sc_controller { sc_socket control_socket; @@ -42,6 +42,6 @@ sc_controller_join(struct sc_controller *controller); bool sc_controller_push_msg(struct sc_controller *controller, - const struct control_msg *msg); + const struct sc_control_msg *msg); #endif diff --git a/app/src/input_manager.c b/app/src/input_manager.c index 5b355701..9eee6e6c 100644 --- a/app/src/input_manager.c +++ b/app/src/input_manager.c @@ -160,7 +160,7 @@ static void send_keycode(struct sc_controller *controller, enum android_keycode keycode, enum sc_action action, const char *name) { // send DOWN event - struct control_msg msg; + struct sc_control_msg msg; msg.type = CONTROL_MSG_TYPE_INJECT_KEYCODE; msg.inject_keycode.action = action == SC_ACTION_DOWN ? AKEY_EVENT_ACTION_DOWN @@ -214,7 +214,7 @@ action_menu(struct sc_controller *controller, enum sc_action action) { static void press_back_or_turn_screen_on(struct sc_controller *controller, enum sc_action action) { - struct control_msg msg; + struct sc_control_msg msg; msg.type = CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON; msg.back_or_screen_on.action = action == SC_ACTION_DOWN ? AKEY_EVENT_ACTION_DOWN @@ -227,7 +227,7 @@ press_back_or_turn_screen_on(struct sc_controller *controller, static void expand_notification_panel(struct sc_controller *controller) { - struct control_msg msg; + struct sc_control_msg msg; msg.type = CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL; if (!sc_controller_push_msg(controller, &msg)) { @@ -237,7 +237,7 @@ expand_notification_panel(struct sc_controller *controller) { static void expand_settings_panel(struct sc_controller *controller) { - struct control_msg msg; + struct sc_control_msg msg; msg.type = CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL; if (!sc_controller_push_msg(controller, &msg)) { @@ -247,7 +247,7 @@ expand_settings_panel(struct sc_controller *controller) { static void collapse_panels(struct sc_controller *controller) { - struct control_msg msg; + struct sc_control_msg msg; msg.type = CONTROL_MSG_TYPE_COLLAPSE_PANELS; if (!sc_controller_push_msg(controller, &msg)) { @@ -258,7 +258,7 @@ collapse_panels(struct sc_controller *controller) { static bool get_device_clipboard(struct sc_controller *controller, enum get_clipboard_copy_key copy_key) { - struct control_msg msg; + struct sc_control_msg msg; msg.type = CONTROL_MSG_TYPE_GET_CLIPBOARD; msg.get_clipboard.copy_key = copy_key; @@ -286,7 +286,7 @@ set_device_clipboard(struct sc_controller *controller, bool paste, return false; } - struct control_msg msg; + struct sc_control_msg msg; msg.type = CONTROL_MSG_TYPE_SET_CLIPBOARD; msg.set_clipboard.sequence = sequence; msg.set_clipboard.text = text_dup; @@ -304,7 +304,7 @@ set_device_clipboard(struct sc_controller *controller, bool paste, static void set_screen_power_mode(struct sc_controller *controller, enum screen_power_mode mode) { - struct control_msg msg; + struct sc_control_msg msg; msg.type = CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE; msg.set_screen_power_mode.mode = mode; @@ -349,7 +349,7 @@ clipboard_paste(struct sc_controller *controller) { return; } - struct control_msg msg; + struct sc_control_msg msg; msg.type = CONTROL_MSG_TYPE_INJECT_TEXT; msg.inject_text.text = text_dup; if (!sc_controller_push_msg(controller, &msg)) { @@ -360,7 +360,7 @@ clipboard_paste(struct sc_controller *controller) { static void rotate_device(struct sc_controller *controller) { - struct control_msg msg; + struct sc_control_msg msg; msg.type = CONTROL_MSG_TYPE_ROTATE_DEVICE; if (!sc_controller_push_msg(controller, &msg)) { @@ -406,7 +406,7 @@ simulate_virtual_finger(struct sc_input_manager *im, struct sc_point point) { bool up = action == AMOTION_EVENT_ACTION_UP; - struct control_msg msg; + struct sc_control_msg msg; msg.type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT; msg.inject_touch_event.action = action; msg.inject_touch_event.position.screen_size = im->screen->frame_size; diff --git a/app/src/keyboard_inject.c b/app/src/keyboard_inject.c index 9c141a37..7276d325 100644 --- a/app/src/keyboard_inject.c +++ b/app/src/keyboard_inject.c @@ -246,7 +246,7 @@ convert_meta_state(uint16_t mod) { } static bool -convert_input_key(const struct sc_key_event *event, struct control_msg *msg, +convert_input_key(const struct sc_key_event *event, struct sc_control_msg *msg, enum sc_key_inject_mode key_inject_mode, uint32_t repeat) { msg->type = CONTROL_MSG_TYPE_INJECT_KEYCODE; @@ -282,7 +282,7 @@ sc_key_processor_process_key(struct sc_key_processor *kp, ki->repeat = 0; } - struct control_msg msg; + struct sc_control_msg msg; if (convert_input_key(event, &msg, ki->key_inject_mode, ki->repeat)) { if (!sc_controller_push_msg(ki->controller, &msg)) { LOGW("Could not request 'inject keycode'"); @@ -309,7 +309,7 @@ sc_key_processor_process_text(struct sc_key_processor *kp, } } - struct control_msg msg; + struct sc_control_msg msg; msg.type = CONTROL_MSG_TYPE_INJECT_TEXT; msg.inject_text.text = strdup(event->text); if (!msg.inject_text.text) { diff --git a/app/src/mouse_inject.c b/app/src/mouse_inject.c index 106c215f..855aaa9f 100644 --- a/app/src/mouse_inject.c +++ b/app/src/mouse_inject.c @@ -65,7 +65,7 @@ sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp, struct sc_mouse_inject *mi = DOWNCAST(mp); - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT, .inject_touch_event = { .action = AMOTION_EVENT_ACTION_MOVE, @@ -86,7 +86,7 @@ sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp, const struct sc_mouse_click_event *event) { struct sc_mouse_inject *mi = DOWNCAST(mp); - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT, .inject_touch_event = { .action = convert_mouse_action(event->action), @@ -107,7 +107,7 @@ sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp, const struct sc_mouse_scroll_event *event) { struct sc_mouse_inject *mi = DOWNCAST(mp); - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT, .inject_scroll_event = { .position = event->position, @@ -127,7 +127,7 @@ sc_mouse_processor_process_touch(struct sc_mouse_processor *mp, const struct sc_touch_event *event) { struct sc_mouse_inject *mi = DOWNCAST(mp); - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT, .inject_touch_event = { .action = convert_touch_action(event->action), diff --git a/app/src/scrcpy.c b/app/src/scrcpy.c index e1869eec..86fdf984 100644 --- a/app/src/scrcpy.c +++ b/app/src/scrcpy.c @@ -558,7 +558,7 @@ aoa_hid_end: controller_started = true; if (options->turn_screen_off) { - struct control_msg msg; + struct sc_control_msg msg; msg.type = CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE; msg.set_screen_power_mode.mode = SCREEN_POWER_MODE_OFF; diff --git a/app/tests/test_control_msg_serialize.c b/app/tests/test_control_msg_serialize.c index d1f0f161..95a54a98 100644 --- a/app/tests/test_control_msg_serialize.c +++ b/app/tests/test_control_msg_serialize.c @@ -6,7 +6,7 @@ #include "control_msg.h" static void test_serialize_inject_keycode(void) { - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_INJECT_KEYCODE, .inject_keycode = { .action = AKEY_EVENT_ACTION_UP, @@ -17,7 +17,7 @@ static void test_serialize_inject_keycode(void) { }; unsigned char buf[CONTROL_MSG_MAX_SIZE]; - size_t size = control_msg_serialize(&msg, buf); + size_t size = sc_control_msg_serialize(&msg, buf); assert(size == 14); const unsigned char expected[] = { @@ -31,7 +31,7 @@ static void test_serialize_inject_keycode(void) { } static void test_serialize_inject_text(void) { - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_INJECT_TEXT, .inject_text = { .text = "hello, world!", @@ -39,7 +39,7 @@ static void test_serialize_inject_text(void) { }; unsigned char buf[CONTROL_MSG_MAX_SIZE]; - size_t size = control_msg_serialize(&msg, buf); + size_t size = sc_control_msg_serialize(&msg, buf); assert(size == 18); const unsigned char expected[] = { @@ -51,7 +51,7 @@ static void test_serialize_inject_text(void) { } static void test_serialize_inject_text_long(void) { - struct control_msg msg; + struct sc_control_msg msg; msg.type = CONTROL_MSG_TYPE_INJECT_TEXT; char text[CONTROL_MSG_INJECT_TEXT_MAX_LENGTH + 1]; memset(text, 'a', CONTROL_MSG_INJECT_TEXT_MAX_LENGTH); @@ -59,7 +59,7 @@ static void test_serialize_inject_text_long(void) { msg.inject_text.text = text; unsigned char buf[CONTROL_MSG_MAX_SIZE]; - size_t size = control_msg_serialize(&msg, buf); + size_t size = sc_control_msg_serialize(&msg, buf); assert(size == 5 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH); unsigned char expected[5 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH]; @@ -74,7 +74,7 @@ static void test_serialize_inject_text_long(void) { } static void test_serialize_inject_touch_event(void) { - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT, .inject_touch_event = { .action = AMOTION_EVENT_ACTION_DOWN, @@ -95,7 +95,7 @@ static void test_serialize_inject_touch_event(void) { }; unsigned char buf[CONTROL_MSG_MAX_SIZE]; - size_t size = control_msg_serialize(&msg, buf); + size_t size = sc_control_msg_serialize(&msg, buf); assert(size == 28); const unsigned char expected[] = { @@ -111,7 +111,7 @@ static void test_serialize_inject_touch_event(void) { } static void test_serialize_inject_scroll_event(void) { - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT, .inject_scroll_event = { .position = { @@ -131,7 +131,7 @@ static void test_serialize_inject_scroll_event(void) { }; unsigned char buf[CONTROL_MSG_MAX_SIZE]; - size_t size = control_msg_serialize(&msg, buf); + size_t size = sc_control_msg_serialize(&msg, buf); assert(size == 25); const unsigned char expected[] = { @@ -146,7 +146,7 @@ static void test_serialize_inject_scroll_event(void) { } static void test_serialize_back_or_screen_on(void) { - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON, .back_or_screen_on = { .action = AKEY_EVENT_ACTION_UP, @@ -154,7 +154,7 @@ static void test_serialize_back_or_screen_on(void) { }; unsigned char buf[CONTROL_MSG_MAX_SIZE]; - size_t size = control_msg_serialize(&msg, buf); + size_t size = sc_control_msg_serialize(&msg, buf); assert(size == 2); const unsigned char expected[] = { @@ -165,12 +165,12 @@ static void test_serialize_back_or_screen_on(void) { } static void test_serialize_expand_notification_panel(void) { - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL, }; unsigned char buf[CONTROL_MSG_MAX_SIZE]; - size_t size = control_msg_serialize(&msg, buf); + size_t size = sc_control_msg_serialize(&msg, buf); assert(size == 1); const unsigned char expected[] = { @@ -180,12 +180,12 @@ static void test_serialize_expand_notification_panel(void) { } static void test_serialize_expand_settings_panel(void) { - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL, }; unsigned char buf[CONTROL_MSG_MAX_SIZE]; - size_t size = control_msg_serialize(&msg, buf); + size_t size = sc_control_msg_serialize(&msg, buf); assert(size == 1); const unsigned char expected[] = { @@ -195,12 +195,12 @@ static void test_serialize_expand_settings_panel(void) { } static void test_serialize_collapse_panels(void) { - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_COLLAPSE_PANELS, }; unsigned char buf[CONTROL_MSG_MAX_SIZE]; - size_t size = control_msg_serialize(&msg, buf); + size_t size = sc_control_msg_serialize(&msg, buf); assert(size == 1); const unsigned char expected[] = { @@ -210,7 +210,7 @@ static void test_serialize_collapse_panels(void) { } static void test_serialize_get_clipboard(void) { - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_GET_CLIPBOARD, .get_clipboard = { .copy_key = GET_CLIPBOARD_COPY_KEY_COPY, @@ -218,7 +218,7 @@ static void test_serialize_get_clipboard(void) { }; unsigned char buf[CONTROL_MSG_MAX_SIZE]; - size_t size = control_msg_serialize(&msg, buf); + size_t size = sc_control_msg_serialize(&msg, buf); assert(size == 2); const unsigned char expected[] = { @@ -229,7 +229,7 @@ static void test_serialize_get_clipboard(void) { } static void test_serialize_set_clipboard(void) { - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_SET_CLIPBOARD, .set_clipboard = { .sequence = UINT64_C(0x0102030405060708), @@ -239,7 +239,7 @@ static void test_serialize_set_clipboard(void) { }; unsigned char buf[CONTROL_MSG_MAX_SIZE]; - size_t size = control_msg_serialize(&msg, buf); + size_t size = sc_control_msg_serialize(&msg, buf); assert(size == 27); const unsigned char expected[] = { @@ -253,7 +253,7 @@ static void test_serialize_set_clipboard(void) { } static void test_serialize_set_clipboard_long(void) { - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_SET_CLIPBOARD, .set_clipboard = { .sequence = UINT64_C(0x0102030405060708), @@ -268,7 +268,7 @@ static void test_serialize_set_clipboard_long(void) { msg.set_clipboard.text = text; unsigned char buf[CONTROL_MSG_MAX_SIZE]; - size_t size = control_msg_serialize(&msg, buf); + size_t size = sc_control_msg_serialize(&msg, buf); assert(size == CONTROL_MSG_MAX_SIZE); unsigned char expected[CONTROL_MSG_MAX_SIZE] = { @@ -287,7 +287,7 @@ static void test_serialize_set_clipboard_long(void) { } static void test_serialize_set_screen_power_mode(void) { - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE, .set_screen_power_mode = { .mode = SCREEN_POWER_MODE_NORMAL, @@ -295,7 +295,7 @@ static void test_serialize_set_screen_power_mode(void) { }; unsigned char buf[CONTROL_MSG_MAX_SIZE]; - size_t size = control_msg_serialize(&msg, buf); + size_t size = sc_control_msg_serialize(&msg, buf); assert(size == 2); const unsigned char expected[] = { @@ -306,12 +306,12 @@ static void test_serialize_set_screen_power_mode(void) { } static void test_serialize_rotate_device(void) { - struct control_msg msg = { + struct sc_control_msg msg = { .type = CONTROL_MSG_TYPE_ROTATE_DEVICE, }; unsigned char buf[CONTROL_MSG_MAX_SIZE]; - size_t size = control_msg_serialize(&msg, buf); + size_t size = sc_control_msg_serialize(&msg, buf); assert(size == 1); const unsigned char expected[] = {