From ae8a1c6bd6c3d7d5992d6031fb9d236fa28d265e Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 10 Jul 2015 11:14:53 +0900 Subject: [PATCH] ecore_imf/wayland: support IP and emoticon layout Change-Id: I1272be5ba4edae509d50efcaae86dc1fe43a75c7 --- src/modules/ecore_imf/wayland/text-client-protocol.h | 5 +++++ src/modules/ecore_imf/wayland/wayland_imcontext.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/modules/ecore_imf/wayland/text-client-protocol.h b/src/modules/ecore_imf/wayland/text-client-protocol.h index f6f42f6..3f6f360 100644 --- a/src/modules/ecore_imf/wayland/text-client-protocol.h +++ b/src/modules/ecore_imf/wayland/text-client-protocol.h @@ -107,6 +107,9 @@ enum wl_text_input_content_hint * @WL_TEXT_INPUT_CONTENT_PURPOSE_TIME: input a time * @WL_TEXT_INPUT_CONTENT_PURPOSE_DATETIME: input a date and time * @WL_TEXT_INPUT_CONTENT_PURPOSE_TERMINAL: input for a terminal + * @WL_TEXT_INPUT_CONTENT_PURPOSE_IP: input for a IP (number and a-f for + * Ipv6) + * @WL_TEXT_INPUT_CONTENT_PURPOSE_EMOTICON: input for an emoticon * * The content purpose allows to specify the primary purpose of a text * input. @@ -129,6 +132,8 @@ enum wl_text_input_content_purpose WL_TEXT_INPUT_CONTENT_PURPOSE_TIME = 10, WL_TEXT_INPUT_CONTENT_PURPOSE_DATETIME = 11, WL_TEXT_INPUT_CONTENT_PURPOSE_TERMINAL = 12, + WL_TEXT_INPUT_CONTENT_PURPOSE_IP = 13, + WL_TEXT_INPUT_CONTENT_PURPOSE_EMOTICON = 14, }; #endif /* WL_TEXT_INPUT_CONTENT_PURPOSE_ENUM */ diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c b/src/modules/ecore_imf/wayland/wayland_imcontext.c index eecd885..b6854ae 100644 --- a/src/modules/ecore_imf/wayland/wayland_imcontext.c +++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c @@ -990,7 +990,7 @@ wayland_im_context_input_panel_layout_set(Ecore_IMF_Context *ctx, Ecore_IMF_Inpu imcontext->content_purpose = WL_TEXT_INPUT_CONTENT_PURPOSE_PHONE; break; case ECORE_IMF_INPUT_PANEL_LAYOUT_IP: - imcontext->content_purpose = WL_TEXT_INPUT_CONTENT_PURPOSE_NUMBER; + imcontext->content_purpose = WL_TEXT_INPUT_CONTENT_PURPOSE_IP; break; case ECORE_IMF_INPUT_PANEL_LAYOUT_MONTH: imcontext->content_purpose = WL_TEXT_INPUT_CONTENT_PURPOSE_DATE; @@ -1007,6 +1007,9 @@ wayland_im_context_input_panel_layout_set(Ecore_IMF_Context *ctx, Ecore_IMF_Inpu case ECORE_IMF_INPUT_PANEL_LAYOUT_DATETIME: imcontext->content_purpose = WL_TEXT_INPUT_CONTENT_PURPOSE_DATETIME; break; + case ECORE_IMF_INPUT_PANEL_LAYOUT_EMOTICON: + imcontext->content_purpose = WL_TEXT_INPUT_CONTENT_PURPOSE_EMOTICON; + break; default: imcontext->content_purpose = WL_TEXT_INPUT_CONTENT_PURPOSE_NORMAL; break; -- 2.7.4