[ecore_imf] support attribute of imengine

diff --git a/debian/changelog b/debian/changelog
index dca0c2e..e2f5bc8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ecore (1.0.0.001+svn.51480slp2+build20) unstable; urgency=low
+
+  * [ecore_imf] support the attribute of imengine
+  * Git: 165.213.180.234:/git/slp/pkgs/ecore
+  * Tag: ecore_1.0.0.001+svn.51480slp2+build20
+
+ -- Jihoon Kim <jihoon48.kim@samsung.com>  Mon, 22 Nov 2010 11:22:56 +0900
+
 ecore (1.0.0.001+svn.51480slp2+build19) unstable; urgency=low
 
   * libcurl-dev -> libcurl4-openssl-dev

diff --git a/src/lib/ecore_imf/Ecore_IMF.h b/src/lib/ecore_imf/Ecore_IMF.h
index 0e12932..b8f6f14 100644 (file)
--- a/src/lib/ecore_imf/Ecore_IMF.h
+++ b/src/lib/ecore_imf/Ecore_IMF.h
@@ -436,6 +436,23 @@ extern "C" {
         Ecore_IMF_Event_Key_Up key_up;
      };
 
+   typedef enum
+     {
+        ECORE_IMF_PREEDIT_TYPE_NONE = 0,
+        ECORE_IMF_PREEDIT_TYPE_SUB1 = 1,
+        ECORE_IMF_PREEDIT_TYPE_SUB2 = 2,
+        ECORE_IMF_PREEDIT_TYPE_SUB3 = 3
+     } Ecore_IMF_Preedit_Type;
+
+   typedef struct _Ecore_IMF_Preedit_Attr Ecore_IMF_Preedit_Attr;
+
+   struct _Ecore_IMF_Preedit_Attr
+     {
+        Ecore_IMF_Preedit_Type preedit_type;
+        unsigned int start_index;
+        unsigned int end_index; 
+     };
+
    struct _Ecore_IMF_Context_Class
      {
         void (*add)                 (Ecore_IMF_Context *ctx);
@@ -466,13 +483,13 @@ extern "C" {
         void (*input_panel_imdata_set)         (Ecore_IMF_Context *ctx, const char* data, int len);
         void (*input_panel_imdata_get)         (Ecore_IMF_Context *ctx, char* data, int *len);
 
-        void (*input_panel_use_effect_set)      (Ecore_IMF_Context *ctx, Eina_Bool use_effect);
-        void (*input_panel_orient_set)     (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Orient orientation);
+        void (*input_panel_use_effect_set)     (Ecore_IMF_Context *ctx, Eina_Bool use_effect);
+        void (*input_panel_orient_set)         (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Orient orientation);
 
         void (*input_panel_move) (Ecore_IMF_Context *ctx, int x, int y);
         void (*input_panel_geometry_get)       (Ecore_IMF_Context *ctx, int *x, int *y, int *w, int *h);
         void (*input_panel_private_key_set)    (Ecore_IMF_Context *ctx, int layout_index, int key_index, const char *img_path, const char* label, const char* value);
-        void (*input_panel_key_disabled_set)  (Ecore_IMF_Context *ctx, int layout_index, int key_index, Eina_Bool disabled);
+        void (*input_panel_key_disabled_set)   (Ecore_IMF_Context *ctx, int layout_index, int key_index, Eina_Bool disabled);
 
         void (*input_panel_reset)              (Ecore_IMF_Context *ctx); /* Same as reset to default property*/
         Ecore_IMF_Input_Panel_State (*input_panel_state_get)          (Ecore_IMF_Context *ctx);
@@ -488,7 +505,9 @@ extern "C" {
         int (*ise_set_active_ise_by_name) (Ecore_IMF_Context *ctx, const char* name); /**< will be deprecated */
         int (*ise_set_active_ise_by_uuid) (Ecore_IMF_Context *ctx, const char* uuid); /**< will be deprecated */
         int (*ise_get_iselist)            (Ecore_IMF_Context *ctx, char*** iselist);  /**< will be deprecated */
-        void (*input_panel_caps_mode_set)  (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Caps_Mode mode);
+        void (*input_panel_caps_mode_set) (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Caps_Mode mode);
+
+        void (*preedit_string_with_attributes_get) (Ecore_IMF_Context *ctx, char **str, Eina_List **attrs, int *cursor_pos);
      };
 
    struct _Ecore_IMF_Context_Info
@@ -521,6 +540,7 @@ extern "C" {
    EINA_DEPRECATED EAPI void          ecore_imf_context_show(Ecore_IMF_Context *ctx);
    EINA_DEPRECATED EAPI void          ecore_imf_context_hide(Ecore_IMF_Context *ctx);
    EAPI void                          ecore_imf_context_preedit_string_get(Ecore_IMF_Context *ctx, char **str, int *cursor_pos);
+   EAPI void                          ecore_imf_context_preedit_string_with_attributes_get(Ecore_IMF_Context *ctx, char **str, Eina_List **attrs, int *cursor_pos);
    EAPI void                          ecore_imf_context_focus_in(Ecore_IMF_Context *ctx);
    EAPI void                          ecore_imf_context_focus_out(Ecore_IMF_Context *ctx);
    EAPI void                          ecore_imf_context_reset(Ecore_IMF_Context *ctx);

diff --git a/src/lib/ecore_imf/ecore_imf_context.c b/src/lib/ecore_imf/ecore_imf_context.c
index 0044cef..b89c8f4 100644 (file)
--- a/src/lib/ecore_imf/ecore_imf_context.c
+++ b/src/lib/ecore_imf/ecore_imf_context.c
@@ -374,6 +374,25 @@ ecore_imf_context_preedit_string_get(Ecore_IMF_Context *ctx, char **str, int *cu
      }
 }
 
+EAPI void                          
+ecore_imf_context_preedit_string_with_attributes_get(Ecore_IMF_Context *ctx, char **str, Eina_List **attrs, int *cursor_pos)
+{
+   if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT))
+     {
+        ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT,
+                         "ecore_imf_context_preedit_string_with_attributes_get");
+        return;
+     }
+   if (ctx->klass->preedit_string_with_attributes_get)
+     ctx->klass->preedit_string_with_attributes_get(ctx, str, attrs, cursor_pos);
+   else
+     {
+        if (str) *str = strdup("");
+               if (attrs) *attrs = NULL;
+        if (cursor_pos) *cursor_pos = 0;
+     }
+}
+
 /**
  * Notify the Input Method Context that the widget to which its
  * correspond has gained focus.