From 1c1e0ef425c2f89a4032f3ebb73deedc29aa2432 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Thu, 13 Jun 2024 18:12:55 +0900 Subject: [PATCH] e_input: intialze e_comp_input at e_input_init move it from e_comp_wl_input to e_input_init. Change-Id: I6df068ce9ccff7a45498c6298559777b40569fde --- src/bin/inputmgr/e_input.c | 5 +++++ src/bin/server/e_comp_wl_input.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/bin/inputmgr/e_input.c b/src/bin/inputmgr/e_input.c index acc4b93..a2b8705 100644 --- a/src/bin/inputmgr/e_input.c +++ b/src/bin/inputmgr/e_input.c @@ -5,6 +5,7 @@ #include "e_comp_wl_input_intern.h" #include "e_comp_wl_intern.h" #include "e_utils_intern.h" +#include "e_comp_input_intern.h" #include #include @@ -153,6 +154,8 @@ e_input_init(Ecore_Evas *ee) } eina_log_domain_level_set("e_input", EINA_LOG_LEVEL_INFO); + e_comp_input_init(); + E_INPUT_EVENT_SEAT_ADD = ecore_event_type_new(); E_EVENT_INPUT_ENABLED = ecore_event_type_new(); E_EVENT_INPUT_DISABLED = ecore_event_type_new(); @@ -304,6 +307,8 @@ e_input_shutdown(void) eina_stringshare_del(e_input->input_base_dir); e_input_device_close(e_input->dev); + e_comp_input_shutdown(); + free(e_input); ecore_event_evas_shutdown(); diff --git a/src/bin/server/e_comp_wl_input.c b/src/bin/server/e_comp_wl_input.c index 62faf77..55c6530 100644 --- a/src/bin/server/e_comp_wl_input.c +++ b/src/bin/server/e_comp_wl_input.c @@ -1560,8 +1560,6 @@ e_comp_wl_input_init(void) if (!e_comp_wl->seat.name) e_comp_wl->seat.name = "default"; - e_comp_input_init(); - dont_set_e_input_keymap = getenv("NO_E_INPUT_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE; dont_use_xkb_cache = getenv("NO_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE; @@ -1718,8 +1716,6 @@ e_comp_wl_input_shutdown(void) if (e_comp_wl->xkb.context) xkb_context_unref(e_comp_wl->xkb.context); - e_comp_input_shutdown(); - /* destroy the global relative pointer resource */ if (e_comp_wl->relative_ptr.global) wl_global_destroy(e_comp_wl->relative_ptr.global); -- 2.7.4