summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJihoon Kim <jihoon48.kim@samsung.com>2019-07-10 20:01:47 +0900
committerJihoon Kim <jihoon48.kim@samsung.com>2019-07-10 20:03:14 +0900
commitdaa35a1893e9bfb2013d853a9a978b61c761bc23 (patch)
treec11811fba68e8bdce33970f2ec974e2205663366
parent4fe9edaa2647a8f2a5f6a46b7ad3c50a80e5271d (diff)
ecore_imf: deprecate ambigous or unused APIs
ecore_imf_context_show ecore_imf_context_hide ecore_imf_context_control_panel_show ecore_imf_context_control_panel_hide ecore_imf_context_preedit_start_event_add ecore_imf_context_preedit_end_event_add ecore_imf_context_preedit_changed_event_add ecore_imf_context_commit_event_add ecore_imf_context_delete_surrounding_event_add Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
-rw-r--r--src/lib/ecore_imf/Ecore_IMF.h32
-rw-r--r--src/modules/ecore_imf/ibus/ibus_imcontext.c12
-rw-r--r--src/modules/ecore_imf/scim/scim_imcontext.cpp17
-rw-r--r--src/modules/ecore_imf/xim/ecore_imf_xim.c21
4 files changed, 26 insertions, 56 deletions
diff --git a/src/lib/ecore_imf/Ecore_IMF.h b/src/lib/ecore_imf/Ecore_IMF.h
index d733251..dc6065f 100644
--- a/src/lib/ecore_imf/Ecore_IMF.h
+++ b/src/lib/ecore_imf/Ecore_IMF.h
@@ -1035,16 +1035,20 @@ EAPI void *ecore_imf_context_client_canvas_get(Ecore_IMF
1035 * @brief Asks the Input Method Context to show itself. 1035 * @brief Asks the Input Method Context to show itself.
1036 * 1036 *
1037 * @param ctx An #Ecore_IMF_Context. 1037 * @param ctx An #Ecore_IMF_Context.
1038 *
1039 * @deprecated use ecore_imf_context_input_panel_show() instead.
1038 */ 1040 */
1039EAPI void ecore_imf_context_show(Ecore_IMF_Context *ctx); 1041EINA_DEPRECATED EAPI void ecore_imf_context_show(Ecore_IMF_Context *ctx);
1040 1042
1041/** 1043/**
1042 * @ingroup Ecore_IMF_Context_Group 1044 * @ingroup Ecore_IMF_Context_Group
1043 * @brief Asks the Input Method Context to hide itself. 1045 * @brief Asks the Input Method Context to hide itself.
1044 * 1046 *
1045 * @param ctx An #Ecore_IMF_Context. 1047 * @param ctx An #Ecore_IMF_Context.
1048 *
1049 * @deprecated use ecore_imf_context_input_panel_hide() instead.
1046 */ 1050 */
1047EAPI void ecore_imf_context_hide(Ecore_IMF_Context *ctx); 1051EINA_DEPRECATED EAPI void ecore_imf_context_hide(Ecore_IMF_Context *ctx);
1048 1052
1049/** 1053/**
1050 * @ingroup Ecore_IMF_Context_Group 1054 * @ingroup Ecore_IMF_Context_Group
@@ -1426,8 +1430,10 @@ EAPI Eina_Bool ecore_imf_context_selection_get(Ecore_IMF_Con
1426 * ecore_imf_context_event_callback_call() can be used as synchronous method. 1430 * ecore_imf_context_event_callback_call() can be used as synchronous method.
1427 * 1431 *
1428 * @param ctx An #Ecore_IMF_Context. 1432 * @param ctx An #Ecore_IMF_Context.
1433 *
1434 * @deprecated use ecore_imf_context_event_callback_call() instead.
1429 */ 1435 */
1430EAPI void ecore_imf_context_preedit_start_event_add(Ecore_IMF_Context *ctx); 1436EINA_DEPRECATED EAPI void ecore_imf_context_preedit_start_event_add(Ecore_IMF_Context *ctx);
1431 1437
1432/** 1438/**
1433 * @ingroup Ecore_IMF_Context_Module_Group 1439 * @ingroup Ecore_IMF_Context_Module_Group
@@ -1438,8 +1444,10 @@ EAPI void ecore_imf_context_preedit_start_event_add(Eco
1438 * ecore_imf_context_event_callback_call() can be used as synchronous method. 1444 * ecore_imf_context_event_callback_call() can be used as synchronous method.
1439 * 1445 *
1440 * @param ctx An #Ecore_IMF_Context. 1446 * @param ctx An #Ecore_IMF_Context.
1447 *
1448 * @deprecated use ecore_imf_context_event_callback_call() instead.
1441 */ 1449 */
1442EAPI void ecore_imf_context_preedit_end_event_add(Ecore_IMF_Context *ctx); 1450EINA_DEPRECATED EAPI void ecore_imf_context_preedit_end_event_add(Ecore_IMF_Context *ctx);
1443 1451
1444/** 1452/**
1445 * @ingroup Ecore_IMF_Context_Module_Group 1453 * @ingroup Ecore_IMF_Context_Module_Group
@@ -1449,8 +1457,10 @@ EAPI void ecore_imf_context_preedit_end_event_add(Ecore
1449 * ecore_imf_context_event_callback_call() can be used as synchronous method. 1457 * ecore_imf_context_event_callback_call() can be used as synchronous method.
1450 * 1458 *
1451 * @param ctx An #Ecore_IMF_Context. 1459 * @param ctx An #Ecore_IMF_Context.
1460 *
1461 * @deprecated use ecore_imf_context_event_callback_call() instead.
1452 */ 1462 */
1453EAPI void ecore_imf_context_preedit_changed_event_add(Ecore_IMF_Context *ctx); 1463EINA_DEPRECATED EAPI void ecore_imf_context_preedit_changed_event_add(Ecore_IMF_Context *ctx);
1454 1464
1455/** 1465/**
1456 * @ingroup Ecore_IMF_Context_Module_Group 1466 * @ingroup Ecore_IMF_Context_Module_Group
@@ -1461,8 +1471,10 @@ EAPI void ecore_imf_context_preedit_changed_event_add(E
1461 * 1471 *
1462 * @param ctx An #Ecore_IMF_Context. 1472 * @param ctx An #Ecore_IMF_Context.
1463 * @param str The committed string. 1473 * @param str The committed string.
1474 *
1475 * @deprecated use ecore_imf_context_event_callback_call() instead.
1464 */ 1476 */
1465EAPI void ecore_imf_context_commit_event_add(Ecore_IMF_Context *ctx, const char *str); 1477EINA_DEPRECATED EAPI void ecore_imf_context_commit_event_add(Ecore_IMF_Context *ctx, const char *str);
1466 1478
1467/** 1479/**
1468 * @ingroup Ecore_IMF_Context_Module_Group 1480 * @ingroup Ecore_IMF_Context_Module_Group
@@ -1478,8 +1490,10 @@ EAPI void ecore_imf_context_commit_event_add(Ecore_IMF_
1478 * @param ctx An #Ecore_IMF_Context. 1490 * @param ctx An #Ecore_IMF_Context.
1479 * @param offset The start offset of surrounding to be deleted. 1491 * @param offset The start offset of surrounding to be deleted.
1480 * @param n_chars The number of characters to be deleted. 1492 * @param n_chars The number of characters to be deleted.
1493 *
1494 * @deprecated use ecore_imf_context_event_callback_call() instead.
1481 */ 1495 */
1482EAPI void ecore_imf_context_delete_surrounding_event_add(Ecore_IMF_Context *ctx, int offset, int n_chars); 1496EINA_DEPRECATED EAPI void ecore_imf_context_delete_surrounding_event_add(Ecore_IMF_Context *ctx, int offset, int n_chars);
1483 1497
1484/** 1498/**
1485 * @ingroup Ecore_IMF_Context_Group 1499 * @ingroup Ecore_IMF_Context_Group
@@ -1653,7 +1667,7 @@ EAPI Ecore_IMF_Input_Hints ecore_imf_context_input_hint_get(Ecore_IMF_Co
1653 * @param ctx An #Ecore_IMF_Context. 1667 * @param ctx An #Ecore_IMF_Context.
1654 * @since 1.1.0 1668 * @since 1.1.0
1655 */ 1669 */
1656EAPI void ecore_imf_context_control_panel_show(Ecore_IMF_Context *ctx); 1670EINA_DEPRECATED EAPI void ecore_imf_context_control_panel_show(Ecore_IMF_Context *ctx);
1657 1671
1658/** 1672/**
1659 * @ingroup Ecore_IMF_Context_Group 1673 * @ingroup Ecore_IMF_Context_Group
@@ -1662,7 +1676,7 @@ EAPI void ecore_imf_context_control_panel_show(Ecore_IM
1662 * @param ctx An #Ecore_IMF_Context. 1676 * @param ctx An #Ecore_IMF_Context.
1663 * @since 1.1.0 1677 * @since 1.1.0
1664 */ 1678 */
1665EAPI void ecore_imf_context_control_panel_hide(Ecore_IMF_Context *ctx); 1679EINA_DEPRECATED EAPI void ecore_imf_context_control_panel_hide(Ecore_IMF_Context *ctx);
1666 1680
1667/** 1681/**
1668 * @ingroup Ecore_IMF_Context_Group 1682 * @ingroup Ecore_IMF_Context_Group
diff --git a/src/modules/ecore_imf/ibus/ibus_imcontext.c b/src/modules/ecore_imf/ibus/ibus_imcontext.c
index 4521e52..56815a8 100644
--- a/src/modules/ecore_imf/ibus/ibus_imcontext.c
+++ b/src/modules/ecore_imf/ibus/ibus_imcontext.c
@@ -729,7 +729,6 @@ _ecore_imf_context_ibus_commit_text_cb(IBusInputContext *ibuscontext EINA_UNUSED
729 729
730 if (ibusimcontext->ctx) 730 if (ibusimcontext->ctx)
731 { 731 {
732 ecore_imf_context_commit_event_add(ibusimcontext->ctx, text->text);
733 ecore_imf_context_event_callback_call(ibusimcontext->ctx, 732 ecore_imf_context_event_callback_call(ibusimcontext->ctx,
734 ECORE_IMF_CALLBACK_COMMIT, 733 ECORE_IMF_CALLBACK_COMMIT,
735 (void *)commit_str); 734 (void *)commit_str);
@@ -803,7 +802,6 @@ _ecore_imf_context_ibus_delete_surrounding_text_cb(IBusInputContext *ibuscontext
803 ev.ctx = _focus_im_context; 802 ev.ctx = _focus_im_context;
804 ev.n_chars = nchars; 803 ev.n_chars = nchars;
805 ev.offset = offset_from_cursor; 804 ev.offset = offset_from_cursor;
806 ecore_imf_context_delete_surrounding_event_add(_focus_im_context, offset_from_cursor, nchars);
807 ecore_imf_context_event_callback_call(_focus_im_context, 805 ecore_imf_context_event_callback_call(_focus_im_context,
808 ECORE_IMF_CALLBACK_DELETE_SURROUNDING, 806 ECORE_IMF_CALLBACK_DELETE_SURROUNDING,
809 &ev); 807 &ev);
@@ -928,13 +926,11 @@ _ecore_imf_context_ibus_update_preedit_text_cb(IBusInputContext *ibuscontext EI
928 { 926 {
929 if (flag) 927 if (flag)
930 { 928 {
931 ecore_imf_context_preedit_start_event_add(ibusimcontext->ctx);
932 ecore_imf_context_event_callback_call(ibusimcontext->ctx, 929 ecore_imf_context_event_callback_call(ibusimcontext->ctx,
933 ECORE_IMF_CALLBACK_PREEDIT_START, 930 ECORE_IMF_CALLBACK_PREEDIT_START,
934 NULL); 931 NULL);
935 } 932 }
936 933
937 ecore_imf_context_preedit_changed_event_add(ibusimcontext->ctx);
938 ecore_imf_context_event_callback_call(ibusimcontext->ctx, 934 ecore_imf_context_event_callback_call(ibusimcontext->ctx,
939 ECORE_IMF_CALLBACK_PREEDIT_CHANGED, 935 ECORE_IMF_CALLBACK_PREEDIT_CHANGED,
940 NULL); 936 NULL);
@@ -943,13 +939,11 @@ _ecore_imf_context_ibus_update_preedit_text_cb(IBusInputContext *ibuscontext EI
943 { 939 {
944 if (flag) 940 if (flag)
945 { 941 {
946 ecore_imf_context_preedit_changed_event_add(ibusimcontext->ctx);
947 ecore_imf_context_event_callback_call(ibusimcontext->ctx, 942 ecore_imf_context_event_callback_call(ibusimcontext->ctx,
948 ECORE_IMF_CALLBACK_PREEDIT_CHANGED, 943 ECORE_IMF_CALLBACK_PREEDIT_CHANGED,
949 NULL); 944 NULL);
950 } 945 }
951 946
952 ecore_imf_context_preedit_end_event_add(ibusimcontext->ctx);
953 ecore_imf_context_event_callback_call(ibusimcontext->ctx, 947 ecore_imf_context_event_callback_call(ibusimcontext->ctx,
954 ECORE_IMF_CALLBACK_PREEDIT_END, 948 ECORE_IMF_CALLBACK_PREEDIT_END,
955 NULL); 949 NULL);
@@ -969,13 +963,11 @@ _ecore_imf_context_ibus_show_preedit_text_cb(IBusInputContext *ibuscontext EINA_
969 ibusimcontext->preedit_visible = EINA_TRUE; 963 ibusimcontext->preedit_visible = EINA_TRUE;
970 964
971 // call preedit start 965 // call preedit start
972 ecore_imf_context_preedit_start_event_add(ibusimcontext->ctx);
973 ecore_imf_context_event_callback_call(ibusimcontext->ctx, 966 ecore_imf_context_event_callback_call(ibusimcontext->ctx,
974 ECORE_IMF_CALLBACK_PREEDIT_START, 967 ECORE_IMF_CALLBACK_PREEDIT_START,
975 NULL); 968 NULL);
976 969
977 // call preedit changed 970 // call preedit changed
978 ecore_imf_context_preedit_changed_event_add(ibusimcontext->ctx);
979 ecore_imf_context_event_callback_call(ibusimcontext->ctx, 971 ecore_imf_context_event_callback_call(ibusimcontext->ctx,
980 ECORE_IMF_CALLBACK_PREEDIT_CHANGED, 972 ECORE_IMF_CALLBACK_PREEDIT_CHANGED,
981 NULL); 973 NULL);
@@ -996,13 +988,11 @@ _ecore_imf_context_ibus_hide_preedit_text_cb(IBusInputContext *ibuscontext EINA_
996 ibusimcontext->preedit_visible = EINA_FALSE; 988 ibusimcontext->preedit_visible = EINA_FALSE;
997 989
998 // call preedit changed 990 // call preedit changed
999 ecore_imf_context_preedit_changed_event_add(ibusimcontext->ctx);
1000 ecore_imf_context_event_callback_call(ibusimcontext->ctx, 991 ecore_imf_context_event_callback_call(ibusimcontext->ctx,
1001 ECORE_IMF_CALLBACK_PREEDIT_CHANGED, 992 ECORE_IMF_CALLBACK_PREEDIT_CHANGED,
1002 NULL); 993 NULL);
1003 994
1004 // call preedit end 995 // call preedit end
1005 ecore_imf_context_preedit_end_event_add(ibusimcontext->ctx);
1006 ecore_imf_context_event_callback_call(ibusimcontext->ctx, 996 ecore_imf_context_event_callback_call(ibusimcontext->ctx,
1007 ECORE_IMF_CALLBACK_PREEDIT_END, 997 ECORE_IMF_CALLBACK_PREEDIT_END,
1008 NULL); 998 NULL);
@@ -1025,13 +1015,11 @@ _ecore_imf_context_ibus_destroy_cb(IBusInputContext *ibuscontext EINA_UNUSED,
1025 ibusimcontext->preedit_string = NULL; 1015 ibusimcontext->preedit_string = NULL;
1026 1016
1027 // call preedit changed 1017 // call preedit changed
1028 ecore_imf_context_preedit_changed_event_add(ibusimcontext->ctx);
1029 ecore_imf_context_event_callback_call(ibusimcontext->ctx, 1018 ecore_imf_context_event_callback_call(ibusimcontext->ctx,
1030 ECORE_IMF_CALLBACK_PREEDIT_CHANGED, 1019 ECORE_IMF_CALLBACK_PREEDIT_CHANGED,
1031 NULL); 1020 NULL);
1032 1021
1033 // call preedit end 1022 // call preedit end
1034 ecore_imf_context_preedit_end_event_add(ibusimcontext->ctx);
1035 ecore_imf_context_event_callback_call(ibusimcontext->ctx, 1023 ecore_imf_context_event_callback_call(ibusimcontext->ctx,
1036 ECORE_IMF_CALLBACK_PREEDIT_END, 1024 ECORE_IMF_CALLBACK_PREEDIT_END,
1037 NULL); 1025 NULL);
diff --git a/src/modules/ecore_imf/scim/scim_imcontext.cpp b/src/modules/ecore_imf/scim/scim_imcontext.cpp
index 993a7d8..54249dc 100644
--- a/src/modules/ecore_imf/scim/scim_imcontext.cpp
+++ b/src/modules/ecore_imf/scim/scim_imcontext.cpp
@@ -1491,7 +1491,6 @@ panel_slot_commit_string(int context, const WideString &wstr)
1491 if (_focused_ic != ic) 1491 if (_focused_ic != ic)
1492 return; 1492 return;
1493 1493
1494 ecore_imf_context_commit_event_add(ic->ctx, utf8_wcstombs(wstr).c_str());
1495 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_COMMIT, (void *)utf8_wcstombs(wstr).c_str()); 1494 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_COMMIT, (void *)utf8_wcstombs(wstr).c_str());
1496} 1495}
1497 1496
@@ -1796,9 +1795,7 @@ turn_on_ic(EcoreIMFContextISF *ic)
1796 1795
1797 if (ic->impl->use_preedit && ic->impl->preedit_string.length()) 1796 if (ic->impl->use_preedit && ic->impl->preedit_string.length())
1798 { 1797 {
1799 ecore_imf_context_preedit_start_event_add(ic->ctx);
1800 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL); 1798 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL);
1801 ecore_imf_context_preedit_changed_event_add(ic->ctx);
1802 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); 1799 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL);
1803 ic->impl->preedit_started = true; 1800 ic->impl->preedit_started = true;
1804 } 1801 }
@@ -1831,9 +1828,7 @@ turn_off_ic(EcoreIMFContextISF *ic)
1831 1828
1832 if (ic->impl->use_preedit && ic->impl->preedit_string.length()) 1829 if (ic->impl->use_preedit && ic->impl->preedit_string.length())
1833 { 1830 {
1834 ecore_imf_context_preedit_changed_event_add(ic->ctx);
1835 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); 1831 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL);
1836 ecore_imf_context_preedit_end_event_add(ic->ctx);
1837 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL); 1832 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL);
1838 ic->impl->preedit_started = false; 1833 ic->impl->preedit_started = false;
1839 } 1834 }
@@ -2166,9 +2161,7 @@ open_specific_factory(EcoreIMFContextISF *ic,
2166 2161
2167 if (ic->impl->use_preedit && ic->impl->preedit_string.length()) 2162 if (ic->impl->use_preedit && ic->impl->preedit_string.length())
2168 { 2163 {
2169 ecore_imf_context_preedit_changed_event_add(ic->ctx);
2170 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); 2164 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL);
2171 ecore_imf_context_preedit_end_event_add(ic->ctx);
2172 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL); 2165 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL);
2173 ic->impl->preedit_started = false; 2166 ic->impl->preedit_started = false;
2174 } 2167 }
@@ -2430,7 +2423,6 @@ slot_show_preedit_string(IMEngineInstanceBase *si)
2430 { 2423 {
2431 if (!ic->impl->preedit_started) 2424 if (!ic->impl->preedit_started)
2432 { 2425 {
2433 ecore_imf_context_preedit_start_event_add(_focused_ic->ctx);
2434 ecore_imf_context_event_callback_call(_focused_ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL); 2426 ecore_imf_context_event_callback_call(_focused_ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL);
2435 ic->impl->preedit_started = true; 2427 ic->impl->preedit_started = true;
2436 } 2428 }
@@ -2487,12 +2479,10 @@ slot_hide_preedit_string(IMEngineInstanceBase *si)
2487 { 2479 {
2488 if (emit) 2480 if (emit)
2489 { 2481 {
2490 ecore_imf_context_preedit_changed_event_add(ic->ctx);
2491 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); 2482 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL);
2492 } 2483 }
2493 if (ic->impl->preedit_started) 2484 if (ic->impl->preedit_started)
2494 { 2485 {
2495 ecore_imf_context_preedit_end_event_add(ic->ctx);
2496 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL); 2486 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL);
2497 ic->impl->preedit_started = false; 2487 ic->impl->preedit_started = false;
2498 } 2488 }
@@ -2541,11 +2531,9 @@ slot_update_preedit_caret(IMEngineInstanceBase *si, int caret)
2541 { 2531 {
2542 if (!ic->impl->preedit_started) 2532 if (!ic->impl->preedit_started)
2543 { 2533 {
2544 ecore_imf_context_preedit_start_event_add(ic->ctx);
2545 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL); 2534 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL);
2546 ic->impl->preedit_started = true; 2535 ic->impl->preedit_started = true;
2547 } 2536 }
2548 ecore_imf_context_preedit_changed_event_add(ic->ctx);
2549 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); 2537 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL);
2550 } 2538 }
2551 else 2539 else
@@ -2572,13 +2560,11 @@ slot_update_preedit_string(IMEngineInstanceBase *si,
2572 { 2560 {
2573 if (!ic->impl->preedit_started) 2561 if (!ic->impl->preedit_started)
2574 { 2562 {
2575 ecore_imf_context_preedit_start_event_add(_focused_ic->ctx);
2576 ecore_imf_context_event_callback_call(_focused_ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL); 2563 ecore_imf_context_event_callback_call(_focused_ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL);
2577 ic->impl->preedit_started = true; 2564 ic->impl->preedit_started = true;
2578 } 2565 }
2579 ic->impl->preedit_caret = str.length(); 2566 ic->impl->preedit_caret = str.length();
2580 ic->impl->preedit_updating = true; 2567 ic->impl->preedit_updating = true;
2581 ecore_imf_context_preedit_changed_event_add(ic->ctx);
2582 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); 2568 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL);
2583 ic->impl->preedit_updating = false; 2569 ic->impl->preedit_updating = false;
2584 } 2570 }
@@ -2613,7 +2599,6 @@ slot_commit_string(IMEngineInstanceBase *si,
2613 EINA_SAFETY_ON_NULL_RETURN(ic); 2599 EINA_SAFETY_ON_NULL_RETURN(ic);
2614 EINA_SAFETY_ON_NULL_RETURN(ic->ctx); 2600 EINA_SAFETY_ON_NULL_RETURN(ic->ctx);
2615 2601
2616 ecore_imf_context_commit_event_add(ic->ctx, utf8_wcstombs(str).c_str());
2617 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_COMMIT, (void *)utf8_wcstombs(str).c_str()); 2602 ecore_imf_context_event_callback_call(ic->ctx, ECORE_IMF_CALLBACK_COMMIT, (void *)utf8_wcstombs(str).c_str());
2618} 2603}
2619 2604
@@ -2797,7 +2782,6 @@ slot_delete_surrounding_text(IMEngineInstanceBase *si,
2797 ev.ctx = _focused_ic->ctx; 2782 ev.ctx = _focused_ic->ctx;
2798 ev.n_chars = len; 2783 ev.n_chars = len;
2799 ev.offset = offset; 2784 ev.offset = offset;
2800 ecore_imf_context_delete_surrounding_event_add(_focused_ic->ctx, offset, len);
2801 ecore_imf_context_event_callback_call(_focused_ic->ctx, ECORE_IMF_CALLBACK_DELETE_SURROUNDING, &ev); 2785 ecore_imf_context_event_callback_call(_focused_ic->ctx, ECORE_IMF_CALLBACK_DELETE_SURROUNDING, &ev);
2802 2786
2803 return true; 2787 return true;
@@ -2840,7 +2824,6 @@ fallback_commit_string_cb(IMEngineInstanceBase *si EINA_UNUSED,
2840 2824
2841 if (_focused_ic) 2825 if (_focused_ic)
2842 { 2826 {
2843 ecore_imf_context_commit_event_add(_focused_ic->ctx, utf8_wcstombs(str).c_str());
2844 ecore_imf_context_event_callback_call(_focused_ic->ctx, ECORE_IMF_CALLBACK_COMMIT, (void *)utf8_wcstombs(str).c_str()); 2827 ecore_imf_context_event_callback_call(_focused_ic->ctx, ECORE_IMF_CALLBACK_COMMIT, (void *)utf8_wcstombs(str).c_str());
2845 } 2828 }
2846} 2829}
diff --git a/src/modules/ecore_imf/xim/ecore_imf_xim.c b/src/modules/ecore_imf/xim/ecore_imf_xim.c
index a4d567c..5bb8c4a 100644
--- a/src/modules/ecore_imf/xim/ecore_imf_xim.c
+++ b/src/modules/ecore_imf/xim/ecore_imf_xim.c
@@ -383,7 +383,6 @@ _ecore_imf_context_xim_reset(Ecore_IMF_Context *ctx)
383 free(imf_context_data->preedit_chars); 383 free(imf_context_data->preedit_chars);
384 imf_context_data->preedit_chars = NULL; 384 imf_context_data->preedit_chars = NULL;
385 385
386 ecore_imf_context_preedit_changed_event_add(ctx);
387 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); 386 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL);
388 } 387 }
389 388
@@ -392,7 +391,6 @@ _ecore_imf_context_xim_reset(Ecore_IMF_Context *ctx)
392 char *result_utf8 = strdup(result); 391 char *result_utf8 = strdup(result);
393 if (result_utf8) 392 if (result_utf8)
394 { 393 {
395 ecore_imf_context_commit_event_add(ctx, result_utf8);
396 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_COMMIT, result_utf8); 394 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_COMMIT, result_utf8);
397 free(result_utf8); 395 free(result_utf8);
398 } 396 }
@@ -695,7 +693,6 @@ _ecore_imf_context_xim_filter_event(Ecore_IMF_Context *ctx,
695 if (!unicode) abort(); 693 if (!unicode) abort();
696 if (unicode[0] >= 0x20 && unicode[0] != 0x7f) 694 if (unicode[0] >= 0x20 && unicode[0] != 0x7f)
697 { 695 {
698 ecore_imf_context_commit_event_add(ctx, compose);
699 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_COMMIT, compose); 696 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_COMMIT, compose);
700 result = EINA_TRUE; 697 result = EINA_TRUE;
701 } 698 }
@@ -882,10 +879,7 @@ _ecore_imf_xim_preedit_start_call(XIC xic EINA_UNUSED,
882 EINA_SAFETY_ON_NULL_RETURN(imf_context_data); 879 EINA_SAFETY_ON_NULL_RETURN(imf_context_data);
883 880
884 if (imf_context_data->finalizing == EINA_FALSE) 881 if (imf_context_data->finalizing == EINA_FALSE)
885 { 882 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL);
886 ecore_imf_context_preedit_start_event_add(ctx);
887 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL);
888 }
889} 883}
890 884
891static void 885static void
@@ -904,15 +898,11 @@ _ecore_imf_xim_preedit_done_call(XIC xic EINA_UNUSED,
904 imf_context_data->preedit_length = 0; 898 imf_context_data->preedit_length = 0;
905 free(imf_context_data->preedit_chars); 899 free(imf_context_data->preedit_chars);
906 imf_context_data->preedit_chars = NULL; 900 imf_context_data->preedit_chars = NULL;
907 ecore_imf_context_preedit_changed_event_add(ctx);
908 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); 901 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL);
909 } 902 }
910 903
911 if (imf_context_data->finalizing == EINA_FALSE) 904 if (imf_context_data->finalizing == EINA_FALSE)
912 { 905 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL);
913 ecore_imf_context_preedit_end_event_add(ctx);
914 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL);
915 }
916} 906}
917 907
918/* FIXME */ 908/* FIXME */
@@ -1049,7 +1039,6 @@ done:
1049 } 1039 }
1050 } 1040 }
1051 1041
1052 ecore_imf_context_preedit_changed_event_add(ctx);
1053 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); 1042 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL);
1054 } 1043 }
1055 1044
@@ -1072,10 +1061,7 @@ _ecore_imf_xim_preedit_caret_call(XIC xic EINA_UNUSED,
1072 { 1061 {
1073 imf_context_data->preedit_cursor = call_data->position; 1062 imf_context_data->preedit_cursor = call_data->position;
1074 if (imf_context_data->finalizing == EINA_FALSE) 1063 if (imf_context_data->finalizing == EINA_FALSE)
1075 { 1064 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL);
1076 ecore_imf_context_preedit_changed_event_add(ctx);
1077 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL);
1078 }
1079 } 1065 }
1080} 1066}
1081 1067
@@ -1257,7 +1243,6 @@ _ecore_imf_xim_ic_reinitialize(Ecore_IMF_Context *ctx)
1257 imf_context_data->preedit_length = 0; 1243 imf_context_data->preedit_length = 0;
1258 free(imf_context_data->preedit_chars); 1244 free(imf_context_data->preedit_chars);
1259 imf_context_data->preedit_chars = NULL; 1245 imf_context_data->preedit_chars = NULL;
1260 ecore_imf_context_preedit_changed_event_add(ctx);
1261 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); 1246 ecore_imf_context_event_callback_call(ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL);
1262 } 1247 }
1263 } 1248 }