Support to get keyboard mode manually

Change-Id: I0c989fe2d757d9543a65e3d6edc24270b9a8b5b1

diff --git a/ism/demos/isf_imcontrol_efl.cpp b/ism/demos/isf_imcontrol_efl.cpp
index 0dcf01166331d2350b5f093604760757c62ed5c7..0c1c7b029173c03c7781cd2fbee5b7b3e88f40fc 100644 (file)
--- a/ism/demos/isf_imcontrol_efl.cpp
+++ b/ism/demos/isf_imcontrol_efl.cpp
@@ -49,6 +49,7 @@ static void test_show_ise_selector (void *data, Evas_Object *obj, void *event_in
 static void test_show_ise_option (void *data, Evas_Object *obj, void *event_info);
 static void test_is_ime_enabled (void *data, Evas_Object *obj, void *event_info);
 static void test_get_recent_ise_geometry_get (void *data, Evas_Object *obj, void *event_info);
+static void test_input_panel_keyboard_mode_get (void *data, Evas_Object *obj, void *event_info);
 
 struct _menu_item {
     const char *name;
@@ -76,6 +77,7 @@ static struct _menu_item imcontrol_menu_its[] = {
     { "SHOW ISE OPTION", test_show_ise_option },
     { "IS IME ENABLED", test_is_ime_enabled },
     { "GET RECENT ISE GEOMETRY", test_get_recent_ise_geometry_get },
+    { "INPUT PANEL KEYBOARD MODE GET", test_input_panel_keyboard_mode_get },
 
     /* do not delete below */
     { NULL, NULL}
@@ -314,6 +316,16 @@ static void test_get_recent_ise_geometry_get (void *data, Evas_Object *obj, void
     }
 }
 
+static void test_input_panel_keyboard_mode_get (void *data, Evas_Object *obj, void *event_info)
+{
+    Ecore_IMF_Input_Panel_Keyboard_Mode mode;
+
+    if (imf_context != NULL) {
+        mode = ecore_imf_context_keyboard_mode_get (imf_context);
+        LOGD ("get keyboard mode : %d\n", (int)mode);
+    }
+}
+
 static char *gli_label_get (void *data, Evas_Object *obj, const char *part)
 {
     int j = (int)(reinterpret_cast<long>(data));

diff --git a/ism/extras/wayland_immodule/wayland_imcontext.c b/ism/extras/wayland_immodule/wayland_imcontext.c
index eb0b1e26f79d3ecf7eacea0788a2458d367475fe..ab351b00e388e2c3b7b3a2fcb92df1fe1eee4a7c 100644 (file)
--- a/ism/extras/wayland_immodule/wayland_imcontext.c
+++ b/ism/extras/wayland_immodule/wayland_imcontext.c
@@ -3189,6 +3189,12 @@ wayland_im_context_bidi_direction_set(Ecore_IMF_Context *ctx, Ecore_IMF_BiDi_Dir
 }
 //
 
+Ecore_IMF_Input_Panel_Keyboard_Mode
+wayland_im_context_input_panel_keyboard_mode_get(Ecore_IMF_Context *ctx EINA_UNUSED)
+{
+    return hw_keyboard_mode ? ECORE_IMF_INPUT_PANEL_HW_KEYBOARD_MODE : ECORE_IMF_INPUT_PANEL_SW_KEYBOARD_MODE;
+}
+
 WaylandIMContext *wayland_im_context_new (struct wl_text_input_manager *text_input_manager)
 {
     WaylandIMContext *context = calloc(1, sizeof(WaylandIMContext));

diff --git a/ism/extras/wayland_immodule/wayland_imcontext.h b/ism/extras/wayland_immodule/wayland_imcontext.h
index dec4fcc587e0cf56cb1370df5ebd476456d686b9..e0372f92f0c57fff125a1763bae76f43e8f37a7a 100644 (file)
--- a/ism/extras/wayland_immodule/wayland_imcontext.h
+++ b/ism/extras/wayland_immodule/wayland_imcontext.h
@@ -119,6 +119,9 @@ void
 wayland_im_context_bidi_direction_set(Ecore_IMF_Context *ctx, Ecore_IMF_BiDi_Direction bidi_direction);
 //
 
+Ecore_IMF_Input_Panel_Keyboard_Mode
+wayland_im_context_input_panel_keyboard_mode_get(Ecore_IMF_Context *ctx);
+
 WaylandIMContext *wayland_im_context_new        (struct wl_text_input_manager *text_input_manager);
 
 extern int _ecore_imf_wayland_log_dom;

diff --git a/ism/extras/wayland_immodule/wayland_module.c b/ism/extras/wayland_immodule/wayland_module.c
index 991d8ba4228fe2c020ab45e968027377c0656afb..7832b98ab49f670749efe84865826c836a9e6882 100644 (file)
--- a/ism/extras/wayland_immodule/wayland_module.c
+++ b/ism/extras/wayland_immodule/wayland_module.c
@@ -78,7 +78,8 @@ static Ecore_IMF_Context_Class wayland_imf_class =
     wayland_im_context_input_panel_language_locale_get, /* input_panel_language_locale_get */
     NULL,                                      /* candidate_window_geometry_get */
     wayland_im_context_input_hint_set,         /* input_hint_set */
-    wayland_im_context_bidi_direction_set      /* bidi_direction_set */
+    wayland_im_context_bidi_direction_set,     /* bidi_direction_set */
+    wayland_im_context_input_panel_keyboard_mode_get /* input_panel_keyboard_mode_get */
 };
 
 static struct wl_text_input_manager *text_input_manager = NULL;