From: Jihoon Kim Date: Thu, 30 Sep 2010 09:13:06 +0000 (+0900) Subject: [ecore_imf] svn merge 52921 X-Git-Tag: accepted/2.0/20130306.224007~309 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=405a60c1ded98eeecdbc2f7c78cb9f06c294a983;p=profile%2Fivi%2Fecore.git [ecore_imf] svn merge 52921 --- diff --git a/src/lib/ecore_imf/Ecore_IMF.h b/src/lib/ecore_imf/Ecore_IMF.h index cc13569..eafac04 100644 --- a/src/lib/ecore_imf/Ecore_IMF.h +++ b/src/lib/ecore_imf/Ecore_IMF.h @@ -1254,5 +1254,4 @@ extern "C" { #endif -/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/ - +/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/ \ No newline at end of file diff --git a/src/lib/ecore_imf/ecore_imf.c b/src/lib/ecore_imf/ecore_imf.c index af8be05..a6314c1 100644 --- a/src/lib/ecore_imf/ecore_imf.c +++ b/src/lib/ecore_imf/ecore_imf.c @@ -71,5 +71,4 @@ ecore_imf_shutdown(void) return _ecore_imf_init_count; } -/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/ - +/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/ \ No newline at end of file diff --git a/src/lib/ecore_imf/ecore_imf_context.c b/src/lib/ecore_imf/ecore_imf_context.c index e8477bd..00c635a 100644 --- a/src/lib/ecore_imf/ecore_imf_context.c +++ b/src/lib/ecore_imf/ecore_imf_context.c @@ -93,8 +93,8 @@ ecore_imf_context_default_id_by_canvas_type_get(const char *canvas_type) //printf ("id is %s \n", id); if (id) { - if (strcmp(id, "none") == 0) return NULL; - if (ecore_imf_module_get(id)) return id; + if (strcmp(id, "none") == 0) return NULL; + if (ecore_imf_module_get(id)) return id; } modules = ecore_imf_module_available_get(); @@ -114,24 +114,24 @@ ecore_imf_context_default_id_by_canvas_type_get(const char *canvas_type) EINA_LIST_FREE(modules, module) { - if (canvas_type && - strcmp(module->info->canvas_type, canvas_type) == 0) - continue; + if (canvas_type && + strcmp(module->info->canvas_type, canvas_type) == 0) + continue; - const char *p = module->info->default_locales; - while (p) - { - const char *q = strchr(p, ':'); - int goodness = _ecore_imf_context_match_locale(locale, p, q ? (size_t)(q - p) : strlen (p)); + const char *p = module->info->default_locales; + while (p) + { + const char *q = strchr(p, ':'); + int goodness = _ecore_imf_context_match_locale(locale, p, q ? (size_t)(q - p) : strlen (p)); - if (goodness > best_goodness) - { - id = module->info->id; - best_goodness = goodness; - } + if (goodness > best_goodness) + { + id = module->info->id; + best_goodness = goodness; + } - p = q ? q + 1 : NULL; - } + p = q ? q + 1 : NULL; + } } free(locale); @@ -196,9 +196,9 @@ ecore_imf_context_info_get(Ecore_IMF_Context *ctx) { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_info_get"); - return NULL; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_info_get"); + return NULL; } return ctx->module->info; } @@ -216,9 +216,9 @@ ecore_imf_context_del(Ecore_IMF_Context *ctx) if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_del"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_del"); + return; } if (ctx->klass->del) ctx->klass->del(ctx); ECORE_MAGIC_SET(ctx, ECORE_MAGIC_NONE); @@ -251,9 +251,9 @@ ecore_imf_context_client_window_set(Ecore_IMF_Context *ctx, void *window) { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_client_window_set"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_client_window_set"); + return; } if (ctx->klass->client_window_set) ctx->klass->client_window_set(ctx, window); ctx->window = window; @@ -289,9 +289,9 @@ ecore_imf_context_client_canvas_set(Ecore_IMF_Context *ctx, void *canvas) { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_client_canvas_set"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_client_canvas_set"); + return; } if (ctx->klass->client_canvas_set) ctx->klass->client_canvas_set(ctx, canvas); ctx->client_canvas = canvas; @@ -321,9 +321,9 @@ ecore_imf_context_show(Ecore_IMF_Context *ctx) { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_show"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_show"); + return; } if (ctx->klass->show) ctx->klass->show(ctx); } @@ -339,9 +339,9 @@ ecore_imf_context_hide(Ecore_IMF_Context *ctx) { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_hide"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_hide"); + return; } if (ctx->klass->hide) ctx->klass->hide(ctx); } @@ -362,16 +362,16 @@ ecore_imf_context_preedit_string_get(Ecore_IMF_Context *ctx, char **str, int *cu { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_preedit_string_get"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_preedit_string_get"); + return; } if (ctx->klass->preedit_string_get) ctx->klass->preedit_string_get(ctx, str, cursor_pos); else { - if (str) *str = strdup(""); - if (cursor_pos) *cursor_pos = 0; + if (str) *str = strdup(""); + if (cursor_pos) *cursor_pos = 0; } } @@ -387,9 +387,9 @@ ecore_imf_context_focus_in(Ecore_IMF_Context *ctx) { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_focus_in"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_focus_in"); + return; } if (ctx->klass->focus_in) ctx->klass->focus_in(ctx); } @@ -406,9 +406,9 @@ ecore_imf_context_focus_out(Ecore_IMF_Context *ctx) { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_focus_out"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_focus_out"); + return; } if (ctx->klass->focus_out) ctx->klass->focus_out(ctx); } @@ -426,9 +426,9 @@ ecore_imf_context_reset(Ecore_IMF_Context *ctx) { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_reset"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_reset"); + return; } if (ctx->klass->reset) ctx->klass->reset(ctx); } @@ -446,9 +446,9 @@ ecore_imf_context_cursor_position_set(Ecore_IMF_Context *ctx, int cursor_pos) { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_cursor_position_set"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_cursor_position_set"); + return; } if (ctx->klass->cursor_position_set) ctx->klass->cursor_position_set(ctx, cursor_pos); } @@ -468,9 +468,9 @@ ecore_imf_context_use_preedit_set(Ecore_IMF_Context *ctx, Eina_Bool use_preedit) { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_use_preedit_set"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_use_preedit_set"); + return; } if (ctx->klass->use_preedit_set) ctx->klass->use_preedit_set(ctx, use_preedit); } @@ -491,9 +491,9 @@ ecore_imf_context_retrieve_surrounding_callback_set(Ecore_IMF_Context *ctx, Eina { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_retrieve_surrounding_callback_set"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_retrieve_surrounding_callback_set"); + return; } ctx->retrieve_surrounding_func = func; @@ -516,9 +516,9 @@ ecore_imf_context_input_mode_set(Ecore_IMF_Context *ctx, Ecore_IMF_Input_Mode in { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_input_mode_set"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_input_mode_set"); + return; } if (ctx->klass->input_mode_set) ctx->klass->input_mode_set(ctx, input_mode); ctx->input_mode = input_mode; @@ -538,9 +538,9 @@ ecore_imf_context_input_mode_get(Ecore_IMF_Context *ctx) { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_input_mode_set"); - return 0; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_input_mode_set"); + return 0; } return ctx->input_mode; } @@ -565,9 +565,9 @@ ecore_imf_context_filter_event(Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_filter_event"); - return EINA_FALSE; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_filter_event"); + return EINA_FALSE; } if (ctx->klass->filter_event) return ctx->klass->filter_event(ctx, type, event); return EINA_FALSE; @@ -629,9 +629,9 @@ ecore_imf_context_data_set(Ecore_IMF_Context *ctx, void *data) { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_data_set"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_data_set"); + return; } ctx->data = data; } @@ -649,9 +649,9 @@ EAPI void *ecore_imf_context_data_get(Ecore_IMF_Context *ctx) { if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_data_get"); - return NULL; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_data_get"); + return NULL; } return ctx->data; } @@ -684,19 +684,19 @@ ecore_imf_context_surrounding_get(Ecore_IMF_Context *ctx, char **text, int *curs if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_surrounding_get"); - return EINA_FALSE; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_surrounding_get"); + return EINA_FALSE; } if (ctx->retrieve_surrounding_func) { - result = ctx->retrieve_surrounding_func(ctx->retrieve_surrounding_data, ctx, text, cursor_pos); - if (!result) - { - if (text) *text = NULL; - if (cursor_pos) *cursor_pos = 0; - } + result = ctx->retrieve_surrounding_func(ctx->retrieve_surrounding_data, ctx, text, cursor_pos); + if (!result) + { + if (text) *text = NULL; + if (cursor_pos) *cursor_pos = 0; + } } return result; } @@ -720,15 +720,15 @@ ecore_imf_context_preedit_start_event_add(Ecore_IMF_Context *ctx) if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_preedit_start_event_add"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_preedit_start_event_add"); + return; } ev = malloc(sizeof(Ecore_IMF_Event_Preedit_Start)); ev->ctx = ctx; ecore_event_add(ECORE_IMF_EVENT_PREEDIT_START, - ev, _ecore_imf_event_free_preedit, NULL); + ev, _ecore_imf_event_free_preedit, NULL); } /** @@ -744,15 +744,15 @@ ecore_imf_context_preedit_end_event_add(Ecore_IMF_Context *ctx) if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_preedit_end_event_add"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_preedit_end_event_add"); + return; } ev = malloc(sizeof(Ecore_IMF_Event_Preedit_End)); ev->ctx = ctx; ecore_event_add(ECORE_IMF_EVENT_PREEDIT_END, - ev, _ecore_imf_event_free_preedit, NULL); + ev, _ecore_imf_event_free_preedit, NULL); } /** @@ -768,15 +768,15 @@ ecore_imf_context_preedit_changed_event_add(Ecore_IMF_Context *ctx) if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_preedit_changed_event_add"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_preedit_changed_event_add"); + return; } ev = malloc(sizeof(Ecore_IMF_Event_Preedit_Changed)); ev->ctx = ctx; ecore_event_add(ECORE_IMF_EVENT_PREEDIT_CHANGED, - ev, _ecore_imf_event_free_preedit, NULL); + ev, _ecore_imf_event_free_preedit, NULL); } static void @@ -803,16 +803,16 @@ ecore_imf_context_commit_event_add(Ecore_IMF_Context *ctx, const char *str) if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_commit_event_add"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_commit_event_add"); + return; } ev = malloc(sizeof(Ecore_IMF_Event_Commit)); ev->ctx = ctx; ev->str = str ? strdup(str) : NULL; ecore_event_add(ECORE_IMF_EVENT_COMMIT, - ev, _ecore_imf_event_free_commit, NULL); + ev, _ecore_imf_event_free_commit, NULL); } @@ -837,9 +837,9 @@ ecore_imf_context_delete_surrounding_event_add(Ecore_IMF_Context *ctx, int offse if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_delete_surrounding_event_add"); - return; + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_context_delete_surrounding_event_add"); + return; } ev = malloc(sizeof(Ecore_IMF_Event_Delete_Surrounding)); @@ -847,7 +847,7 @@ ecore_imf_context_delete_surrounding_event_add(Ecore_IMF_Context *ctx, int offse ev->offset = offset; ev->n_chars = n_chars; ecore_event_add(ECORE_IMF_EVENT_DELETE_SURROUNDING, - ev, _ecore_imf_event_free_delete_surrounding, NULL); + ev, _ecore_imf_event_free_delete_surrounding, NULL); } /*** ImControl Related APIs */ diff --git a/src/lib/ecore_imf/ecore_imf_module.c b/src/lib/ecore_imf/ecore_imf_module.c index 456e559..cdde808 100644 --- a/src/lib/ecore_imf/ecore_imf_module.c +++ b/src/lib/ecore_imf/ecore_imf_module.c @@ -18,8 +18,8 @@ static int _ecore_imf_modules_exists(const char *ctx_id); typedef struct _Ecore_IMF_Selector { - const char *toselect; - void *selected; + const char *toselect; + void *selected; } Ecore_IMF_Selector; static Eina_Hash *modules = NULL; @@ -34,8 +34,8 @@ ecore_imf_module_init(void) homedir = eina_module_environment_path_get("HOME", "/.ecore/immodules"); if (homedir) { - module_list = eina_module_list_get(module_list, homedir, 0, NULL, NULL); - free(homedir); + module_list = eina_module_list_get(module_list, homedir, 0, NULL, NULL); + free(homedir); } eina_module_list_load(module_list); } @@ -45,13 +45,13 @@ ecore_imf_module_shutdown(void) { if (modules) { - eina_hash_free(modules); - modules = NULL; + eina_hash_free(modules); + modules = NULL; } if (module_list) { - eina_module_list_free(module_list); - module_list = NULL; + eina_module_list_free(module_list); + module_list = NULL; } } @@ -97,14 +97,14 @@ ecore_imf_module_context_create(const char *ctx_id) module = eina_hash_find(modules, ctx_id); if (module) { - ctx = module->create(); - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_module_context_create"); - return NULL; - } - ctx->module = module; + ctx = module->create(); + if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) + { + ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, + "ecore_imf_module_context_create"); + return NULL; + } + ctx->module = module; } return ctx; } @@ -172,8 +172,8 @@ ecore_imf_module_context_ids_by_canvas_type_get(const char *canvas_type) EAPI void ecore_imf_module_register(const Ecore_IMF_Context_Info *info, - Ecore_IMF_Context *(*imf_module_create)(void), - Ecore_IMF_Context *(*imf_module_exit)(void)) + Ecore_IMF_Context *(*imf_module_create)(void), + Ecore_IMF_Context *(*imf_module_exit)(void)) { Ecore_IMF_Module *module; diff --git a/src/lib/ecore_imf/ecore_imf_private.h b/src/lib/ecore_imf/ecore_imf_private.h index 4b44cc4..44ccdf1 100644 --- a/src/lib/ecore_imf/ecore_imf_private.h +++ b/src/lib/ecore_imf/ecore_imf_private.h @@ -42,14 +42,14 @@ struct _Ecore_IMF_Context const Ecore_IMF_Module *module; const Ecore_IMF_Context_Class *klass; void *data; - int input_mode; - void* window; - void* client_canvas; - Ecore_IMF_Input_Panel_Layout input_panel_layout; - int use_effect; - int input_panel_x; - int input_panel_y; - Ecore_IMF_Input_Panel_Orient input_panel_orient; + int input_mode; + void* window; + void* client_canvas; + Ecore_IMF_Input_Panel_Layout input_panel_layout; + int use_effect; + int input_panel_x; + int input_panel_y; + Ecore_IMF_Input_Panel_Orient input_panel_orient; Eina_Bool (*retrieve_surrounding_func)(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos); void *retrieve_surrounding_data; Eina_List *callbacks;