Display and control your Android device
Initialize input manager dynamically
Romain Vimont6a2cd089a176
diff --git a/app/src/input_manager.c b/app/src/input_manager.cindex 55b5fae2..b008c4db 100644--- a/app/src/input_manager.c+++ b/app/src/input_manager.c@@ -52,9 +52,13 @@ is_shortcut_mod(struct input_manager *im, uint16_t sdl_mod) {}void-input_manager_init(struct input_manager *im,- const struct scrcpy_options *options)-{+input_manager_init(struct input_manager *im, struct controller *controller,+ struct screen *screen,+ const struct scrcpy_options *options) {+ im->controller = controller;+ im->screen = screen;+ im->repeat = 0;+im->control = options->control;im->forward_key_repeat = options->forward_key_repeat;im->prefer_text = options->prefer_text;diff --git a/app/src/input_manager.h b/app/src/input_manager.hindex 76690757..1dd7825f 100644--- a/app/src/input_manager.h+++ b/app/src/input_manager.h@@ -42,8 +42,8 @@ struct input_manager {};void-input_manager_init(struct input_manager *im,- const struct scrcpy_options *options);+input_manager_init(struct input_manager *im, struct controller *controller,+ struct screen *screen, const struct scrcpy_options *options);boolinput_manager_handle_event(struct input_manager *im, SDL_Event *event);diff --git a/app/src/scrcpy.c b/app/src/scrcpy.cindex e7a349d8..8d14a21b 100644--- a/app/src/scrcpy.c+++ b/app/src/scrcpy.c@@ -40,19 +40,7 @@ static struct sc_v4l2_sink v4l2_sink;#endifstatic struct controller controller;static struct file_handler file_handler;--static struct input_manager input_manager = {- .controller = &controller,- .screen = &screen,- .repeat = 0,-- // initialized later- .prefer_text = false,- .sdl_shortcut_mods = {- .data = {0},- .count = 0,- },-};+static struct input_manager input_manager;#ifdef _WIN32BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {@@ -422,7 +410,7 @@ scrcpy(const struct scrcpy_options *options) {}stream_started = true;- input_manager_init(&input_manager, options);+ input_manager_init(&input_manager, &controller, &screen, options);ret = event_loop(options);LOGD("quit...");