From: Mike McCormack Date: Thu, 7 Jul 2011 05:46:46 +0000 (+0900) Subject: Merge branch 'upstream' X-Git-Tag: 2.0_alpha~194 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54fd903008da36f20124a6d6d6881bca34807322;p=framework%2Fuifw%2Fecore.git Merge branch 'upstream' Conflicts: .gitignore ChangeLog Makefile.am configure.ac doc/Doxyfile.in ecore.spec.in src/Makefile.am src/lib/ecore/Ecore.h src/lib/ecore/Makefile.am src/lib/ecore/ecore.c src/lib/ecore/ecore_anim.c src/lib/ecore/ecore_app.c src/lib/ecore/ecore_events.c src/lib/ecore/ecore_glib.c src/lib/ecore/ecore_idle_enterer.c src/lib/ecore/ecore_idle_exiter.c src/lib/ecore/ecore_idler.c src/lib/ecore/ecore_job.c src/lib/ecore/ecore_main.c src/lib/ecore/ecore_pipe.c src/lib/ecore/ecore_poll.c src/lib/ecore/ecore_private.h src/lib/ecore/ecore_thread.c src/lib/ecore/ecore_timer.c src/lib/ecore_con/Ecore_Con.h src/lib/ecore_con/ecore_con.c src/lib/ecore_con/ecore_con_ares.c src/lib/ecore_con/ecore_con_local.c src/lib/ecore_con/ecore_con_local_win32.c src/lib/ecore_con/ecore_con_private.h src/lib/ecore_con/ecore_con_ssl.c src/lib/ecore_con/ecore_con_url.c src/lib/ecore_evas/Ecore_Evas.h src/lib/ecore_evas/Makefile.am src/lib/ecore_evas/ecore_evas.c src/lib/ecore_evas/ecore_evas_buffer.c src/lib/ecore_evas/ecore_evas_private.h src/lib/ecore_evas/ecore_evas_x.c src/lib/ecore_file/ecore_file_download.c src/lib/ecore_imf/Ecore_IMF.h src/lib/ecore_imf/Makefile.am src/lib/ecore_imf/ecore_imf_context.c src/lib/ecore_imf/ecore_imf_private.h src/lib/ecore_x/Ecore_X.h src/lib/ecore_x/Ecore_X_Atoms.h src/lib/ecore_x/ecore_x_atoms_decl.h src/lib/ecore_x/xlib/ecore_x_atoms.c src/lib/ecore_x/xlib/ecore_x_composite.c src/lib/ecore_x/xlib/ecore_x_dnd.c src/lib/ecore_x/xlib/ecore_x_e.c src/lib/ecore_x/xlib/ecore_x_selection.c src/lib/ecore_x/xlib/ecore_x_test.c src/lib/ecore_x/xlib/ecore_x_window.c src/lib/ecore_x/xlib/ecore_x_window_shape.c --- 54fd903008da36f20124a6d6d6881bca34807322 diff --cc .gitignore index eaf6b64,acd2dc5..85f0263 --- a/.gitignore +++ b/.gitignore @@@ -1,57 -1,34 +1,35 @@@ - Makefile - Makefile.in ++======= *.o *.lo + *.a *.la + .deps .libs + *~ *.gmo *.pc - debian/*.debhelper.log - debian/*.substvars - debian/*.debhelper - debian/libecore-bin/ - ABOUT-NLS - README - aclocal.m4 - config.cache - config.guess - config.guess.cdbs-orig - config.h - config.h.in - config.log - config.rpath - config.status - config.sub - config.sub.cdbs-orig - configure - debian/files - debian/libecore-con/ - debian/libecore-config/ - debian/libecore-data/ - debian/libecore-dbg/ - debian/libecore-dev/ - debian/libecore-doc/ - debian/libecore-evas/ - debian/libecore-fb/ - debian/libecore-file/ - debian/libecore-imf/ - debian/libecore-input/ - debian/libecore-ipc/ - debian/libecore-x/ - debian/libecore/ - debian/stamp-* - debian/tmp/ - depcomp + /configure + /config.status + Makefile + Makefile.in + /ABOUT-NLS + /README + /aclocal.m4 + autom4te.cache/ + /config.cache + /config.cache-env + /config.guess + /config.h + /config.h.in + /config.log + /config.rpath + /config.sub + /depcomp doc/ecore.dox - doc/html/ - doc/latex/ - doc/man/ - ecore-1.0.999.0-doc.tar.bz2 - ecore-1.0.999.0-doc.tar.bz2.cdbs-config_list - ecore.spec - install-sh - libtool - ltmain.sh + /ecore.spec + /install-sh + /libtool + /ltmain.sh m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 @@@ -88,6 -74,8 +75,34 @@@ po/en@boldquot.heade po/en@quot.header po/insert-header.sin po/quot.sed + po/remove-potcdate.sed po/remove-potcdate.sin po/stamp-po - stamp-h1 + /stamp-h1 + /doc/Doxyfile ++debian/*.debhelper.log ++debian/*.substvars ++debian/*.debhelper ++debian/libecore-bin/ ++config.guess.cdbs-orig ++config.sub.cdbs-orig ++debian/files ++debian/libecore-con/ ++debian/libecore-config/ ++debian/libecore-data/ ++debian/libecore-dbg/ ++debian/libecore-dev/ ++debian/libecore-doc/ ++debian/libecore-evas/ ++debian/libecore-fb/ ++debian/libecore-file/ ++debian/libecore-imf/ ++debian/libecore-input/ ++debian/libecore-ipc/ ++debian/libecore-x/ ++debian/libecore/ ++debian/stamp-* ++debian/tmp/ ++doc/html/ ++doc/latex/ ++doc/man/ diff --cc po/sl.po index cedd65f,cedd65f..7fe8cdc --- a/po/sl.po +++ b/po/sl.po @@@ -7,168 -7,168 +7,169 @@@ msgid "" msgstr "" "Project-Id-Version: ecore 1.0\n" --"Report-Msgid-Bugs-To: http://trac.enlightenment.org/e/\n" --"POT-Creation-Date: 2011-02-22 20:00-0800\n" ++"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" ++"POT-Creation-Date: 2011-07-07 15:07+0900\n" "PO-Revision-Date: 2011-02-24 16:54+0100\n" "Last-Translator: r1to \n" "Language-Team: Slovenian \n" ++"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --"Content-Transfer-Encoding: 8bit" ++"Content-Transfer-Encoding: 8bit\n" --#: ../src/lib/ecore/ecore_getopt.c:87 ++#: src/lib/ecore/ecore_getopt.c:87 msgid "Version:" msgstr "Različica" --#: ../src/lib/ecore/ecore_getopt.c:95 ++#: src/lib/ecore/ecore_getopt.c:95 msgid "Usage:" msgstr "Uporaba:" --#: ../src/lib/ecore/ecore_getopt.c:100 ++#: src/lib/ecore/ecore_getopt.c:100 #, c-format msgid "%s [options]\n" msgstr "%s·[možnosti]\n" --#: ../src/lib/ecore/ecore_getopt.c:248 ++#: src/lib/ecore/ecore_getopt.c:248 msgid "Copyright:" msgstr "Avtorstvo:" --#: ../src/lib/ecore/ecore_getopt.c:259 ++#: src/lib/ecore/ecore_getopt.c:259 msgid "License:" msgstr "Licenca:" --#: ../src/lib/ecore/ecore_getopt.c:411 ++#: src/lib/ecore/ecore_getopt.c:411 msgid "Type: " msgstr "Vrsta:·" --#: ../src/lib/ecore/ecore_getopt.c:478 ++#: src/lib/ecore/ecore_getopt.c:478 msgid "Default: " msgstr "Privzeto:·" --#: ../src/lib/ecore/ecore_getopt.c:501 ++#: src/lib/ecore/ecore_getopt.c:501 msgid "Choices: " msgstr "Izbire:·" --#: ../src/lib/ecore/ecore_getopt.c:598 ++#: src/lib/ecore/ecore_getopt.c:598 msgid "Options:\n" msgstr "Možnosti:\n" --#: ../src/lib/ecore/ecore_getopt.c:718 ++#: src/lib/ecore/ecore_getopt.c:718 #, c-format msgid "ERROR: unknown option --%s.\n" msgstr "NAPAKA:·Neznana možnost·--%s.\n" --#: ../src/lib/ecore/ecore_getopt.c:720 ++#: src/lib/ecore/ecore_getopt.c:720 #, c-format msgid "ERROR: unknown option -%c.\n" msgstr "NAPAKA:·neznana možnost·-%c.\n" --#: ../src/lib/ecore/ecore_getopt.c:776 ++#: src/lib/ecore/ecore_getopt.c:776 msgid "ERROR: " msgstr "NAPAKA:" --#: ../src/lib/ecore/ecore_getopt.c:853 ../src/lib/ecore/ecore_getopt.c:969 --#: ../src/lib/ecore/ecore_getopt.c:982 ../src/lib/ecore/ecore_getopt.c:994 --#: ../src/lib/ecore/ecore_getopt.c:1008 ../src/lib/ecore/ecore_getopt.c:1052 --#: ../src/lib/ecore/ecore_getopt.c:1160 ../src/lib/ecore/ecore_getopt.c:1196 ++#: src/lib/ecore/ecore_getopt.c:853 src/lib/ecore/ecore_getopt.c:969 ++#: src/lib/ecore/ecore_getopt.c:982 src/lib/ecore/ecore_getopt.c:994 ++#: src/lib/ecore/ecore_getopt.c:1008 src/lib/ecore/ecore_getopt.c:1052 ++#: src/lib/ecore/ecore_getopt.c:1160 src/lib/ecore/ecore_getopt.c:1196 msgid "value has no pointer set.\n" msgstr "vrednost nima nastavljenega kazalnika.\n" --#: ../src/lib/ecore/ecore_getopt.c:882 ../src/lib/ecore/ecore_getopt.c:1071 ++#: src/lib/ecore/ecore_getopt.c:882 src/lib/ecore/ecore_getopt.c:1071 #, c-format msgid "unknown boolean value %s.\n" msgstr "neznana Boolova vrednost·%s.\n" --#: ../src/lib/ecore/ecore_getopt.c:926 ../src/lib/ecore/ecore_getopt.c:1151 ++#: src/lib/ecore/ecore_getopt.c:926 src/lib/ecore/ecore_getopt.c:1151 #, c-format msgid "invalid number format %s\n" msgstr "napačen·format števila·%s\n" --#: ../src/lib/ecore/ecore_getopt.c:1021 ++#: src/lib/ecore/ecore_getopt.c:1021 #, c-format msgid "invalid choice \"%s\". Valid values are: " msgstr "napačna izbira·\"%s\".·Pravilne izbire so:·" --#: ../src/lib/ecore/ecore_getopt.c:1046 ++#: src/lib/ecore/ecore_getopt.c:1046 msgid "missing parameter to append.\n" msgstr "manjka·parameter·za dodajo.\n" --#: ../src/lib/ecore/ecore_getopt.c:1141 ++#: src/lib/ecore/ecore_getopt.c:1141 msgid "could not parse value.\n" msgstr "vrednosti ni bilo možno razčleniti.\n" --#: ../src/lib/ecore/ecore_getopt.c:1190 ++#: src/lib/ecore/ecore_getopt.c:1190 msgid "missing parameter.\n" msgstr "manjkajoči·parameter.\n" --#: ../src/lib/ecore/ecore_getopt.c:1203 ++#: src/lib/ecore/ecore_getopt.c:1203 msgid "missing callback function!\n" msgstr "manjkajoča povratno-zasilna funkcija !\n" --#: ../src/lib/ecore/ecore_getopt.c:1226 ++#: src/lib/ecore/ecore_getopt.c:1226 msgid "no version was defined.\n" msgstr "definirana ni bila nobena različica.\n" --#: ../src/lib/ecore/ecore_getopt.c:1240 ++#: src/lib/ecore/ecore_getopt.c:1240 msgid "no copyright was defined.\n" msgstr "definirano ni bilo nobeno avtorstvo.\n" --#: ../src/lib/ecore/ecore_getopt.c:1254 ++#: src/lib/ecore/ecore_getopt.c:1254 msgid "no license was defined.\n" msgstr "definirana ni bila nobena licenca.\n" --#: ../src/lib/ecore/ecore_getopt.c:1308 ++#: src/lib/ecore/ecore_getopt.c:1308 #, c-format msgid "ERROR: unknown option --%s, ignored.\n" msgstr "NAPAKA:·neznana možnost·--%s,·prezrto.\n" --#: ../src/lib/ecore/ecore_getopt.c:1341 ++#: src/lib/ecore/ecore_getopt.c:1341 #, c-format msgid "ERROR: option --%s requires an argument!\n" msgstr "NAPAKA:·možnost·--%s·zahteva argument!\n" --#: ../src/lib/ecore/ecore_getopt.c:1377 ++#: src/lib/ecore/ecore_getopt.c:1377 #, c-format msgid "ERROR: unknown option -%c, ignored.\n" msgstr "NAPAKA:·neznana možnost·-%c,·prezrto.\n" --#: ../src/lib/ecore/ecore_getopt.c:1415 ++#: src/lib/ecore/ecore_getopt.c:1415 #, c-format msgid "ERROR: option -%c requires an argument!\n" msgstr "NAPAKA:·možnost·-%c zahteva argument!\n" --#: ../src/lib/ecore/ecore_getopt.c:1614 ++#: src/lib/ecore/ecore_getopt.c:1614 msgid "ERROR: no parser provided.\n" msgstr "NAPAKA:·ni podan razčlenjevalnik.\n" --#: ../src/lib/ecore/ecore_getopt.c:1619 ++#: src/lib/ecore/ecore_getopt.c:1619 msgid "ERROR: no values provided.\n" msgstr "NAPAKA::·ni podanih vrednosti.\n" --#: ../src/lib/ecore/ecore_getopt.c:1628 ++#: src/lib/ecore/ecore_getopt.c:1628 msgid "ERROR: no arguments provided.\n" msgstr "NAPAKA::·ni podanih argumentov.\n" --#: ../src/lib/ecore/ecore_getopt.c:1654 ++#: src/lib/ecore/ecore_getopt.c:1654 msgid "ERROR: invalid options found." msgstr "NAPAKA::·najdene nepravilne možnosti" --#: ../src/lib/ecore/ecore_getopt.c:1660 ++#: src/lib/ecore/ecore_getopt.c:1660 #, c-format msgid " See --%s.\n" msgstr "·Glej·--%s.\n" --#: ../src/lib/ecore/ecore_getopt.c:1662 ++#: src/lib/ecore/ecore_getopt.c:1662 #, c-format msgid " See -%c.\n" msgstr "·Glej·-%c.\n" --#: ../src/lib/ecore/ecore_getopt.c:1699 ++#: src/lib/ecore/ecore_getopt.c:1699 #, c-format msgid "ERROR: incorrect geometry value '%s'\n" msgstr "NAPAKA::·nepravilna geometrijska vrednost·'%s'\n" --#: ../src/lib/ecore/ecore_getopt.c:1722 ++#: src/lib/ecore/ecore_getopt.c:1722 #, c-format msgid "ERROR: incorrect size value '%s'\n" msgstr "NAPAKA::·nepravilna vrednost velikosti·'%s'\n" diff --cc src/lib/ecore_evas/ecore_evas_private.h index e8ddc5e,2ab7b03..c7727d0 mode 100755,100644..100755 --- a/src/lib/ecore_evas/ecore_evas_private.h +++ b/src/lib/ecore_evas/ecore_evas_private.h diff --cc src/lib/ecore_evas/ecore_evas_x.c index 2c039ff,7961533..77b942a mode 100755,100644..100755 --- a/src/lib/ecore_evas/ecore_evas_x.c +++ b/src/lib/ecore_evas/ecore_evas_x.c diff --cc src/lib/ecore_imf/Ecore_IMF.h index 50c608f,7afee2c..406423e --- a/src/lib/ecore_imf/Ecore_IMF.h +++ b/src/lib/ecore_imf/Ecore_IMF.h @@@ -47,89 -33,6 +47,83 @@@ extern "C" { #endif +/* ecore_imf_context_input_panel_event_callback_add() flag */ +typedef enum +{ + ECORE_IMF_INPUT_PANEL_STATE_EVENT, /**< Input Panel STATE Event */ + ECORE_IMF_INPUT_PANEL_MODE_EVENT, /**< Input Panel MODE Event */ + ECORE_IMF_INPUT_PANEL_LANGUAGE_EVENT, /**< Input Panel LANGUAGE Event */ + ECORE_IMF_INPUT_PANEL_SHIFT_MODE_EVENT, /**< Input Panel SHIFT MODE */ + ECORE_IMF_INPUT_PANEL_PREEDIT_MODE_EVENT, /**< Input Panel PREEDIT MODE */ + ECORE_IMF_INPUT_PANEL_COMPLETION_MODE_EVENT, /**< Input Panel COMPLETION MODE */ + ECORE_IMF_INPUT_PANEL_CUSTOM_INPUT_MODE_EVENT, /**< Input Panel CUSTOM INPUT MODE */ + + ECORE_IMF_INPUT_PANEL_PRIVATE_CONTEXT_01, /**< Input Panel PRIVATE CONTEXT */ + ECORE_IMF_INPUT_PANEL_PRIVATE_CONTEXT_02, /**< Input Panel PRIVATE CONTEXT */ + ECORE_IMF_INPUT_PANEL_PRIVATE_CONTEXT_03, /**< Input Panel PRIVATE CONTEXT */ + ECORE_IMF_INPUT_PANEL_PRIVATE_CONTEXT_04, /**< Input Panel PRIVATE CONTEXT */ + ECORE_IMF_INPUT_PANEL_PRIVATE_CONTEXT_05, /**< Input Panel PRIVATE CONTEXT */ + ECORE_IMF_INPUT_PANEL_PRIVATE_CONTEXT_06, /**< Input Panel PRIVATE CONTEXT */ + ECORE_IMF_INPUT_PANEL_PRIVATE_CONTEXT_07, /**< Input Panel PRIVATE CONTEXT */ + ECORE_IMF_INPUT_PANEL_PRIVATE_CONTEXT_08, /**< Input Panel PRIVATE CONTEXT */ + ECORE_IMF_INPUT_PANEL_PRIVATE_CONTEXT_09, /**< Input Panel PRIVATE CONTEXT */ + ECORE_IMF_INPUT_PANEL_PRIVATE_CONTEXT_10, /**< Input Panel PRIVATE CONTEXT */ + ECORE_IMF_INPUT_PANEL_EVENT_INVALID +} Ecore_IMF_Input_Panel_Event; + +typedef enum +{ + ECORE_IMF_INPUT_PANEL_STATE_SHOW, /**< Show Input panel */ + ECORE_IMF_INPUT_PANEL_STATE_HIDE, /**< Hide Input panel */ + ECORE_IMF_INPUT_PANEL_STATE_INVALID +} Ecore_IMF_Input_Panel_State; + +typedef enum +{ - ECORE_IMF_INPUT_PANEL_LANG_AUTOMATIC, /**< Automatic */ - ECORE_IMF_INPUT_PANEL_LANG_ALPHABET /**< Alphabet */ - } Ecore_IMF_Input_Panel_Lang; - - typedef enum - { + ECORE_IMF_KEYBOARD_LANG_NATIVE, /**< Native */ + ECORE_IMF_KEYBOARD_LANG_ALPHABET /**< Alphabet */ +} Ecore_IMF_Keyboard_Lang; + +typedef enum +{ + ECORE_IMF_AUTOCORRECTION_DEFAULT, + ECORE_IMF_AUTOCORRECTION_NO, + ECORE_IMF_AUTOCORRECTION_YES, + ECORE_IMF_AUTOCORRECTION_INVALID +} Ecore_IMF_Autocorrection; + +typedef enum +{ + ECORE_IMF_INPUT_PANEL_CAPS_MODE_OFF, /**< Off */ + ECORE_IMF_INPUT_PANEL_CAPS_MODE_ON, /**< On */ + ECORE_IMF_INPUT_PANEL_CAPS_MODE_LOCK, /**< Lock */ +} Ecore_IMF_Input_Panel_Caps_Mode; + +typedef enum +{ + ECORE_IMF_INPUT_PANEL_ORIENT_NONE, + ECORE_IMF_INPUT_PANEL_ORIENT_90_CW, /* Clockwise */ + ECORE_IMF_INPUT_PANEL_ORIENT_180, + ECORE_IMF_INPUT_PANEL_ORIENT_90_CCW /* CounterClockwise */ +} Ecore_IMF_Input_Panel_Orient; + +typedef struct +{ + int layout_idx; + int key_idx; + Eina_Bool disabled; +} Disable_Key_Item; + +typedef struct +{ + int layout_idx; + int key_idx; + int type; + char data[128]; // label or image path + int key_value; + char key_string[32]; +} Private_Key_Item; + /* Events sent by the Input Method */ typedef struct _Ecore_IMF_Event_Preedit_Start Ecore_IMF_Event_Preedit_Start; typedef struct _Ecore_IMF_Event_Preedit_End Ecore_IMF_Event_Preedit_End; @@@ -412,47 -321,15 +412,42 @@@ struct _Ecore_IMF_Context_Clas void (*use_preedit_set) (Ecore_IMF_Context *ctx, Eina_Bool use_preedit); void (*input_mode_set) (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Mode input_mode); Eina_Bool (*filter_event) (Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type, Ecore_IMF_Event *event); - - /* Input Panel Control APIs */ + void (*preedit_string_with_attributes_get) (Ecore_IMF_Context *ctx, char **str, Eina_List **attrs, int *cursor_pos); + void (*prediction_allow_set)(Ecore_IMF_Context *ctx, Eina_Bool prediction); + void (*autocapital_type_set)(Ecore_IMF_Context *ctx, Ecore_IMF_Autocapital_Type autocapital_type); void (*control_panel_show) (Ecore_IMF_Context *ctx); void (*control_panel_hide) (Ecore_IMF_Context *ctx); - - void (*input_panel_layout_set) (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Layout layout); + void (*input_panel_layout_set) (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Layout layout); Ecore_IMF_Input_Panel_Layout (*input_panel_layout_get) (Ecore_IMF_Context *ctx); - - void (*input_panel_language_set) (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Lang lang); + void (*input_panel_language_set) (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Lang lang); Ecore_IMF_Input_Panel_Lang (*input_panel_language_get) (Ecore_IMF_Context *ctx); + + 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_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_reset) (Ecore_IMF_Context *ctx); /* Same as reset to default property*/ + Ecore_IMF_Input_Panel_State (*input_panel_state_get) (Ecore_IMF_Context *ctx); + + /* CallBack APIs */ + void (*input_panel_event_callback_add) (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Event type, void (*pEventCallBackFunc) (void *data, Ecore_IMF_Context *ctx, int value), void *data); + void (*input_panel_event_callback_del) (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Event type, void (*pEventCallbackFunc) (void *data, Ecore_IMF_Context *ctx, int value)); + + /* ISF related APIs */ + int (*ise_get_ise_language) (Ecore_IMF_Context *ctx, const char* input_panel_name, char*** langlist); + int (*ise_set_isf_language) (Ecore_IMF_Context *ctx, const char* lang); + int (*ise_get_active_isename) (Ecore_IMF_Context *ctx, char* name); /**< will be deprecated */ + 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 (*preedit_string_with_attributes_get) (Ecore_IMF_Context *ctx, char **str, Eina_List **attrs, int *cursor_pos); - void (*prediction_allow_set)(Ecore_IMF_Context *ctx, Eina_Bool prediction); - void (*autocapital_type_set)(Ecore_IMF_Context *ctx, Ecore_IMF_Autocapital_Type autocapital_type); }; struct _Ecore_IMF_Context_Info diff --cc src/lib/ecore_imf/ecore_imf_private.h index 2dc5cf7,07a5b09..d17f3ca --- a/src/lib/ecore_imf/ecore_imf_private.h +++ b/src/lib/ecore_imf/ecore_imf_private.h @@@ -53,12 -50,8 +53,12 @@@ struct _Ecore_IMF_Contex Ecore_IMF_Autocapital_Type autocapital_type; Ecore_IMF_Input_Panel_Layout input_panel_layout; Ecore_IMF_Input_Panel_Lang input_panel_lang; + Eina_Bool allow_prediction : 1; + Eina_Bool input_panel_enabled : 1; + Eina_List *callbacks; + Eina_List *disabled_key_list; + Eina_List *private_key_list; - Eina_Bool allow_prediction : 1; - Eina_Bool input_panel_enabled : 1; + Eina_Bool use_effect : 1; }; struct _Ecore_IMF_Module diff --cc src/lib/ecore_x/Ecore_X.h index 777041f,206691f..d67f93c mode 100755,100644..100755 --- a/src/lib/ecore_x/Ecore_X.h +++ b/src/lib/ecore_x/Ecore_X.h diff --cc src/lib/ecore_x/xlib/ecore_x_window_shape.c index a8decf3,6bbc864..6bbc864 mode 100755,100644..100755 --- a/src/lib/ecore_x/xlib/ecore_x_window_shape.c +++ b/src/lib/ecore_x/xlib/ecore_x_window_shape.c