From f699af9a8353f68b96bb5c2dbd42262763c085f1 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 17 Feb 2012 09:19:11 +0900 Subject: [PATCH] Applied EFL migration Change-Id: Ifc9df22969bc090f4e7ffe4a3f2b31183eb79bd5 --- configure.ac | 4 +- debian/changelog | 4 +- ism/demos/isf_autocapital_efl.cpp | 4 +- ism/demos/isf_demo_efl.cpp | 4 +- ism/demos/isf_event_efl.cpp | 4 +- ism/demos/isf_imcontrol_efl.cpp | 33 +- ism/demos/isf_layout_efl.cpp | 4 +- ism/demos/isf_prediction_efl.cpp | 4 +- ism/extras/efl_immodule/isf_imf_context.cpp | 80 +++- ism/extras/efl_immodule/isf_imf_control.cpp | 8 +- ism/extras/efl_immodule/isf_imf_control.h | 4 +- ism/extras/efl_immodule/isf_imf_control_ui.cpp | 15 +- ism/extras/efl_immodule/isf_imf_control_ui.h | 5 +- ism/extras/efl_immodule/isf_imf_module.cpp | 5 - ism/extras/efl_panel/isf_panel_efl.cpp | 168 ++------ ism/extras/efl_setting/include/isf_setting_efl.h | 8 +- ism/extras/efl_setting/isf_setting_efl.cpp | 146 ++++--- ism/extras/efl_setting/isf_setting_wizard.cpp | 20 +- ism/src/scim_helper.cpp | 95 ----- ism/src/scim_panel_agent.cpp | 517 +---------------------- ism/src/scim_trans_commands.h | 16 +- releasenote.txt | 2 +- 22 files changed, 212 insertions(+), 938 deletions(-) diff --git a/configure.ac b/configure.ac index 51c21e2..bc532c8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script #AC_INIT(scim, 1.4.7, suzhe@tsinghua.org.cn) -AC_INIT(isf, 2.3.5009, isf@samsung.com) +AC_INIT(isf, 2.3.5016, isf@samsung.com) AC_CONFIG_SRCDIR([ism/src/scim.h]) m4_pattern_allow([^AS_]) @@ -11,7 +11,7 @@ m4_pattern_allow([^AS_]) # ISF version ISF_MAJOR_VERSION=2 ISF_MINOR_VERSION=3 -ISF_MICRO_VERSION=5009 +ISF_MICRO_VERSION=5016 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION diff --git a/debian/changelog b/debian/changelog index 7d8c11f..43f6947 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -isf (2.3.5009-1slp2+1) unstable; urgency=low +isf (2.3.5016-1slp2+1) unstable; urgency=low * upload tizen beta code * Git: slp/pkgs/i/isf - * Tag: isf_2.3.5009-1slp2+1 + * Tag: isf_2.3.5016-1slp2+1 -- Jihoon Kim Thu, 09 Feb 2012 17:48:05 +0900 diff --git a/ism/demos/isf_autocapital_efl.cpp b/ism/demos/isf_autocapital_efl.cpp index 240a176..a2e7044 100644 --- a/ism/demos/isf_autocapital_efl.cpp +++ b/ism/demos/isf_autocapital_efl.cpp @@ -65,8 +65,8 @@ static void add_layout_to_conformant (void *data, Evas_Object *lay_in, const cha elm_scroller_bounce_set (scroller, EINA_FALSE, EINA_TRUE); evas_object_show (scroller); - elm_scroller_content_set (scroller, lay_in); - elm_conformant_content_set (conform, scroller); + elm_object_content_set (scroller, lay_in); + elm_object_content_set (conform, scroller); elm_naviframe_item_push (ad->naviframe, title, NULL, NULL, conform, NULL); } diff --git a/ism/demos/isf_demo_efl.cpp b/ism/demos/isf_demo_efl.cpp index e60f2cd..7c17723 100644 --- a/ism/demos/isf_demo_efl.cpp +++ b/ism/demos/isf_demo_efl.cpp @@ -49,7 +49,7 @@ static void _list_click (void *data, Evas_Object *obj, void *event_info) Evas_Object *li = ad->li; if (li == NULL) return; - Elm_List_Item *it = (Elm_List_Item *)elm_list_selected_item_get (li); + Elm_Object_Item *it = (Elm_Object_Item *)elm_list_selected_item_get (li); if (it != NULL) elm_list_item_selected_set (it, EINA_FALSE); @@ -270,7 +270,7 @@ static Evas_Object* create_layout_main (Evas_Object* parent) static Evas_Object* _create_naviframe_layout (Evas_Object* parent) { Evas_Object *naviframe = elm_naviframe_add (parent); - elm_layout_content_set (parent, "elm.swallow.content", naviframe); + elm_object_part_content_set (parent, "elm.swallow.content", naviframe); evas_object_show (naviframe); diff --git a/ism/demos/isf_event_efl.cpp b/ism/demos/isf_event_efl.cpp index 7468a19..013f7fb 100644 --- a/ism/demos/isf_event_efl.cpp +++ b/ism/demos/isf_event_efl.cpp @@ -230,7 +230,7 @@ static void isf_label_event_demo_bt (void *data, Evas_Object *obj, void *event_i evas_object_smart_callback_add (_ise_show_button, "clicked", _button_bt, NULL); Elm_Object_Item *it = elm_naviframe_item_push (ad->naviframe, _("label event demo"), NULL, NULL, layout, NULL); - Evas_Object *back_btn = elm_object_item_content_part_get (it, ELM_NAVIFRAME_ITEM_PREV_BTN); + Evas_Object *back_btn = elm_object_item_part_content_get (it, ELM_NAVIFRAME_ITEM_PREV_BTN); evas_object_smart_callback_add (back_btn, "clicked", nf_back_event_cb, ad ); } @@ -242,7 +242,7 @@ static void _list_click (void *data, Evas_Object *obj, void *event_info) Evas_Object *li = ad->ev_li; if (li == NULL) return; - Elm_List_Item *it = (Elm_List_Item *)elm_list_selected_item_get (li); + Elm_Object_Item *it = (Elm_Object_Item *)elm_list_selected_item_get (li); if (it != NULL) elm_list_item_selected_set (it, EINA_FALSE); diff --git a/ism/demos/isf_imcontrol_efl.cpp b/ism/demos/isf_imcontrol_efl.cpp index bc0cd00..dc97583 100644 --- a/ism/demos/isf_imcontrol_efl.cpp +++ b/ism/demos/isf_imcontrol_efl.cpp @@ -35,8 +35,6 @@ enum { INPUT_PANEL_IMDATA_GET, INPUT_PANEL_LAYOUT_SET, INPUT_PANEL_LAYOUT_GET, - INPUT_PANEL_PRIVATE_KEY_SET, - INPUT_PANEL_KEY_DISABLED_SET, INPUT_PANEL_STATE_GET, CONTROL_PANEL_SHOW, CONTROL_PANEL_HIDE, @@ -50,8 +48,6 @@ const char *api_list[]={ "INPUT PANEL IMDATA GET", "INPUT PANEL LAYOUT SET", "INPUT PANEL LAYOUT GET", - "PANEL PRIVATE KEY SET", - "PANEL KEY DISABLED SET", "INPUT PANEL STATE GET", "CTRL PANEL SHOW", "CTRL PANEL HIDE", @@ -121,23 +117,6 @@ void test_input_panel_layout_get (void *data, Evas_Object *obj, void *event_info } } -void test_input_panel_private_key_set (void *data, Evas_Object *obj, void *event_info) -{ - int layout_index = 1; - - if (imf_context != NULL) - ecore_imf_context_input_panel_private_key_set (imf_context, layout_index, ECORE_IMF_INPUT_PANEL_KEY_ENTER, NULL, "Go", ECORE_IMF_INPUT_PANEL_KEY_ENTER, NULL); -} - -void test_input_panel_key_disabled_set (void *data, Evas_Object *obj, void *event_info) -{ - int layout_index = 1; - int key_index = 1; - - if (imf_context != NULL) - ecore_imf_context_input_panel_key_disabled_set (imf_context, layout_index, key_index, EINA_TRUE); -} - void test_input_panel_state_get (void *data, Evas_Object *obj, void *event_info) { Ecore_IMF_Input_Panel_State state; @@ -193,12 +172,6 @@ static void test_api (void *data, Evas_Object *obj, void *event_info) case INPUT_PANEL_LAYOUT_GET: test_input_panel_layout_get (NULL,obj, event_info); break; - case INPUT_PANEL_PRIVATE_KEY_SET: - test_input_panel_private_key_set (NULL, obj, event_info); - break; - case INPUT_PANEL_KEY_DISABLED_SET: - test_input_panel_key_disabled_set (NULL, obj, event_info); - break; case INPUT_PANEL_STATE_GET: test_input_panel_state_get (NULL, obj, event_info); break; @@ -228,8 +201,8 @@ static Evas_Object *_create_imcontrolapi_list (Evas_Object *parent) Evas_Object *gl = elm_genlist_add (parent); itci.item_style = "default"; - itci.func.label_get = gli_label_get; - itci.func.icon_get = NULL; + itci.func.text_get = gli_label_get; + itci.func.content_get = NULL; itci.func.state_get = NULL; itci.func.del = NULL; @@ -260,7 +233,7 @@ void imcontrolapi_bt (void *data, Evas_Object *obj, void *event_info) Elm_Object_Item *navi_it = elm_naviframe_item_push (ad->naviframe, _("isfimcontrol api"), NULL, NULL, gl, NULL); - Evas_Object *back_btn = elm_object_item_content_part_get (navi_it, ELM_NAVIFRAME_ITEM_PREV_BTN); + Evas_Object *back_btn = elm_object_item_part_content_get (navi_it, ELM_NAVIFRAME_ITEM_PREV_BTN); evas_object_smart_callback_add (back_btn, "clicked", _nf_back_event, ad); } diff --git a/ism/demos/isf_layout_efl.cpp b/ism/demos/isf_layout_efl.cpp index 40203c2..acf8227 100644 --- a/ism/demos/isf_layout_efl.cpp +++ b/ism/demos/isf_layout_efl.cpp @@ -117,8 +117,8 @@ static void add_layout_to_conformant (void *data, Evas_Object *lay_in, const cha elm_scroller_bounce_set (scroller, EINA_FALSE, EINA_TRUE); evas_object_show (scroller); - elm_scroller_content_set (scroller, lay_in); - elm_conformant_content_set (conform, scroller); + elm_object_content_set (scroller, lay_in); + elm_object_content_set (conform, scroller); elm_naviframe_item_push (ad->naviframe, title, NULL, NULL, conform, NULL); } diff --git a/ism/demos/isf_prediction_efl.cpp b/ism/demos/isf_prediction_efl.cpp index ec0154a..8d5bb7a 100644 --- a/ism/demos/isf_prediction_efl.cpp +++ b/ism/demos/isf_prediction_efl.cpp @@ -68,8 +68,8 @@ static void add_layout_to_conformant (void *data, Evas_Object *lay_in, const cha elm_scroller_bounce_set (scroller, EINA_FALSE, EINA_TRUE); evas_object_show (scroller); - elm_scroller_content_set (scroller, lay_in); - elm_conformant_content_set (conform, scroller); + elm_object_content_set (scroller, lay_in); + elm_object_content_set (conform, scroller); elm_naviframe_item_push (ad->naviframe, title, NULL, NULL, conform, NULL); } diff --git a/ism/extras/efl_immodule/isf_imf_context.cpp b/ism/extras/efl_immodule/isf_imf_context.cpp index 6fe658d..fab57fd 100644 --- a/ism/extras/efl_immodule/isf_imf_context.cpp +++ b/ism/extras/efl_immodule/isf_imf_context.cpp @@ -593,6 +593,30 @@ caps_mode_check(Ecore_IMF_Context *ctx, Eina_Bool force) } static void +window_to_screen_geometry_get(Ecore_X_Window client_win, int *x, int *y) +{ + Ecore_X_Window root_window, win; + int win_x, win_y; + int sum_x = 0, sum_y = 0; + + root_window = ecore_x_window_root_get(client_win); + win = client_win; + + while (root_window != win) + { + ecore_x_window_geometry_get(win, &win_x, &win_y, NULL, NULL); + sum_x += win_x; + sum_y += win_y; + win = ecore_x_window_parent_get(win); + } + + if (x) + *x = sum_x; + if (y) + *y = sum_y; +} + +static void evas_focus_out_cb(void *data, Evas *e, void *event_info) { Ecore_IMF_Context *ctx = (Ecore_IMF_Context *)data; @@ -657,7 +681,7 @@ isf_imf_context_new (void) /** * isf_imf_context_shutdown * - * It will be called when the scim im module is unloaded by EFL. It will do some + * It will be called when the scim im module is unloaded by ecore. It will do some * cleanup job. */ EAPI void @@ -1030,9 +1054,10 @@ isf_imf_context_focus_out (Ecore_IMF_Context *ctx) if (context_scim->impl->need_commit_preedit) { panel_slot_hide_preedit_string (context_scim->id); - if (wstr.length ()) + if (wstr.length ()) { ecore_imf_context_commit_event_add (context_scim->ctx, utf8_wcstombs (wstr).c_str ()); - + ecore_imf_context_event_callback_call (context_scim->ctx, ECORE_IMF_CALLBACK_COMMIT, (void *)utf8_wcstombs(wstr).c_str()); + } _panel_client.prepare (context_scim->id); _panel_client.reset_input_context (context_scim->id); _panel_client.send (); @@ -1077,6 +1102,7 @@ isf_imf_context_reset (Ecore_IMF_Context *ctx) if (wstr.length ()) { ecore_imf_context_commit_event_add (context_scim->ctx, utf8_wcstombs (wstr).c_str ()); + ecore_imf_context_event_callback_call (context_scim->ctx, ECORE_IMF_CALLBACK_COMMIT, (void *)utf8_wcstombs(wstr).c_str()); } _panel_client.prepare (context_scim->id); @@ -1150,12 +1176,15 @@ isf_imf_context_cursor_location_set (Ecore_IMF_Context *ctx, int cx, int cy, int if (context_scim->impl->client_canvas) { ee = ecore_evas_ecore_evas_get(context_scim->impl->client_canvas); + if (!ee) return; - if (ee) - ecore_evas_geometry_get (ee, &canvas_x, &canvas_y, NULL, NULL); + ecore_evas_geometry_get (ee, &canvas_x, &canvas_y, NULL, NULL); } - else if (context_scim->impl->client_window) { - ecore_x_window_geometry_get(context_scim->impl->client_window, &canvas_x, &canvas_y, NULL, NULL); + else { + if (context_scim->impl->client_window) + window_to_screen_geometry_get(context_scim->impl->client_window, &canvas_x, &canvas_y); + else + return; } if (context_scim->impl->cursor_x != canvas_x + cx || context_scim->impl->cursor_y != canvas_y + cy + ch) { @@ -1528,6 +1557,7 @@ isf_imf_context_filter_event (Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type, if (strlen(string) != 0) { ecore_imf_context_commit_event_add (ic->ctx, string); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_COMMIT, (void *)string); _panel_client.send (); caps_mode_check(ctx, EINA_FALSE); return EINA_TRUE; @@ -1816,6 +1846,7 @@ panel_slot_commit_string (int context, const WideString &wstr) return; ecore_imf_context_commit_event_add (ic->ctx, utf8_wcstombs (wstr).c_str ()); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_COMMIT, (void *)utf8_wcstombs(wstr).c_str()); } } @@ -1878,8 +1909,10 @@ panel_slot_reset_keyboard_ise (int context) if (ic->impl->need_commit_preedit) { panel_slot_hide_preedit_string (ic->id); - if (wstr.length ()) + if (wstr.length ()) { ecore_imf_context_commit_event_add (ic->ctx, utf8_wcstombs (wstr).c_str ()); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_COMMIT, (void *)utf8_wcstombs(wstr).c_str()); + } } ic->impl->si->reset (); } @@ -1935,9 +1968,13 @@ panel_slot_hide_preedit_string (int context) emit = true; } if (ic->impl->use_preedit) { - if (emit) ecore_imf_context_preedit_changed_event_add (ic->ctx); + if (emit) { + ecore_imf_context_preedit_changed_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); + } if (ic->impl->preedit_started) { ecore_imf_context_preedit_end_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL); ic->impl->preedit_started = false; ic->impl->need_commit_preedit = false; } @@ -1967,12 +2004,14 @@ panel_slot_update_preedit_string (int context, if (ic->impl->use_preedit) { if (!ic->impl->preedit_started) { ecore_imf_context_preedit_start_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL); ic->impl->preedit_started = true; ic->impl->need_commit_preedit = true; } ic->impl->preedit_caret = str.length (); ic->impl->preedit_updating = true; ecore_imf_context_preedit_changed_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); ic->impl->preedit_updating = false; } else { _panel_client.update_preedit_string (ic->id, str, attrs); @@ -2250,7 +2289,9 @@ turn_on_ic (EcoreIMFContextISF *ic) if (ic->impl->use_preedit && ic->impl->preedit_string.length ()) { ecore_imf_context_preedit_start_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL); ecore_imf_context_preedit_changed_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); ic->impl->preedit_started = true; } } @@ -2277,7 +2318,9 @@ turn_off_ic (EcoreIMFContextISF *ic) if (ic->impl->use_preedit && ic->impl->preedit_string.length ()) { ecore_imf_context_preedit_changed_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); ecore_imf_context_preedit_end_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL); ic->impl->preedit_started = false; } } @@ -2603,7 +2646,9 @@ open_specific_factory (EcoreIMFContextISF *ic, if (ic->impl->use_preedit && ic->impl->preedit_string.length ()) { ecore_imf_context_preedit_changed_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); ecore_imf_context_preedit_end_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL); ic->impl->preedit_started = false; } } @@ -2923,6 +2968,7 @@ slot_show_preedit_string (IMEngineInstanceBase *si) if (ic->impl->use_preedit) { if (!ic->impl->preedit_started) { ecore_imf_context_preedit_start_event_add (_focused_ic->ctx); + ecore_imf_context_event_callback_call (_focused_ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL); ic->impl->preedit_started = true; } //if (ic->impl->preedit_string.length ()) @@ -2971,10 +3017,13 @@ slot_hide_preedit_string (IMEngineInstanceBase *si) emit = true; } if (ic->impl->use_preedit) { - if (emit) + if (emit) { ecore_imf_context_preedit_changed_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); + } if (ic->impl->preedit_started) { ecore_imf_context_preedit_end_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL); ic->impl->preedit_started = false; } } else { @@ -3017,9 +3066,11 @@ slot_update_preedit_caret (IMEngineInstanceBase *si, int caret) if (ic->impl->use_preedit) { if (!ic->impl->preedit_started) { ecore_imf_context_preedit_start_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL); ic->impl->preedit_started = true; } ecore_imf_context_preedit_changed_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); } else { _panel_client.update_preedit_caret (ic->id, caret); } @@ -3041,11 +3092,13 @@ slot_update_preedit_string (IMEngineInstanceBase *si, if (ic->impl->use_preedit) { if (!ic->impl->preedit_started) { ecore_imf_context_preedit_start_event_add (_focused_ic->ctx); + ecore_imf_context_event_callback_call (_focused_ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_START, NULL); ic->impl->preedit_started = true; } ic->impl->preedit_caret = str.length (); ic->impl->preedit_updating = true; ecore_imf_context_preedit_changed_event_add (ic->ctx); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); ic->impl->preedit_updating = false; } else { _panel_client.update_preedit_string (ic->id, str, attrs); @@ -3076,6 +3129,7 @@ slot_commit_string (IMEngineInstanceBase *si, if (ic && ic->ctx) { ecore_imf_context_commit_event_add (ic->ctx, utf8_wcstombs (str).c_str ()); + ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_COMMIT, (void *)utf8_wcstombs(str).c_str()); } } @@ -3227,7 +3281,12 @@ slot_delete_surrounding_text (IMEngineInstanceBase *si, EcoreIMFContextISF *ic = static_cast (si->get_frontend_data ()); if (ic && ic->impl && _focused_ic == ic) { + Ecore_IMF_Event_Delete_Surrounding ev; + ev.ctx = _focused_ic->ctx; + ev.n_chars = len; + ev.offset = offset; ecore_imf_context_delete_surrounding_event_add (_focused_ic->ctx, offset, len); + ecore_imf_context_event_callback_call (_focused_ic->ctx, ECORE_IMF_CALLBACK_DELETE_SURROUNDING, &ev); return true; } return false; @@ -3270,6 +3329,7 @@ fallback_commit_string_cb (IMEngineInstanceBase *si, if (_focused_ic && _focused_ic->impl) { ecore_imf_context_commit_event_add (_focused_ic->ctx, utf8_wcstombs (str).c_str ()); + ecore_imf_context_event_callback_call (_focused_ic->ctx, ECORE_IMF_CALLBACK_COMMIT, (void *)utf8_wcstombs(str).c_str()); } } diff --git a/ism/extras/efl_immodule/isf_imf_control.cpp b/ism/extras/efl_immodule/isf_imf_control.cpp index 5ff3f6c..7fedfe0 100644 --- a/ism/extras/efl_immodule/isf_imf_control.cpp +++ b/ism/extras/efl_immodule/isf_imf_control.cpp @@ -195,20 +195,20 @@ EAPI int _isf_imf_context_input_panel_language_set (Ecore_IMF_Input_Panel_Lang l return 0; } -EAPI int _isf_imf_context_input_panel_imdata_set (const char *data, int len) +EAPI int _isf_imf_context_input_panel_imdata_set (const void *data, int len) { connect_panel (); _imcontrol_client.prepare (); - _imcontrol_client.set_imdata (data, len); + _imcontrol_client.set_imdata ((const char *)data, len); _imcontrol_client.send (); return 0; } -EAPI int _isf_imf_context_input_panel_imdata_get (char *data, int *len) +EAPI int _isf_imf_context_input_panel_imdata_get (void *data, int *len) { connect_panel (); _imcontrol_client.prepare (); - _imcontrol_client.get_imdata (data, len); + _imcontrol_client.get_imdata ((char *)data, len); return 0; } diff --git a/ism/extras/efl_immodule/isf_imf_control.h b/ism/extras/efl_immodule/isf_imf_control.h index 96b7354..82ec85d 100644 --- a/ism/extras/efl_immodule/isf_imf_control.h +++ b/ism/extras/efl_immodule/isf_imf_control.h @@ -40,8 +40,8 @@ extern "C" int _isf_imf_context_input_panel_language_set (Ecore_IMF_Input_Panel_Lang lang); - int _isf_imf_context_input_panel_imdata_set (const char *data, int len); - int _isf_imf_context_input_panel_imdata_get (char *data, int *len); + int _isf_imf_context_input_panel_imdata_set (const void *data, int len); + int _isf_imf_context_input_panel_imdata_get (void *data, int *len); int _isf_imf_context_input_panel_geometry_get (int *x, int *y, int *w, int *h); int _isf_imf_context_input_panel_private_key_set (int layout_index, int key_index, const char *label, const char *value); int _isf_imf_context_input_panel_private_key_set_by_image (int layout_index, int key_index, const char *img_path, const char *value); diff --git a/ism/extras/efl_immodule/isf_imf_control_ui.cpp b/ism/extras/efl_immodule/isf_imf_control_ui.cpp index bfdbf86..46b6b79 100644 --- a/ism/extras/efl_immodule/isf_imf_control_ui.cpp +++ b/ism/extras/efl_immodule/isf_imf_control_ui.cpp @@ -41,7 +41,6 @@ using namespace scim; #define IMFCONTROLUIDBG(str...) #define IMFCONTROLUIERR(str...) printf(str) - typedef struct { void (*func)(void *data, Ecore_IMF_Context *ctx, int value); void *data; @@ -404,7 +403,7 @@ EAPI void isf_imf_context_input_panel_caps_mode_set (Ecore_IMF_Context *ctx, uns * @param[in] data pointer of data to sets up to ISE * @param[in] length length of data */ -EAPI void isf_imf_context_input_panel_imdata_set (Ecore_IMF_Context *ctx, const char* data, int length) +EAPI void isf_imf_context_input_panel_imdata_set (Ecore_IMF_Context *ctx, const void* data, int length) { IMFCONTROLUIDBG("[%s] data : %s, len : %d\n", __func__, data, length); @@ -422,7 +421,7 @@ EAPI void isf_imf_context_input_panel_imdata_set (Ecore_IMF_Context *ctx, const * @param[out] data pointer of data to return * @param[out] length length of data */ -EAPI void isf_imf_context_input_panel_imdata_get (Ecore_IMF_Context *ctx, char* data, int* length) +EAPI void isf_imf_context_input_panel_imdata_get (Ecore_IMF_Context *ctx, void* data, int* length) { if (!IfInitContext) _isf_imf_context_init (); @@ -430,16 +429,6 @@ EAPI void isf_imf_context_input_panel_imdata_get (Ecore_IMF_Context *ctx, char* IMFCONTROLUIDBG("[%s] imdata : %s, len : %d\n", __func__, data, *length); } -EAPI void isf_imf_context_input_panel_move (Ecore_IMF_Context *ctx, int x, int y) -{ - IMFCONTROLUIDBG("[%s] x : %d, y : %d\n", __func__, x, y); - - if (!IfInitContext) - _isf_imf_context_init (); - iseContext.input_panel_x = x; - iseContext.input_panel_x = y; -} - /** * Get ISE's position and size, in screen coodinates of the ISE rectangle not the client area, * the represents the size and location of the ISE diff --git a/ism/extras/efl_immodule/isf_imf_control_ui.h b/ism/extras/efl_immodule/isf_imf_control_ui.h index 6baecd8..3e9c247 100644 --- a/ism/extras/efl_immodule/isf_imf_control_ui.h +++ b/ism/extras/efl_immodule/isf_imf_control_ui.h @@ -42,8 +42,8 @@ extern "C" void isf_imf_context_control_panel_hide (Ecore_IMF_Context *ctx); void isf_imf_context_input_panel_language_set (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Lang lang); Ecore_IMF_Input_Panel_Lang isf_imf_context_input_panel_language_get (Ecore_IMF_Context *ctx); - void isf_imf_context_input_panel_imdata_set (Ecore_IMF_Context *ctx, const char* data, int len); - void isf_imf_context_input_panel_imdata_get (Ecore_IMF_Context *ctx, char* data, int* len); + void isf_imf_context_input_panel_imdata_set (Ecore_IMF_Context *ctx, const void* data, int len); + void isf_imf_context_input_panel_imdata_get (Ecore_IMF_Context *ctx, void* data, int* len); void isf_imf_context_input_panel_geometry_get (Ecore_IMF_Context *ctx, int *x, int *y, int *w, int *h); void isf_imf_context_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 isf_imf_context_input_panel_layout_set (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Layout layout); @@ -56,7 +56,6 @@ extern "C" void isf_imf_context_input_panel_event_callback_clear (Ecore_IMF_Context *ctx); void isf_imf_context_input_panel_key_disabled_set (Ecore_IMF_Context *ctx, int layout_index, int key_index, Eina_Bool disabled); - void isf_imf_context_input_panel_move (Ecore_IMF_Context *ctx, int x, int y); #ifdef __cplusplus } diff --git a/ism/extras/efl_immodule/isf_imf_module.cpp b/ism/extras/efl_immodule/isf_imf_module.cpp index 8cb206e..b6c402a 100644 --- a/ism/extras/efl_immodule/isf_imf_module.cpp +++ b/ism/extras/efl_immodule/isf_imf_module.cpp @@ -66,15 +66,10 @@ extern "C" isf_imf_context_cursor_location_set, isf_imf_context_input_panel_imdata_set, isf_imf_context_input_panel_imdata_get, - NULL, /* use effect set */ - NULL, /* orient_set */ - isf_imf_context_input_panel_move, isf_imf_context_input_panel_geometry_get, isf_imf_context_input_panel_private_key_set, isf_imf_context_input_panel_key_disabled_set, - NULL, /* input_panel_reset */ isf_imf_context_input_panel_state_get, - isf_imf_context_input_panel_event_callback_add, isf_imf_context_input_panel_event_callback_del }; diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp index 2ad884f..fa297da 100644 --- a/ism/extras/efl_panel/isf_panel_efl.cpp +++ b/ism/extras/efl_panel/isf_panel_efl.cpp @@ -161,7 +161,6 @@ static void change_hw_and_sw_keyboard (void); static Evas_Object *_candidate_window = 0; static Evas_Object *_candidate_area_1 = 0; static Evas_Object *_candidate_area_2 = 0; -static Evas_Object *_candidate_toolbar = 0; static Evas_Object *_candidate_bg = 0; static Evas_Object *_candidate_0_scroll = 0; static Evas_Object *_candidate_scroll = 0; @@ -217,9 +216,6 @@ static int _candidate_scroll_width_max = 663; static int _candidate_scroll_height_min = 124; static int _candidate_scroll_height_max = 190; -static Elm_Toolbar_Item *_candidate_table_items [SCIM_LOOKUP_TABLE_MAX_PAGESIZE]; -static Elm_Toolbar_Item *_candidate_seperator_items [SCIM_LOOKUP_TABLE_MAX_PAGESIZE]; - static Evas_Object *_aux_area = 0; static Evas_Object *_aux_line = 0; static Evas_Object *_aux_table = 0; @@ -266,7 +262,6 @@ static std::vector _read_handler_list; static ISF_CANDIDATE_STYLE_T _candidate_style = PREDICTION_ENGINE_CANDIDATE_STYLE; static ISF_CANDIDATE_MODE_T _candidate_mode = PORTRAIT_VERTICAL_CANDIDATE_MODE; -static bool _candidate_vertical = true; static clock_t _clock_start; @@ -467,7 +462,6 @@ static void load_config (void) if (!_config.null ()) { _candidate_style = (ISF_CANDIDATE_STYLE_T)_config->read (String (ISF_CONFIG_PANEL_LOOKUP_TABLE_STYLE), _candidate_style); _candidate_mode = (ISF_CANDIDATE_MODE_T)_config->read (String (ISF_CONFIG_PANEL_LOOKUP_TABLE_MODE), _candidate_mode); - _candidate_vertical = _config->read (String (ISF_CONFIG_PANEL_LOOKUP_TABLE_VERTICAL), _candidate_vertical); shared_ise = _config->read (String (SCIM_CONFIG_FRONTEND_SHARED_INPUT_METHOD), shared_ise); _panel_agent->set_should_shared_ise (shared_ise); } @@ -529,7 +523,7 @@ static void ui_candidate_window_adjust (void) /* Get candidate window size */ evas_object_geometry_get (_candidate_window, &x, &y, &width, &height); - if (_candidate_vertical) { + { if (evas_object_visible_get (_aux_area) && evas_object_visible_get (_candidate_area_1)) { evas_object_show (_aux_line); ui_candidate_window_resize (width, _candidate_port_height_min_2); @@ -572,19 +566,6 @@ static void ui_candidate_window_adjust (void) evas_object_move (_close_btn, _close_btn_pos[0], _close_btn_pos[1]); } } - } else { - if (evas_object_visible_get (_aux_area) && evas_object_visible_get (_candidate_area_1)) { - evas_object_show (_aux_line); - ui_candidate_window_resize (width, _candidate_port_height_min_2); - evas_object_move (_candidate_area_1, 0, _candidate_port_height_min_2 - _candidate_port_height_min); - } else if (evas_object_visible_get (_aux_area)) { - evas_object_hide (_aux_line); - ui_candidate_window_resize (width, _aux_height); - } else if (evas_object_visible_get (_candidate_area_1)) { - evas_object_hide (_aux_line); - ui_candidate_window_resize (width, _candidate_port_height_min); - evas_object_move (_candidate_area_1, 0, 0); - } } } @@ -602,29 +583,17 @@ static void ui_candidate_window_rotate (int angle) elm_win_rotation_set (_candidate_window, angle); ui_candidate_hide (true); if (angle == 90 || angle == 270) { - if (_candidate_vertical) { - _candidate_scroll_width = _candidate_scroll_width_max; - ui_candidate_window_resize (_candidate_land_width, _candidate_land_height_min); - evas_object_resize (_aux_area, _aux_land_width, _aux_height); - evas_object_resize (_candidate_area_1, _candidate_scroll_0_width_max, _item_min_height); - evas_object_resize (_candidate_area_2, _candidate_scroll_width, _candidate_scroll_height_min); - } else { - evas_object_resize (_candidate_window, _screen_height, _candidate_land_height_min); - evas_object_resize (_candidate_area_1, _screen_height, _candidate_land_height_min); - evas_object_resize (_aux_area, _screen_height - 2*_blank_width, _aux_height); - } + _candidate_scroll_width = _candidate_scroll_width_max; + ui_candidate_window_resize (_candidate_land_width, _candidate_land_height_min); + evas_object_resize (_aux_area, _aux_land_width, _aux_height); + evas_object_resize (_candidate_area_1, _candidate_scroll_0_width_max, _item_min_height); + evas_object_resize (_candidate_area_2, _candidate_scroll_width, _candidate_scroll_height_min); } else { - if (_candidate_vertical) { - _candidate_scroll_width = _candidate_scroll_width_min; - ui_candidate_window_resize (_candidate_port_width, _candidate_port_height_min); - evas_object_resize (_aux_area, _aux_port_width, _aux_height); - evas_object_resize (_candidate_area_1, _candidate_scroll_0_width_min, _item_min_height); - evas_object_resize (_candidate_area_2, _candidate_scroll_width, _candidate_scroll_height_max); - } else { - evas_object_resize (_candidate_window, _screen_width, _candidate_port_height_min); - evas_object_resize (_candidate_area_1, _screen_width, _candidate_port_height_min); - evas_object_resize (_aux_area, _screen_width - 2*_blank_width, _aux_height); - } + _candidate_scroll_width = _candidate_scroll_width_min; + ui_candidate_window_resize (_candidate_port_width, _candidate_port_height_min); + evas_object_resize (_aux_area, _aux_port_width, _aux_height); + evas_object_resize (_candidate_area_1, _candidate_scroll_0_width_min, _item_min_height); + evas_object_resize (_candidate_area_2, _candidate_scroll_width, _candidate_scroll_height_max); } /* Delete old candidate items and popup lines */ @@ -1021,24 +990,6 @@ static void ui_more_window_candidate_item_click_cb (void *data, Evas_Object *obj } /** - * @brief Callback function for horizontal candidate item is clicked. - * - * @param data Data to pass when it is called. - * @param object The Evas_Object handler for current event. - * @param event_info The information for current event. - */ -static void ui_horizontal_candidate_item_click_cb (void *data, Evas_Object *object, void *event_info) -{ - SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; - - _panel_agent->select_candidate ((uint32)GPOINTER_TO_INT (data)); - Elm_Toolbar_Item *it = elm_toolbar_selected_item_get (_candidate_toolbar); - - if (it) - elm_toolbar_item_selected_set (it, EINA_FALSE); -} - -/** * @brief Create more window for candidate. */ static void ui_create_more_window (void) @@ -1144,10 +1095,8 @@ static void ui_create_more_window (void) /** * @brief Create prediction engine style candidate window. - * - * @param vertical An indicator for vertical window or horizontal window. */ -static void ui_create_prediction_engine_candidate_window (bool vertical) +static void ui_create_prediction_engine_candidate_window (void) { SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; @@ -1238,18 +1187,19 @@ static void ui_create_prediction_engine_candidate_window (bool vertical) _candidate_window = efl_create_window ("candidate", "Prediction Window"); evas_object_resize (_candidate_window, _screen_width, _candidate_port_height_min); - if (vertical) { + { evas_object_resize (_candidate_window, _candidate_port_width, _candidate_port_height_min); /* Add background */ _candidate_bg = edje_object_add (evas_object_evas_get (_candidate_window)); edje_object_file_set (_candidate_bg, _candidate_edje_file.c_str (), "candidate_bg"); + evas_object_size_hint_weight_set(_candidate_bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add (_candidate_window, _candidate_bg); evas_object_show (_candidate_bg); /* Create _candidate_0 scroller */ _candidate_0_scroll = elm_scroller_add (_candidate_window); - elm_scroller_bounce_set (_candidate_0_scroll, 1, 0); + elm_scroller_bounce_set (_candidate_0_scroll, EINA_TRUE, EINA_FALSE); elm_scroller_policy_set (_candidate_0_scroll, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF); evas_object_resize (_candidate_0_scroll, _candidate_scroll_0_width_min, _item_min_height); evas_object_move (_candidate_0_scroll, _candidate_area_1_pos[0], _candidate_area_1_pos[1]); @@ -1294,24 +1244,6 @@ static void ui_create_prediction_engine_candidate_window (bool vertical) evas_object_move (_close_btn, _close_btn_pos[0], _close_btn_pos[1]); evas_object_resize (_close_btn, 84 * _width_rate, _item_min_height); evas_object_event_callback_add (_close_btn, EVAS_CALLBACK_MOUSE_UP, ui_candidate_window_close_button_cb, NULL); - } else { - /* Add background */ - Evas_Object *bg = elm_bg_add (_candidate_window); - evas_object_size_hint_weight_set (bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_bg_file_set (bg, EFL_CANDIDATE_BG, NULL); - elm_win_resize_object_add (_candidate_window, bg); - evas_object_show (bg); - - /* Create candidate toolbar */ - _candidate_toolbar = elm_toolbar_add (_candidate_window); - elm_toolbar_mode_shrink_set(_candidate_toolbar, ELM_TOOLBAR_SHRINK_SCROLL); - elm_toolbar_homogeneous_set (_candidate_toolbar, 0); - elm_toolbar_align_set (_candidate_toolbar, 0); - evas_object_size_hint_weight_set (_candidate_toolbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set (_candidate_toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_resize (_candidate_toolbar, _screen_width, _candidate_port_height_min); - evas_object_move (_candidate_toolbar, 0, 0); - _candidate_area_1 = _candidate_toolbar; } _tmp_candidate_text = evas_object_text_add (evas_object_evas_get (_candidate_window)); @@ -1328,10 +1260,7 @@ static void ui_create_prediction_engine_candidate_window (bool vertical) _aux_area = elm_scroller_add (_candidate_window); elm_scroller_bounce_set (_aux_area, 1, 0); elm_scroller_policy_set (_aux_area, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF); - if (vertical) - evas_object_resize (_aux_area, _aux_port_width, _aux_height); - else - evas_object_resize (_aux_area, _screen_width - 2*_blank_width, _aux_height); + evas_object_resize (_aux_area, _aux_port_width, _aux_height); evas_object_move (_aux_area, _blank_width, 0); _aux_table = elm_table_add (_candidate_window); @@ -1357,9 +1286,8 @@ static void ui_create_prediction_engine_candidate_window (bool vertical) * @brief Create candidate window. * * @param style The candidate window style. - * @param vertical An indicator for vertical window or horizontal window. */ -static void ui_create_candidate_window (ISF_CANDIDATE_STYLE_T style, bool vertical) +static void ui_create_candidate_window (ISF_CANDIDATE_STYLE_T style) { check_time ("\nEnter ui_create_candidate_window"); SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; @@ -1368,7 +1296,7 @@ static void ui_create_candidate_window (ISF_CANDIDATE_STYLE_T style, bool vertic _candidate_angle = 0; - ui_create_prediction_engine_candidate_window (vertical); + ui_create_prediction_engine_candidate_window (); check_time ("Exit ui_create_candidate_window"); } @@ -1394,16 +1322,6 @@ static void ui_destroy_candidate_window (void) evas_object_del (_candidate_items [i]); _candidate_items [i] = NULL; } - - if (_candidate_table_items [i]) { - elm_toolbar_item_del (_candidate_table_items [i]); - _candidate_table_items [i] = NULL; - } - - if (_candidate_seperator_items [i]) { - elm_toolbar_item_del (_candidate_seperator_items [i]); - _candidate_seperator_items [i] = NULL; - } } _aux_items.clear (); @@ -1516,17 +1434,9 @@ static void ui_settle_candidate_window (void) } if (_candidate_angle == 90 || _candidate_angle == 270) { - if (_candidate_vertical) { - spot_y = (_screen_height - width) / 2; - } else { - spot_y = 0; - } + spot_y = (_screen_height - width) / 2; } else { - if (_candidate_vertical) { - spot_x = (_screen_width - width) / 2; - } else { - spot_x = 0; - } + spot_x = (_screen_width - width) / 2; } if (spot_x != x || spot_y != y) { @@ -1761,7 +1671,7 @@ static void slot_focus_in (void) SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; if (!_candidate_window) { - ui_create_candidate_window (_candidate_style, _candidate_vertical); + ui_create_candidate_window (_candidate_style); } } @@ -2000,8 +1910,7 @@ static void slot_update_aux_string (const String &str, const AttributeList &attr * @param table_items The table items for candidate or associate. * @param seperator_items The seperator items for candidate or associate. */ -static void update_table (const int table_type, const LookupTable &table, - Elm_Toolbar_Item *table_items[], Elm_Toolbar_Item *seperator_items[]) +static void update_table (const int table_type, const LookupTable &table) { SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; @@ -2011,7 +1920,7 @@ static void update_table (const int table_type, const LookupTable &table, int i, x, y, width, height, item_width, item_number, item_0_width; int item_num = table.get_current_page_size (); - if (_candidate_vertical) { + { _more_list.clear (); if (_candidate_angle == 90 || _candidate_angle == 270) @@ -2098,33 +2007,6 @@ static void update_table (const int table_type, const LookupTable &table, ui_more_window_update (); } - } else { - for (i = 0; i < SCIM_LOOKUP_TABLE_MAX_PAGESIZE; ++i) { - if (i < item_num) { - wcs = table.get_candidate_in_current_page (i); - mbs = utf8_wcstombs (wcs); - - if (table_items [i]) { - elm_toolbar_item_label_set (table_items [i], mbs.c_str ()); - } else { - if (i > 0) { - seperator_items [i] = elm_toolbar_item_append (_candidate_toolbar, NULL, mbs.c_str (), NULL, NULL); - elm_toolbar_item_separator_set (seperator_items [i], 1); - } - - table_items [i] = elm_toolbar_item_append (_candidate_toolbar, NULL, mbs.c_str (), ui_horizontal_candidate_item_click_cb, GINT_TO_POINTER (i)); - } - } else { - if (table_items [i]) { - elm_toolbar_item_del (table_items [i]); - table_items [i] = NULL; - } - if (seperator_items [i]) { - elm_toolbar_item_del (seperator_items [i]); - seperator_items [i] = NULL; - } - } - } } } @@ -2147,7 +2029,7 @@ static void slot_update_candidate_table (const LookupTable &table) slot_show_candidate_table (); } - update_table (ISF_CANDIDATE_TABLE, table, _candidate_table_items, _candidate_seperator_items); + update_table (ISF_CANDIDATE_TABLE, table); } /** @@ -3039,8 +2921,6 @@ int main (int argc, char *argv []) for (i = 0; i < SCIM_LOOKUP_TABLE_MAX_PAGESIZE; i++) { _candidate_0 [i] = NULL; _candidate_items [i] = NULL; - _candidate_table_items [i] = NULL; - _candidate_seperator_items [i] = NULL; } efl_get_screen_size (_screen_width, _screen_height); diff --git a/ism/extras/efl_setting/include/isf_setting_efl.h b/ism/extras/efl_setting/include/isf_setting_efl.h index 86fc741..0f8757b 100644 --- a/ism/extras/efl_setting/include/isf_setting_efl.h +++ b/ism/extras/efl_setting/include/isf_setting_efl.h @@ -34,10 +34,10 @@ struct ug_data { Evas_Object *layout_main; Evas_Object *naviframe; Evas_Object *opt_eo; - Elm_Genlist_Item *sw_ise_item_tizen; //sw - Elm_Genlist_Item *hw_ise_item_tizen; //hw - Elm_Genlist_Item *sw_ise_opt_item_tizen; //sw opt - Elm_Genlist_Item *hw_ise_opt_item_tizen; //hw opt + Elm_Object_Item *sw_ise_item_tizen; //sw + Elm_Object_Item *hw_ise_item_tizen; //hw + Elm_Object_Item *sw_ise_opt_item_tizen; //sw opt + Elm_Object_Item *hw_ise_opt_item_tizen; //hw opt void (*key_end_cb)(void *, Evas_Object *, void *); struct ui_gadget *ug; }; diff --git a/ism/extras/efl_setting/isf_setting_efl.cpp b/ism/extras/efl_setting/isf_setting_efl.cpp index 2581177..9576e53 100644 --- a/ism/extras/efl_setting/isf_setting_efl.cpp +++ b/ism/extras/efl_setting/isf_setting_efl.cpp @@ -63,7 +63,6 @@ using namespace scim; #define SETTING_LOCALEDIR "/opt/ug/res/locale" #define _T(s) dgettext(SETTING_PACKAGE, s) - enum { F_CONNECTION_AUTO = 0, F_CONNECTION_ALWAYS_USED, @@ -134,7 +133,6 @@ extern std::vector _uuids; extern std::vector _module_names; extern std::vector _langs; - static Evas_Object *_gl_icon_get(void *data, Evas_Object *obj, const char *part); static char *_gl_label_get(void *data, Evas_Object *obj, const char *part); static Eina_Bool _gl_state_get(void *data, Evas_Object *obj, const char *part); @@ -153,14 +151,14 @@ static void _hw_radio_cb (void *data, Evas_Object *obj, void *event_info); static Evas_Object *_create_bg(Evas_Object *win) { Evas_Object *bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_weight_set (bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); return bg; } static Evas_Object *create_fullview (Evas_Object *parent, struct ug_data *ugd) { - Evas_Object *bg = _create_bg(parent); + Evas_Object *bg = _create_bg (parent); Evas_Object *layout_main = NULL; layout_main = elm_layout_add (parent); @@ -168,7 +166,7 @@ static Evas_Object *create_fullview (Evas_Object *parent, struct ug_data *ugd) return NULL; elm_layout_theme_set (layout_main, "layout", "application", "default"); - elm_object_style_set(bg, "group_list"); + elm_object_style_set (bg, "group_list"); elm_object_part_content_set (layout_main, "elm.swallow.bg", bg); return layout_main; @@ -176,13 +174,13 @@ static Evas_Object *create_fullview (Evas_Object *parent, struct ug_data *ugd) static Evas_Object *create_frameview (Evas_Object *parent, struct ug_data *ugd) { - Evas_Object *bg = _create_bg(parent); + Evas_Object *bg = _create_bg (parent); Evas_Object *layout_main = elm_layout_add (parent); if (layout_main == NULL) return NULL; elm_layout_theme_set (layout_main, "layout", "application", "default"); - elm_object_style_set(bg, "group_list"); + elm_object_style_set (bg, "group_list"); elm_object_part_content_set (layout_main, "elm.swallow.bg", bg); return layout_main; } @@ -353,9 +351,9 @@ static void sw_keyboard_selection_view_back_cb (void *data, Evas_Object *obj, vo static void update_isf_setting_main_view(ug_data *ugd) { p_items[SW_KEYBOARD_SEL_ITEM]->sub_text = strdup(_active_ise_name); - elm_genlist_item_data_set(ugd->sw_ise_item_tizen,p_items[SW_KEYBOARD_SEL_ITEM]); + elm_object_item_data_set (ugd->sw_ise_item_tizen, p_items[SW_KEYBOARD_SEL_ITEM]); p_items[HW_KEYBOARD_SEL_ITEM]->sub_text = strdup(_active_hw_ise_name); - elm_genlist_item_data_set(ugd->hw_ise_item_tizen,p_items[HW_KEYBOARD_SEL_ITEM]); + elm_object_item_data_set (ugd->hw_ise_item_tizen, p_items[HW_KEYBOARD_SEL_ITEM]); } static void sw_keyboard_selection_view_set_cb (void *data, Evas_Object *obj, void *event_info) @@ -411,32 +409,32 @@ static void show_lang_cb (void *data, Evas_Object *obj, void *event_info) std::vector langlist_vec,normal_langlist_vec; scim_split_string_list(langlist_vec,langlist_str); normal_langlist_str = ((scim_get_language_name(langlist_vec[0].c_str())).c_str()) ; - for (unsigned int i = 1;inaviframe); - elm_scroller_bounce_set(scroller, EINA_FALSE, EINA_FALSE); + elm_scroller_bounce_set (scroller, EINA_FALSE, EINA_FALSE); Evas_Object* layout = elm_layout_add(common_ugd->naviframe); - elm_layout_file_set(layout, ISF_SETTING_EDJ, "isfsetting/languageview"); + elm_layout_file_set (layout, ISF_SETTING_EDJ, "isfsetting/languageview"); Evas_Object *label = elm_label_add(layout); - elm_label_line_wrap_set(label, ELM_WRAP_WORD); + elm_label_line_wrap_set (label, ELM_WRAP_WORD); Evas_Coord win_w = 0, win_h = 0; ecore_x_window_size_get(ecore_x_window_root_first_get(), &win_w, &win_h); - elm_label_wrap_width_set(label, win_w - PADDING_X * 2); - elm_object_text_set(label, normal_langlist_str.c_str()); - elm_object_part_content_set(layout, "content", label); + elm_label_wrap_width_set (label, win_w - PADDING_X * 2); + elm_object_text_set (label, normal_langlist_str.c_str()); + elm_object_part_content_set (layout, "content", label); elm_object_content_set (scroller, layout); //Push the layout along with function buttons and title Elm_Object_Item *it = elm_naviframe_item_push(common_ugd->naviframe, _T(sw_iselist[index].c_str()), NULL, NULL, scroller, NULL); - Evas_Object *back_btn = elm_object_item_content_part_get (it, ELM_NAVIFRAME_ITEM_PREV_BTN); + Evas_Object *back_btn = elm_object_item_part_content_get (it, ELM_NAVIFRAME_ITEM_PREV_BTN); evas_object_smart_callback_add (back_btn, "clicked", lang_view_back_cb, NULL); common_ugd->key_end_cb = lang_view_back_cb; @@ -465,7 +463,7 @@ static Evas_Object *_gl_icon_get(void *data, Evas_Object *obj, const char *part) Evas_Object *onoff_ck = elm_check_add(obj); elm_object_style_set (onoff_ck, "on&off"); if (item_data->mode == AUTO_CAPITALIZATION_ITEM) { - elm_check_state_set(onoff_ck,f_auto_capitalization); + elm_check_state_set (onoff_ck,f_auto_capitalization); } evas_object_smart_callback_add (onoff_ck, "changed", _onoff_cb, (void *)(item_data->mode)); return onoff_ck; @@ -486,8 +484,8 @@ static void _gl_del(void *data, Evas_Object *obj) static void _gl_sw_ise_sel(void *data, Evas_Object *obj, void *event_info) { - Elm_Genlist_Item *item = (Elm_Genlist_Item *)event_info; - elm_genlist_item_selected_set(item, EINA_FALSE); + Elm_Object_Item *item = (Elm_Object_Item *)event_info; + elm_genlist_item_selected_set (item, EINA_FALSE); mark = (int) (data); set_active_ise(mark); @@ -499,8 +497,8 @@ static void _gl_sw_ise_sel(void *data, Evas_Object *obj, void *event_info) static void _gl_hw_ise_sel(void *data, Evas_Object *obj, void *event_info) { - Elm_Genlist_Item *item = (Elm_Genlist_Item *)event_info; - elm_genlist_item_selected_set(item, EINA_FALSE); + Elm_Object_Item *item = (Elm_Object_Item *)event_info; + elm_genlist_item_selected_set (item, EINA_FALSE); hw_mark = (int) (data); snprintf (_active_hw_ise_name, sizeof (_active_hw_ise_name), "%s", hw_iselist[hw_mark].c_str ()); @@ -512,8 +510,8 @@ static void _gl_hw_ise_sel(void *data, Evas_Object *obj, void *event_info) static void _gl_sel(void *data, Evas_Object *obj, void *event_info) { - Elm_Genlist_Item *item = (Elm_Genlist_Item *)event_info; - elm_genlist_item_selected_set(item, EINA_FALSE); + Elm_Object_Item *item = (Elm_Object_Item *)event_info; + elm_genlist_item_selected_set (item, EINA_FALSE); int id = (int) (data); @@ -529,19 +527,19 @@ static void _gl_sel(void *data, Evas_Object *obj, void *event_info) static void _gl_keyboard_sel(void *data, Evas_Object *obj, void *event_info) { - Elm_Genlist_Item *item = (Elm_Genlist_Item *)event_info; + Elm_Object_Item *item = (Elm_Object_Item *)event_info; ug_data *ugd = (ug_data *)data; if (item == ugd->sw_ise_item_tizen) sw_keyboard_selection_view_tizen (ugd); if (item == ugd->hw_ise_item_tizen) hw_keyboard_selection_view_tizen(ugd); - elm_genlist_item_selected_set(item, EINA_FALSE); + elm_genlist_item_selected_set (item, EINA_FALSE); return; } static void _gl_ise_option_sel(void *data, Evas_Object *obj, void *event_info) { - Elm_Genlist_Item *item = (Elm_Genlist_Item *)event_info; + Elm_Object_Item *item = (Elm_Object_Item *)event_info; ug_data *ugd = (ug_data *)data; const char *isename = NULL; if (item == ugd->sw_ise_opt_item_tizen) @@ -549,7 +547,7 @@ static void _gl_ise_option_sel(void *data, Evas_Object *obj, void *event_info) else isename = _active_hw_ise_name; show_ise_option_module(ugd, isename); - elm_genlist_item_selected_set(item, EINA_FALSE); + elm_genlist_item_selected_set (item, EINA_FALSE); } static char *_gl_exp_sw_label_get(void *data, Evas_Object *obj, const char *part) @@ -579,7 +577,7 @@ static Evas_Object *_gl_exp_sw_icon_get(void *data, Evas_Object *obj, const char } if (!strcmp(part,"elm.icon.2")) { Evas_Object *icon = elm_button_add(obj); - elm_object_style_set(icon, "reveal"); + elm_object_style_set (icon, "reveal"); evas_object_smart_callback_add (icon, "clicked", show_lang_cb, (void *)(index)); evas_object_propagate_events_set (icon, EINA_FALSE);//not propagate to genlist item. return icon; @@ -631,7 +629,7 @@ static void sw_keyboard_selection_view_tizen(ug_data * ugd) //Push the layout along with function buttons and title Elm_Object_Item *it = elm_naviframe_item_push(ugd->naviframe, _T("Selection"), NULL, NULL, genlist, NULL); - Evas_Object *back_btn = elm_object_item_content_part_get (it, ELM_NAVIFRAME_ITEM_PREV_BTN); + Evas_Object *back_btn = elm_object_item_part_content_get (it, ELM_NAVIFRAME_ITEM_PREV_BTN); evas_object_smart_callback_add (back_btn, "clicked", sw_keyboard_selection_view_set_cb, ugd); unsigned int i = 0; @@ -646,13 +644,13 @@ static void sw_keyboard_selection_view_tizen(ug_data * ugd) if (sw_iselist.size () > 0) { // Set item class for dialogue group seperator itcSeparator.item_style = "dialogue/separator/21/with_line"; - itcSeparator.func.label_get = NULL; - itcSeparator.func.icon_get = NULL; + itcSeparator.func.text_get = NULL; + itcSeparator.func.content_get = NULL; itcSeparator.func.state_get = NULL; itcSeparator.func.del = NULL; //separator - Elm_Genlist_Item *item; + Elm_Object_Item *item; item = elm_genlist_item_append( genlist, // genlist object &itcSeparator, // item class @@ -661,7 +659,7 @@ static void sw_keyboard_selection_view_tizen(ug_data * ugd) ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_genlist_item_display_only_set(item, EINA_TRUE); + elm_genlist_item_display_only_set (item, EINA_TRUE); } for (i = 0; i < sw_iselist.size (); i++) { @@ -673,8 +671,8 @@ static void sw_keyboard_selection_view_tizen(ug_data * ugd) //set item class for 1text.1icon(text+radiobutton) itc4.item_style = "dialogue/1text.2icon.2"; - itc4.func.label_get = _gl_exp_sw_label_get; - itc4.func.icon_get = _gl_exp_sw_icon_get; + itc4.func.text_get = _gl_exp_sw_label_get; + itc4.func.content_get = _gl_exp_sw_icon_get; itc4.func.state_get = _gl_state_get; itc4.func.del = _gl_del; for (i = 0;i < sw_iselist.size();i++) { @@ -750,7 +748,7 @@ static void show_ise_option_module(ug_data *ugd , const char *isename) Elm_Object_Item *it = elm_naviframe_item_push (ugd->naviframe, title, NULL, NULL, ugd->opt_eo, NULL); - Evas_Object *back_btn = elm_object_item_content_part_get (it, ELM_NAVIFRAME_ITEM_PREV_BTN); + Evas_Object *back_btn = elm_object_item_part_content_get (it, ELM_NAVIFRAME_ITEM_PREV_BTN); evas_object_smart_callback_add (back_btn, "clicked", ise_option_view_set_cb, ugd); ugd->key_end_cb = ise_option_view_set_cb; } @@ -815,7 +813,7 @@ static void hw_keyboard_selection_view_tizen(ug_data * ugd) //Push the layout along with function buttons and title Elm_Object_Item *nf_it = elm_naviframe_item_push(ugd->naviframe, _T("Selection"), NULL, NULL, genlist, NULL); - Evas_Object *back_btn = elm_object_item_content_part_get (nf_it, ELM_NAVIFRAME_ITEM_PREV_BTN); + Evas_Object *back_btn = elm_object_item_part_content_get (nf_it, ELM_NAVIFRAME_ITEM_PREV_BTN); evas_object_smart_callback_add (back_btn, "clicked", hw_keyboard_selection_view_set_cb, ugd); unsigned int i = 0; @@ -829,13 +827,13 @@ static void hw_keyboard_selection_view_tizen(ug_data * ugd) if (hw_iselist.size () > 0) { // Set item class for dialogue group seperator itcSeparator.item_style = "dialogue/separator/21/with_line"; - itcSeparator.func.label_get = NULL; - itcSeparator.func.icon_get = NULL; + itcSeparator.func.text_get = NULL; + itcSeparator.func.content_get = NULL; itcSeparator.func.state_get = NULL; itcSeparator.func.del = NULL; //separator - Elm_Genlist_Item *item; + Elm_Object_Item *item; item = elm_genlist_item_append( genlist, // genlist object &itcSeparator, // item class @@ -844,7 +842,7 @@ static void hw_keyboard_selection_view_tizen(ug_data * ugd) ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_genlist_item_display_only_set(item, EINA_TRUE); + elm_genlist_item_display_only_set (item, EINA_TRUE); } std::vector::iterator it; @@ -862,8 +860,8 @@ static void hw_keyboard_selection_view_tizen(ug_data * ugd) //set item class for 1text.1icon(text+radiobutton) itc5.item_style = "dialogue/1text.1icon.2"; - itc5.func.label_get = _gl_exp_hw_label_get; - itc5.func.icon_get = _gl_exp_hw_icon_get; + itc5.func.text_get = _gl_exp_hw_label_get; + itc5.func.content_get = _gl_exp_hw_icon_get; itc5.func.state_get = _gl_state_get; itc5.func.del = _gl_del; for (i = 0;i < hw_iselist.size();i++) { @@ -875,7 +873,7 @@ static void hw_keyboard_selection_view_tizen(ug_data * ugd) static Evas_Object *isf_setting_main_view_tizen (ug_data *ugd) { - Elm_Genlist_Item *item = NULL; + Elm_Object_Item *item = NULL; if (ugd->naviframe == NULL) { @@ -885,36 +883,36 @@ static Evas_Object *isf_setting_main_view_tizen (ug_data *ugd) Evas_Object *genlist = elm_genlist_add(ugd->naviframe); //set item class for 1text.1icon(text+radiobutton) itc1.item_style = "dialogue/1text.1icon"; - itc1.func.label_get = _gl_label_get; - itc1.func.icon_get = _gl_icon_get; + itc1.func.text_get = _gl_label_get; + itc1.func.content_get = _gl_icon_get; itc1.func.state_get = _gl_state_get; itc1.func.del = _gl_del; //set item class for 2text(text+subtext) itc2.item_style = "dialogue/2text.3"; - itc2.func.label_get = _gl_label_get; - itc2.func.icon_get = NULL; + itc2.func.text_get = _gl_label_get; + itc2.func.content_get = NULL; itc2.func.state_get = _gl_state_get; itc2.func.del = _gl_del; //set item class for normal text(text) itc3.item_style = "dialogue/1text"; - itc3.func.label_get = _gl_label_get; - itc3.func.icon_get = NULL; + itc3.func.text_get = _gl_label_get; + itc3.func.content_get = NULL; itc3.func.state_get = _gl_state_get; itc3.func.del = _gl_del; // Set item class for dialogue group seperator itcSeparator.item_style = "dialogue/separator/21/with_line"; - itcSeparator.func.label_get = NULL; - itcSeparator.func.icon_get = NULL; + itcSeparator.func.text_get = NULL; + itcSeparator.func.content_get = NULL; itcSeparator.func.state_get = NULL; itcSeparator.func.del = NULL; // Set item class for dialogue group title itcTitle.item_style = "dialogue/title"; - itcTitle.func.label_get = _gl_label_get; - itcTitle.func.icon_get = NULL; + itcTitle.func.text_get = _gl_label_get; + itcTitle.func.content_get = NULL; itcTitle.func.state_get = _gl_state_get; itcTitle.func.del = _gl_del; //==================================group begin ======================= @@ -929,12 +927,12 @@ static Evas_Object *isf_setting_main_view_tizen (ug_data *ugd) ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_genlist_item_display_only_set(item, EINA_TRUE); + elm_genlist_item_display_only_set (item, EINA_TRUE); //group1 item1 item_data = (ItemData *)malloc(sizeof(ItemData)); if (item_data != NULL) { - memset(item_data,0,sizeof(ItemData)); + memset (item_data, 0, sizeof(ItemData)); p_items[AUTO_CAPITALIZATION_ITEM] = item_data; item_data->text = strdup(_T("Auto capitalization")); item_data->mode = AUTO_CAPITALIZATION_ITEM; @@ -951,7 +949,7 @@ static Evas_Object *isf_setting_main_view_tizen (ug_data *ugd) //group2 title item_data = (ItemData *)malloc(sizeof(ItemData)); if (item_data != NULL) { - memset(item_data,0,sizeof(ItemData)); + memset (item_data, 0, sizeof(ItemData)); p_items[SW_KEYBOARD_GROUP_TITLE_ITEM] = item_data; item_data->text = strdup(_T("Software keyboard")); item = elm_genlist_item_append( @@ -962,7 +960,7 @@ static Evas_Object *isf_setting_main_view_tizen (ug_data *ugd) ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_genlist_item_display_only_set(item, EINA_TRUE); + elm_genlist_item_display_only_set (item, EINA_TRUE); } //group2 item1 @@ -974,7 +972,7 @@ static Evas_Object *isf_setting_main_view_tizen (ug_data *ugd) item_data = (ItemData *)malloc(sizeof(ItemData)); if (item_data!=NULL) { - memset(item_data,0,sizeof(ItemData)); + memset (item_data, 0, sizeof(ItemData)); p_items[SW_KEYBOARD_SEL_ITEM] = item_data; item_data->text = strdup(_T("Keyboard selection")); item_data->sub_text = strdup(_active_ise_name); @@ -990,13 +988,13 @@ static Evas_Object *isf_setting_main_view_tizen (ug_data *ugd) (void *)ugd); if (is_hw_connected) - elm_genlist_item_disabled_set(ugd->sw_ise_item_tizen, EINA_TRUE); + elm_object_item_disabled_set (ugd->sw_ise_item_tizen, EINA_TRUE); } //group2 item2 item_data = (ItemData *)malloc(sizeof(ItemData)); if (item_data != NULL) { - memset(item_data,0,sizeof(ItemData)); + memset (item_data, 0, sizeof(ItemData)); p_items[SW_ISE_OPTION_ITEM] = item_data; item_data->text = strdup (_T("Keyboard option")); item_data->mode = SW_ISE_OPTION_ITEM; @@ -1010,13 +1008,13 @@ static Evas_Object *isf_setting_main_view_tizen (ug_data *ugd) (void *)ugd); if (is_hw_connected) - elm_genlist_item_disabled_set(ugd->sw_ise_opt_item_tizen,EINA_TRUE); + elm_object_item_disabled_set (ugd->sw_ise_opt_item_tizen, EINA_TRUE); } //group3 title item_data = (ItemData *)malloc(sizeof(ItemData)); if (item_data != NULL) { - memset(item_data,0,sizeof(ItemData)); + memset (item_data, 0, sizeof(ItemData)); p_items[HW_KEYBOARD_GROUP_TITLE_ITEM] = item_data; item_data->text=strdup(_T("Hardware keyboard")); item = elm_genlist_item_append( @@ -1027,7 +1025,7 @@ static Evas_Object *isf_setting_main_view_tizen (ug_data *ugd) ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_genlist_item_display_only_set(item, EINA_TRUE); + elm_genlist_item_display_only_set (item, EINA_TRUE); } //group3 item1 @@ -1045,7 +1043,7 @@ static Evas_Object *isf_setting_main_view_tizen (ug_data *ugd) item_data = (ItemData *)malloc(sizeof(ItemData)); if (item_data != NULL) { - memset(item_data,0,sizeof(ItemData)); + memset (item_data, 0, sizeof(ItemData)); p_items[HW_KEYBOARD_SEL_ITEM] = item_data; item_data->text = strdup(_T("Keyboard selection")); item_data->sub_text = strdup(_active_hw_ise_name); @@ -1059,14 +1057,14 @@ static Evas_Object *isf_setting_main_view_tizen (ug_data *ugd) (void *)ugd); if (!is_hw_connected) - elm_genlist_item_disabled_set(ugd->hw_ise_item_tizen,EINA_TRUE); + elm_object_item_disabled_set (ugd->hw_ise_item_tizen,EINA_TRUE); } //group3 item2 p_items[HW_ISE_OPTION_ITEM] = NULL; //==================================group end ========================= Evas_Object *back_btn = elm_button_add(ugd->naviframe); - elm_object_style_set(back_btn, "naviframe/back_btn/default"); + elm_object_style_set (back_btn, "naviframe/back_btn/default"); evas_object_smart_callback_add (back_btn, "clicked", back_cb, ugd); elm_naviframe_item_push (ugd->naviframe, _T("Keyboard"), back_btn, NULL, genlist, NULL); @@ -1123,10 +1121,10 @@ static void load_config_module (void) static void hw_connection_change_cb(ug_data *ugd) { //enable / disable switch - elm_genlist_item_disabled_set(ugd->sw_ise_item_tizen,!elm_genlist_item_disabled_get(ugd->sw_ise_item_tizen)); - elm_genlist_item_disabled_set(ugd->sw_ise_opt_item_tizen,!elm_genlist_item_disabled_get(ugd->sw_ise_opt_item_tizen)); - elm_genlist_item_disabled_set(ugd->hw_ise_item_tizen,!elm_genlist_item_disabled_get(ugd->hw_ise_item_tizen)); - elm_genlist_item_disabled_set(ugd->hw_ise_opt_item_tizen,!elm_genlist_item_disabled_get(ugd->hw_ise_opt_item_tizen)); + elm_object_item_disabled_set (ugd->sw_ise_item_tizen, !elm_object_item_disabled_get(ugd->sw_ise_item_tizen)); + elm_object_item_disabled_set (ugd->sw_ise_opt_item_tizen, !elm_object_item_disabled_get(ugd->sw_ise_opt_item_tizen)); + elm_object_item_disabled_set (ugd->hw_ise_item_tizen, !elm_object_item_disabled_get(ugd->hw_ise_item_tizen)); + elm_object_item_disabled_set (ugd->hw_ise_opt_item_tizen, !elm_object_item_disabled_get(ugd->hw_ise_opt_item_tizen)); if (!is_hw_connected) { @@ -1171,7 +1169,7 @@ static void init_hw_keyboard_listener(ug_data *ugd) if (_prop_change_handler) return; _rootwin = ecore_x_window_root_first_get(); - ecore_x_event_mask_set(_rootwin, ECORE_X_EVENT_MASK_WINDOW_PROPERTY); + ecore_x_event_mask_set (_rootwin, ECORE_X_EVENT_MASK_WINDOW_PROPERTY); _prop_change_handler = ecore_event_handler_add (ECORE_X_EVENT_WINDOW_PROPERTY, _prop_change, (void *)ugd); @@ -1424,7 +1422,7 @@ extern "C" continue; } else{ - if (mdl->option_reset(_config) == false) + if (mdl->option_reset (_config) == false) { printf("mdl %s failed to reset option!\n",module_name); if (mdl) diff --git a/ism/extras/efl_setting/isf_setting_wizard.cpp b/ism/extras/efl_setting/isf_setting_wizard.cpp index 380bd63..287b279 100644 --- a/ism/extras/efl_setting/isf_setting_wizard.cpp +++ b/ism/extras/efl_setting/isf_setting_wizard.cpp @@ -108,7 +108,7 @@ static Evas_Object *create_fullview (Evas_Object *parent, struct ug_data *ugd) elm_layout_theme_set (layout_main, "layout","application","default"); elm_object_style_set(bg, "group_list"); - elm_layout_content_set (layout_main, "elm.swallow.bg", bg); + elm_object_part_content_set (layout_main, "elm.swallow.bg", bg); return layout_main; } @@ -121,7 +121,7 @@ static Evas_Object *create_frameview (Evas_Object *parent, struct ug_data *ugd) return NULL; elm_layout_theme_set (layout_main, "layout", "application", "default"); elm_object_style_set(bg, "group_list"); - elm_layout_content_set (layout_main, "elm.swallow.bg", bg); + elm_object_part_content_set (layout_main, "elm.swallow.bg", bg); return layout_main; } @@ -138,7 +138,7 @@ static void back_cb (void *data, Evas_Object *obj, void *event_info) static Evas_Object* _create_naviframe_layout (Evas_Object* parent) { Evas_Object *naviframe = elm_naviframe_add (parent); - elm_layout_content_set (parent, "elm.swallow.content", naviframe); + elm_object_part_content_set (parent, "elm.swallow.content", naviframe); evas_object_show (naviframe); return naviframe; @@ -224,7 +224,7 @@ static void sw_keyboard_selection_view_set_cb (void *data, Evas_Object *obj, voi static void _gl_sel(void *data, Evas_Object *obj, void *event_info) { - Elm_Genlist_Item *item = (Elm_Genlist_Item *)event_info; + Elm_Object_Item *item = (Elm_Object_Item *)event_info; elm_genlist_item_selected_set(item, 0); mark = (int) (data); snprintf (_active_ise_name, sizeof (_active_ise_name), "%s", sw_iselist[mark].c_str ()); @@ -328,13 +328,13 @@ static Evas_Object *isf_setting_main_view_tizen(ug_data * ugd) if (sw_iselist.size () > 0) { // Set item class for dialogue group seperator itcSeparator.item_style = "dialogue/separator/21/with_line"; - itcSeparator.func.label_get = NULL; - itcSeparator.func.icon_get = NULL; + itcSeparator.func.text_get = NULL; + itcSeparator.func.content_get = NULL; itcSeparator.func.state_get = NULL; itcSeparator.func.del = NULL; //separator - Elm_Genlist_Item *item; + Elm_Object_Item *item; item = elm_genlist_item_append( genlist, // genlist object &itcSeparator, // item class @@ -355,8 +355,8 @@ static Evas_Object *isf_setting_main_view_tizen(ug_data * ugd) //set item class for 1text.1icon(text+radiobutton) itc1.item_style = "dialogue/1text.1icon.2"; - itc1.func.label_get = _gl_label_get; - itc1.func.icon_get = _gl_icon_get; + itc1.func.text_get = _gl_label_get; + itc1.func.content_get = _gl_icon_get; itc1.func.state_get = _gl_state_get; itc1.func.del = _gl_del; for (i = 0;i < sw_iselist.size();i++) { @@ -425,7 +425,7 @@ static void *on_create (struct ui_gadget *ug, enum ug_mode mode, bundle *data, v if (ugd->layout_main != NULL) { content = isf_setting_main_view_tizen(ugd); - elm_layout_content_set (ugd->layout_main, "elm.swallow.content", content); + elm_object_part_content_set (ugd->layout_main, "elm.swallow.content", content); } return (void *)ugd->layout_main; } diff --git a/ism/src/scim_helper.cpp b/ism/src/scim_helper.cpp index bc4738a..b667e78 100644 --- a/ism/src/scim_helper.cpp +++ b/ism/src/scim_helper.cpp @@ -148,15 +148,6 @@ public: HelperAgentSignalInt signal_update_associate_table_page_size; HelperAgentSignalVoid signal_reset_ise_context; HelperAgentSignalUintVoid signal_set_screen_direction; - HelperAgentSignalRawVoid signal_set_indicator_char_count; - HelperAgentSignalRawVoid signal_set_im_embedded_editor_im_button_label; - HelperAgentSignalRawVoid signal_set_im_embedded_editor_preset_text; - HelperAgentSignalRawVoid signal_set_im_embedded_editor_text; - HelperAgentSignalUintVoid signal_set_im_embedded_editor_max_length; - HelperAgentSignalUintVoid signal_set_im_embedded_editor_button_senstivity; - HelperAgentSignalIntUint signal_set_im_embedded_editor_progress_bar; - HelperAgentSignalGetIMDataVoid signal_get_im_embedded_editor_text; - HelperAgentSignalRawVoid signal_set_im_indicator_count_label; HelperAgentSignalUintVoid signal_turn_on_log; public: @@ -759,92 +750,6 @@ HelperAgent::filter_event () m_impl->signal_set_screen_direction (this, direction); break; } - case ISM_TRANS_CMD_SET_INDICATOR_CHAR_COUNT: - { - char *buf = NULL; - size_t len; - if (m_impl->recv.get_data (&buf, len)) - m_impl->signal_set_indicator_char_count (this, buf, len); - if (buf) - delete [] buf; - break; - } - case ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_IM_BUTTON_SET_LABEL: - { - char *buf = NULL; - size_t len; - if (m_impl->recv.get_data (&buf, len)) - m_impl->signal_set_im_embedded_editor_im_button_label (this, buf, len); - if (buf) - delete [] buf; - break; - } - case ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_SET_PRESET_TEXT: - { - char *buf = NULL; - size_t len; - if (m_impl->recv.get_data (&buf, len)) - m_impl->signal_set_im_embedded_editor_preset_text (this, buf, len); - if (buf) - delete [] buf; - break; - } - case ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_SET_TEXT: - { - char *buf = NULL; - size_t len; - if (m_impl->recv.get_data (&buf, len)) - m_impl->signal_set_im_embedded_editor_text (this, buf, len); - if (buf) - delete [] buf; - break; - } - case ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_SET_MAX_LENGTH: - { - uint32 length; - - if (m_impl->recv.get_data (length)) - m_impl->signal_set_im_embedded_editor_max_length (this, length); - break; - } - case ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_BUTTON_SENSTIVITY: - { - uint32 senstivity; - - if (m_impl->recv.get_data (senstivity)) - m_impl->signal_set_im_embedded_editor_button_senstivity (this, senstivity); - break; - } - case ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_PROGRESS_BAR: - { - uint32 timeout,is_showing; - - if (m_impl->recv.get_data (timeout) && m_impl->recv.get_data (is_showing) ) - m_impl->signal_set_im_embedded_editor_progress_bar (this, timeout,is_showing); - break; - } - case ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_GET_TEXT: - { - char *buf = NULL; - size_t len = 0; - - m_impl->signal_get_im_embedded_editor_text (this, &buf, len); - m_impl->send.clear (); - m_impl->send.put_command (SCIM_TRANS_CMD_REPLY); - m_impl->send.put_data (buf, len); - m_impl->send.write_to_socket (m_impl->socket); - break; - } - case ISM_TRANS_CMD_IM_INDICATOR_SET_COUNT_LABEL: - { - char *buf = NULL; - size_t len; - if (m_impl->recv.get_data (&buf, len)) - m_impl->signal_set_im_indicator_count_label (this, buf, len); - if (buf) - delete [] buf; - break; - } case ISM_TRANS_CMD_TURN_ON_LOG: { uint32 isOn; diff --git a/ism/src/scim_panel_agent.cpp b/ism/src/scim_panel_agent.cpp index 785d136..eefc217 100644 --- a/ism/src/scim_panel_agent.cpp +++ b/ism/src/scim_panel_agent.cpp @@ -1455,192 +1455,6 @@ public: return false; } - bool set_helper_im_embedded_editor_im_button_set_label (const String &uuid, char *data, size_t &len) - { - HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid); - - if (it != m_helper_client_index.end ()) - { - int client = -1; - uint32 context = 0; - Socket client_socket (it->second.id); - uint32 ctx; - - get_focused_context (client, context); - ctx = get_helper_ic (client, context); - - m_send_trans.clear (); - m_send_trans.put_command (SCIM_TRANS_CMD_REPLY); - m_send_trans.put_data (ctx); - m_send_trans.put_data (uuid); - m_send_trans.put_command (ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_IM_BUTTON_SET_LABEL); - m_send_trans.put_data (data, len); - m_send_trans.write_to_socket (client_socket); - return true; - } - return false; - } - - bool set_helper_im_embedded_editor_set_preset_text (const String &uuid, char *data, size_t &len) - { - HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid); - - if (it != m_helper_client_index.end ()) - { - int client = -1; - uint32 context = 0; - Socket client_socket (it->second.id); - uint32 ctx; - - get_focused_context (client, context); - ctx = get_helper_ic (client, context); - - m_send_trans.clear (); - m_send_trans.put_command (SCIM_TRANS_CMD_REPLY); - m_send_trans.put_data (ctx); - m_send_trans.put_data (uuid); - m_send_trans.put_command (ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_SET_PRESET_TEXT); - m_send_trans.put_data (data, len); - m_send_trans.write_to_socket (client_socket); - return true; - } - return false; - } - - bool set_helper_im_embedded_editor_set_text (const String &uuid, char *data, size_t &len) - { - HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid); - - if (it != m_helper_client_index.end ()) - { - int client = -1; - uint32 context = 0; - Socket client_socket (it->second.id); - uint32 ctx; - - get_focused_context (client, context); - ctx = get_helper_ic (client, context); - - m_send_trans.clear (); - m_send_trans.put_command (SCIM_TRANS_CMD_REPLY); - m_send_trans.put_data (ctx); - m_send_trans.put_data (uuid); - m_send_trans.put_command (ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_SET_TEXT); - m_send_trans.put_data (data, len); - m_send_trans.write_to_socket (client_socket); - return true; - } - return false; - } - - bool set_helper_im_embedded_editor_set_max_length (const String &uuid, uint32 &length) - { - HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid); - - if (it != m_helper_client_index.end ()) - { - int client; - uint32 context; - Socket client_socket (it->second.id); - uint32 ctx; - - get_focused_context (client, context); - ctx = get_helper_ic (client, context); - - m_send_trans.clear (); - m_send_trans.put_command (SCIM_TRANS_CMD_REPLY); - m_send_trans.put_data (ctx); - m_send_trans.put_data (uuid); - m_send_trans.put_command (ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_SET_MAX_LENGTH); - m_send_trans.put_data (length); - m_send_trans.write_to_socket (client_socket); - return true; - } - - return false; - } - - bool set_helper_im_embedded_editor_set_button_senstivity(const String &uuid, uint32 &senstivity) - { - HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid); - - if (it != m_helper_client_index.end ()) - { - int client; - uint32 context; - Socket client_socket (it->second.id); - uint32 ctx; - - get_focused_context (client, context); - ctx = get_helper_ic (client, context); - - m_send_trans.clear (); - m_send_trans.put_command (SCIM_TRANS_CMD_REPLY); - m_send_trans.put_data (ctx); - m_send_trans.put_data (uuid); - m_send_trans.put_command (ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_BUTTON_SENSTIVITY); - m_send_trans.put_data (senstivity); - m_send_trans.write_to_socket (client_socket); - return true; - } - - return false; - } - - bool set_helper_im_embedded_editor_set_progress_bar(const String &uuid, uint32 &timeout,uint32 &is_showing) - { - HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid); - - if (it != m_helper_client_index.end ()) - { - int client; - uint32 context; - Socket client_socket (it->second.id); - uint32 ctx; - - get_focused_context (client, context); - ctx = get_helper_ic (client, context); - - m_send_trans.clear (); - m_send_trans.put_command (SCIM_TRANS_CMD_REPLY); - m_send_trans.put_data (ctx); - m_send_trans.put_data (uuid); - m_send_trans.put_command (ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_PROGRESS_BAR); - m_send_trans.put_data (timeout); - m_send_trans.put_data (is_showing); - m_send_trans.write_to_socket (client_socket); - return true; - } - - return false; - } - - bool set_helper_im_indicator_count_label (const String &uuid, char *data, size_t &len) - { - HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid); - - if (it != m_helper_client_index.end ()) - { - int client = -1; - uint32 context = 0; - Socket client_socket (it->second.id); - uint32 ctx; - - get_focused_context (client, context); - ctx = get_helper_ic (client, context); - - m_send_trans.clear (); - m_send_trans.put_command (SCIM_TRANS_CMD_REPLY); - m_send_trans.put_data (ctx); - m_send_trans.put_data (uuid); - m_send_trans.put_command (ISM_TRANS_CMD_IM_INDICATOR_SET_COUNT_LABEL); - m_send_trans.put_data (data, len); - m_send_trans.write_to_socket (client_socket); - return true; - } - return false; - } - void show_isf_panel (int client_id) { SCIM_DEBUG_MAIN(4) << "PanelAgent::show_isf_panel ()\n"; @@ -1792,44 +1606,6 @@ public: return false; } - bool get_helper_im_embedded_editor_text (String &uuid, char **buf, size_t &len) - { - HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid); - - if (it != m_helper_client_index.end ()) { - - int client; - uint32 context; - Socket client_socket (it->second.id); - uint32 ctx; - Transaction trans; - - get_focused_context (client, context); - ctx = get_helper_ic (client, context); - - trans.clear (); - trans.put_command (SCIM_TRANS_CMD_REPLY); - trans.put_data (ctx); - trans.put_data (uuid); - trans.put_command (ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_GET_TEXT); - - int cmd; - if (trans.write_to_socket (client_socket) - && trans.read_from_socket (client_socket) - && trans.get_command(cmd) && cmd == SCIM_TRANS_CMD_REPLY - && trans.get_data (buf, len)) - { - SCIM_DEBUG_MAIN (1) << "get_helper_im_embedded_editor_text success\n"; - return true; - } - else - { - std::cerr << "get_helper_im_embedded_editor_text failed\n"; - } - } - return false; - } - bool get_helper_layout (String &uuid, uint32 &layout) { HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid); @@ -2028,139 +1804,6 @@ public: delete [] imdata; } - void set_ise_im_embedded_editor_im_button_set_label (int client_id) - { - SCIM_DEBUG_MAIN(4) << "PanelAgent::set_ise_im_embedded_editor_im_button_set_label ()\n"; - char *data = NULL; - size_t len; - - if (m_recv_trans.get_data (&data, len)) - { - if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) - set_helper_im_embedded_editor_im_button_set_label (m_current_helper_uuid, data, len); - } - - if (NULL != data) - delete [] data; - } - - void set_ise_im_embedded_editor_set_preset_text (int client_id) - { - SCIM_DEBUG_MAIN(4) << "PanelAgent::set_ise_im_embedded_editor_set_preset_text ()\n"; - char *data = NULL; - size_t len; - - if (m_recv_trans.get_data (&data, len)) - { - if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) - set_helper_im_embedded_editor_set_preset_text (m_current_helper_uuid, data, len); - } - - if (NULL != data) - delete [] data; - } - - void set_ise_im_embedded_editor_set_text (int client_id) - { - SCIM_DEBUG_MAIN(4) << "PanelAgent::set_ise_im_embedded_editor_set_text ()\n"; - char *data = NULL; - size_t len; - - if (m_recv_trans.get_data (&data, len)) - { - if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) - set_helper_im_embedded_editor_set_text (m_current_helper_uuid, data, len); - } - - if (NULL != data) - delete [] data; - } - - void set_ise_im_embedded_editor_set_max_length (int client_id) - { - SCIM_DEBUG_MAIN(4) << "PanelAgent::set_ise_im_embedded_editor_set_max_length ()\n"; - uint32 length; - - if (m_recv_trans.get_data (length)) - { - if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) - set_helper_im_embedded_editor_set_max_length (m_current_helper_uuid, length); - } - } - - void set_ise_im_embedded_editor_set_button_senstivity (int client_id) - { - SCIM_DEBUG_MAIN(4) << "PanelAgent::set_ise_im_embedded_editor_set_button_senstivity ()\n"; - uint32 senstivity; - if (m_recv_trans.get_data (senstivity)) - { - if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) - set_helper_im_embedded_editor_set_button_senstivity (m_current_helper_uuid, senstivity); - } - } - - void set_ise_im_embedded_editor_set_progress_bar (int client_id) - { - SCIM_DEBUG_MAIN(4) << "PanelAgent::set_ise_im_embedded_editor_set_progress_bar ()\n"; - uint32 timeout,is_showing; - if (m_recv_trans.get_data (timeout) && m_recv_trans.get_data (is_showing)) - { - if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) - set_helper_im_embedded_editor_set_progress_bar (m_current_helper_uuid, timeout,is_showing); - } - } - - void get_ise_im_embedded_editor_text (int client_id) - { - SCIM_DEBUG_MAIN(4) << "PanelAgent::get_ise_im_embedded_editor_text ()\n"; - char *buf = NULL; - size_t len; - bool ret = false; - - TOOLBAR_MODE_T mode; - - mode = m_current_toolbar_mode; - - if (TOOLBAR_HELPER_MODE == mode) - { - ret = get_helper_im_embedded_editor_text (m_current_helper_uuid, &buf, len); - } - - Transaction trans; - Socket client_socket (client_id); - - trans.clear (); - trans.put_command (SCIM_TRANS_CMD_REPLY); - if (ret) - { - trans.put_command (SCIM_TRANS_CMD_OK); - trans.put_data (buf, len); - } - else - trans.put_command (SCIM_TRANS_CMD_FAIL); - - trans.write_to_socket (client_socket); - - if (NULL != buf) - delete [] buf; - } - - void set_ise_im_indicator_count_label (int client_id) - { - SCIM_DEBUG_MAIN(4) << "PanelAgent::set_ise_im_indicator_count_label ()\n"; - char *data = NULL; - size_t len; - - if (m_recv_trans.get_data (&data, len)) - { - if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) - set_helper_im_indicator_count_label (m_current_helper_uuid, data, len); - } - - if (NULL != data) - delete [] data; - } - void get_ise_imdata (int client_id) { SCIM_DEBUG_MAIN(4) << "PanelAgent::get_ise_imdata ()\n"; @@ -2416,48 +2059,6 @@ public: return client >= 0; } - bool set_helper_char_count (const String &uuid, char *buf, size_t &len) - { - HelperClientIndex::iterator it = m_helper_client_index.find (m_current_helper_uuid); - - if (it != m_helper_client_index.end ()) - { - int client = -1; - uint32 context = 0; - Socket client_socket (it->second.id); - uint32 ctx; - - get_focused_context (client, context); - ctx = get_helper_ic (client, context); - - m_send_trans.clear (); - m_send_trans.put_command (SCIM_TRANS_CMD_REPLY); - m_send_trans.put_data (ctx); - m_send_trans.put_data (uuid); - m_send_trans.put_command (ISM_TRANS_CMD_SET_INDICATOR_CHAR_COUNT); - m_send_trans.put_data (buf, len); - m_send_trans.write_to_socket (client_socket); - return true; - } - return false; - } - - void set_ise_char_count (int client_id) - { - SCIM_DEBUG_MAIN(4) << "PanelAgent::set_ise_char_count ()\n"; - char *buf = NULL; - size_t len; - - if (m_recv_trans.get_data (&buf, len)) - { - if (TOOLBAR_HELPER_MODE == m_current_toolbar_mode) - set_helper_char_count (m_current_helper_uuid, buf, len); - } - - if (NULL != buf) - delete [] buf; - } - bool find_active_ise_by_uuid (String uuid) { HelperInfoRepository::iterator iter = m_helper_info_repository.begin (); @@ -3592,14 +3193,8 @@ private: socket_set_keyboard_ise (ISM_TRANS_CMD_SET_KEYBOARD_ISE_BY_UUID); } else if (cmd == ISM_TRANS_CMD_GET_KEYBOARD_ISE) { socket_get_keyboard_ise (); - } else if (cmd == ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_STRING) { - socket_helper_commit_im_embedded_editor_string (client_id); - } else if (cmd == ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_CHANGED) { - socket_helper_im_embedded_editor_changed (client_id); - } else if (cmd == ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_PREEDIT_CHANGED) { - socket_helper_im_embedded_editor_preedit_changed (client_id); - } else if(cmd == ISM_TRANS_CMD_LAUNCH_HELPER_ISE_LIST_SELECTION){ - socket_helper_launch_helper_ise_list_selection(); + } else if (cmd == ISM_TRANS_CMD_LAUNCH_HELPER_ISE_LIST_SELECTION) { + socket_helper_launch_helper_ise_list_selection (); } else if (cmd == SCIM_TRANS_CMD_GET_SURROUNDING_TEXT) { socket_helper_get_surrounding_text (client_id); } else if (cmd == SCIM_TRANS_CMD_DELETE_SURROUNDING_TEXT) { @@ -3666,24 +3261,6 @@ private: reset_ise_context (client_id); else if (cmd == ISM_TRANS_CMD_SET_ISE_SCREEN_DIRECTION) set_ise_screen_direction (client_id); - else if (cmd == ISM_TRANS_CMD_SET_INDICATOR_CHAR_COUNT) - set_ise_char_count (client_id); - else if (cmd == ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_IM_BUTTON_SET_LABEL) - set_ise_im_embedded_editor_im_button_set_label (client_id); - else if (cmd == ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_SET_PRESET_TEXT) - set_ise_im_embedded_editor_set_preset_text (client_id); - else if (cmd == ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_SET_TEXT) - set_ise_im_embedded_editor_set_text (client_id); - else if (cmd == ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_SET_MAX_LENGTH) - set_ise_im_embedded_editor_set_max_length (client_id); - else if (cmd == ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_BUTTON_SENSTIVITY) - set_ise_im_embedded_editor_set_button_senstivity (client_id); - else if (cmd == ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_PROGRESS_BAR) - set_ise_im_embedded_editor_set_progress_bar (client_id); - else if (cmd == ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_GET_TEXT) - get_ise_im_embedded_editor_text (client_id); - else if (cmd == ISM_TRANS_CMD_IM_INDICATOR_SET_COUNT_LABEL) - set_ise_im_indicator_count_label (client_id); } socket_transaction_end (); @@ -5227,96 +4804,6 @@ private: socket_reset_helper_input_context (m_current_helper_uuid, client, context); } - void socket_helper_commit_im_embedded_editor_string (int client) - { - SCIM_DEBUG_MAIN(4) << "PanelAgent::socket_helper_commit_ise_result_to_imcontrol (" << client << ")\n"; - - char * buf = NULL; - size_t len; - - if (m_recv_trans.get_data (&buf, len)) - { - ClientRepository::iterator iter = m_client_repository.begin (); - - for (; iter != m_client_repository.end (); iter++) - { - if (IMCONTROL_CLIENT == iter->second.type - && iter->first == m_imcontrol_map[m_current_active_imcontrol_id]) - { - Socket client_socket (iter->first); - Transaction trans; - - trans.clear (); - trans.put_command (SCIM_TRANS_CMD_REQUEST); - trans.put_command (ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_STRING); - trans.put_data (buf, len); - trans.write_to_socket (client_socket); - break; - } - } - - if (buf) - delete [] buf; - } - } - - void socket_helper_im_embedded_editor_changed (int client) - { - SCIM_DEBUG_MAIN(4) << "PanelAgent::socket_helper_im_embedded_editor_changed (" << client << ")\n"; - - ClientRepository::iterator iter = m_client_repository.begin (); - - for (; iter != m_client_repository.end (); iter++) - { - if (IMCONTROL_CLIENT == iter->second.type - && iter->first == m_imcontrol_map[m_current_active_imcontrol_id]) - { - Socket client_socket (iter->first); - Transaction trans; - - trans.clear (); - trans.put_command (SCIM_TRANS_CMD_REQUEST); - trans.put_command (ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_CHANGED); - - trans.write_to_socket (client_socket); - break; - } - } - } - - void socket_helper_im_embedded_editor_preedit_changed (int client) - { - SCIM_DEBUG_MAIN(4) << "PanelAgent::socket_helper_im_embedded_editor_preedit_changed (" << client << ")\n"; - - char * buf = NULL; - size_t len; - - if (m_recv_trans.get_data (&buf, len)) - { - ClientRepository::iterator iter = m_client_repository.begin (); - - for (; iter != m_client_repository.end (); iter++) - { - if (IMCONTROL_CLIENT == iter->second.type && - iter->first == m_imcontrol_map[m_current_active_imcontrol_id]) - { - Socket client_socket (iter->first); - Transaction trans; - - trans.clear (); - trans.put_command (SCIM_TRANS_CMD_REQUEST); - trans.put_command (ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_PREEDIT_CHANGED); - trans.put_data (buf, len); - trans.write_to_socket (client_socket); - break; - } - } - - if (buf) - delete [] buf; - } - } - bool helper_select_aux (uint32 item) { SCIM_DEBUG_MAIN(4) << "PanelAgent::helper_select_aux \n"; diff --git a/ism/src/scim_trans_commands.h b/ism/src/scim_trans_commands.h index d85604e..33f7cf1 100644 --- a/ism/src/scim_trans_commands.h +++ b/ism/src/scim_trans_commands.h @@ -651,20 +651,8 @@ const int ISM_TRANS_CMD_GET_ACTIVE_ISE_LIST = 950; #define ISM_TRANS_CMD_RESET_ISE_CONTEXT 1134 #define ISM_TRANS_CMD_SET_ISE_SCREEN_DIRECTION 1135 #define ISM_TRANS_CMD_ISE_RESULT_TO_IMCONTROL 1136 -#define ISM_TRANS_CMD_SET_INDICATOR_CHAR_COUNT 1137 -#define ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_STRING 1138 -#define ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_IM_BUTTON_SET_LABEL 1139 -#define ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_SET_PRESET_TEXT 1140 -#define ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_SET_TEXT 1141 -#define ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_SET_MAX_LENGTH 1142 -#define ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_CHANGED 1143 -#define ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_GET_TEXT 1144 -#define ISM_TRANS_CMD_IM_INDICATOR_SET_COUNT_LABEL 1145 -#define ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_BUTTON_SENSTIVITY 1146 -#define ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_PROGRESS_BAR 1147 -#define ISM_TRANS_CMD_IM_EMBEDDED_EDITOR_PREEDIT_CHANGED 1148 -#define ISM_TRANS_CMD_SET_DISABLE_KEY 1149 -#define ISM_TRANS_CMD_GET_LAYOUT_LIST 1150 +#define ISM_TRANS_CMD_SET_DISABLE_KEY 1137 +#define ISM_TRANS_CMD_GET_LAYOUT_LIST 1138 // ISE to Control Panel diff --git a/releasenote.txt b/releasenote.txt index 07f7fb4..7738990 100644 --- a/releasenote.txt +++ b/releasenote.txt @@ -1,4 +1,4 @@ -ISF 2.3.5009 : +ISF 2.3.5016 : 1. Tizen beta Release -- 2.7.4