Support all preedit styles

Change-Id: I4b78a25d0f529fad5b2968694ced5b3c29c272ef

diff --git a/ism/extras/wayland_immodule/wayland_imcontext.c b/ism/extras/wayland_immodule/wayland_imcontext.c
index faecbbf..0545918 100644 (file)
--- a/ism/extras/wayland_immodule/wayland_imcontext.c
+++ b/ism/extras/wayland_immodule/wayland_imcontext.c
@@ -1982,17 +1982,23 @@ text_input_preedit_styling(void                 *data,
         case WL_TEXT_INPUT_PREEDIT_STYLE_UNDERLINE:
             attr->preedit_type = ECORE_IMF_PREEDIT_TYPE_SUB1;
             break;
-        case WL_TEXT_INPUT_PREEDIT_STYLE_INCORRECT:
+        case WL_TEXT_INPUT_PREEDIT_STYLE_REVERSE:
+            attr->preedit_type = ECORE_IMF_PREEDIT_TYPE_SUB2;
             break;
         case WL_TEXT_INPUT_PREEDIT_STYLE_HIGHLIGHT:
             attr->preedit_type = ECORE_IMF_PREEDIT_TYPE_SUB3;
             break;
-        case WL_TEXT_INPUT_PREEDIT_STYLE_ACTIVE:
+        case WL_TEXT_INPUT_PREEDIT_STYLE_BGCOLOR1:
+            attr->preedit_type = ECORE_IMF_PREEDIT_TYPE_SUB4;
             break;
-        case WL_TEXT_INPUT_PREEDIT_STYLE_INACTIVE:
+        case WL_TEXT_INPUT_PREEDIT_STYLE_BGCOLOR2:
+            attr->preedit_type = ECORE_IMF_PREEDIT_TYPE_SUB5;
             break;
-        case WL_TEXT_INPUT_PREEDIT_STYLE_SELECTION:
-            attr->preedit_type = ECORE_IMF_PREEDIT_TYPE_SUB2;
+        case WL_TEXT_INPUT_PREEDIT_STYLE_BGCOLOR3:
+            attr->preedit_type = ECORE_IMF_PREEDIT_TYPE_SUB6;
+            break;
+        case WL_TEXT_INPUT_PREEDIT_STYLE_BGCOLOR4:
+            attr->preedit_type = ECORE_IMF_PREEDIT_TYPE_SUB7;
             break;
         default:
             attr->preedit_type = ECORE_IMF_PREEDIT_TYPE_SUB1;

diff --git a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
index e459a06..829e63c 100644 (file)
--- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
+++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
@@ -1891,15 +1891,23 @@ wsc_send_preedit_style (WSCContextISF* wsc_ctx)
                                         preedit_style = WL_TEXT_INPUT_PREEDIT_STYLE_UNDERLINE;
                                         break;
                                     case SCIM_ATTR_DECORATE_REVERSE:
-                                        preedit_style = WL_TEXT_INPUT_PREEDIT_STYLE_SELECTION;
+                                        preedit_style = WL_TEXT_INPUT_PREEDIT_STYLE_REVERSE;
                                         break;
                                     case SCIM_ATTR_DECORATE_HIGHLIGHT:
                                         preedit_style = WL_TEXT_INPUT_PREEDIT_STYLE_HIGHLIGHT;
                                         break;
                                     case SCIM_ATTR_DECORATE_BGCOLOR1:
+                                        preedit_style = WL_TEXT_INPUT_PREEDIT_STYLE_BGCOLOR1;
+                                        break;
                                     case SCIM_ATTR_DECORATE_BGCOLOR2:
+                                        preedit_style = WL_TEXT_INPUT_PREEDIT_STYLE_BGCOLOR2;
+                                        break;
                                     case SCIM_ATTR_DECORATE_BGCOLOR3:
+                                        preedit_style = WL_TEXT_INPUT_PREEDIT_STYLE_BGCOLOR3;
+                                        break;
                                     case SCIM_ATTR_DECORATE_BGCOLOR4:
+                                        preedit_style = WL_TEXT_INPUT_PREEDIT_STYLE_BGCOLOR4;
+                                        break;
                                     default:
                                         preedit_style = WL_TEXT_INPUT_PREEDIT_STYLE_DEFAULT;
                                         break;