e_comp_screen: change a init sequence to generate cached keymap before drm init

Change-Id: I279742bd518d52a80f43f7349dedeeb1bd3dbb9e

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index c0dcd1d724e450a1fa88f4ba3c22175d5a26e83b..2c5c2137e252f15cf8bec43d1469cbfc9ee0a499 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -979,6 +979,17 @@ e_comp_screen_init()
         EINA_SAFETY_ON_NULL_RETURN_VAL(comp, EINA_FALSE);
      }
 
+   /* keymap */
+   dont_set_ecore_drm_keymap = getenv("NO_ECORE_DRM_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE;
+   dont_use_xkb_cache = getenv("NO_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE;
+
+   if (e_config->xkb.use_cache && !dont_use_xkb_cache)
+     {
+        e_main_ts("\tDRM Keymap Init");
+        _e_comp_screen_keymap_set(&ctx, &map);
+        e_main_ts("\tDRM Keymap Init Done");
+     }
+
    if (!_e_comp_screen_engine_init())
      {
         ERR("Could not initialize the ecore_evas engine.");
@@ -1018,17 +1029,6 @@ e_comp_screen_init()
      }
    e_main_ts("\tE_Pointer New Done");
 
-   /* keymap */
-   dont_set_ecore_drm_keymap = getenv("NO_ECORE_DRM_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE;
-   dont_use_xkb_cache = getenv("NO_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE;
-
-   if (e_config->xkb.use_cache && !dont_use_xkb_cache)
-     {
-        e_main_ts("\tDRM Keymap Init");
-        _e_comp_screen_keymap_set(&ctx, &map);
-        e_main_ts("\tDRM Keymap Init Done");
-     }
-
    /* FIXME: We need a way to trap for user changing the keymap inside of E
     *        without the event coming from X11 */