From 273c4653bacd6aa2c6aeb092a28a9885c5f35e38 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Thu, 10 Nov 2011 09:58:41 +0900 Subject: [PATCH] [ecore_imf] remove deprecated APIs --- debian/changelog | 8 + src/lib/ecore_imf/Ecore_IMF.h | 30 ---- src/lib/ecore_imf/ecore_imf_context.c | 317 ---------------------------------- 3 files changed, 8 insertions(+), 347 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0de300f..61240ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ecore (1.0.0.001+svn.64661slp2+build04) unstable; urgency=low + + * [ecore_imf] remove depecated APIs + * Git: 165.213.180.234:/slp/pkgs/e/ecore + * Tag: ecore_1.0.0.001+svn.64661slp2+build04 + + -- Jihoon Kim Thu, 10 Nov 2011 09:28:41 +0900 + ecore (1.0.0.001+svn.64661slp2+build03) unstable; urgency=low * Ecore, Ecore_con, Ecore_file: merge upstream r64851 diff --git a/src/lib/ecore_imf/Ecore_IMF.h b/src/lib/ecore_imf/Ecore_IMF.h index 49758b9..e86672b 100644 --- a/src/lib/ecore_imf/Ecore_IMF.h +++ b/src/lib/ecore_imf/Ecore_IMF.h @@ -30,19 +30,6 @@ # endif #endif /* ! _WIN32 */ -/* Faked 'bool'. */ -#ifndef __cplusplus -# ifndef bool -# define bool int -# ifndef FALSE -# define FALSE 0 -# endif -# ifndef TRUE -# define TRUE 1 -# endif -# endif -#endif - #ifdef __cplusplus extern "C" { #endif @@ -502,32 +489,15 @@ EAPI void ecore_imf_context_input_panel_enabled_set(Eco EAPI Eina_Bool ecore_imf_context_input_panel_enabled_get(Ecore_IMF_Context *ctx); EAPI void ecore_imf_context_input_panel_imdata_set(Ecore_IMF_Context *ctx, const char *data, int len); EAPI void ecore_imf_context_input_panel_imdata_get(Ecore_IMF_Context *ctx, char *data, int *len); -EINA_DEPRECATED EAPI void ecore_imf_context_input_panel_use_effect_set(Ecore_IMF_Context *ctx, Eina_Bool use_effect); -EINA_DEPRECATED EAPI Eina_Bool ecore_imf_context_input_panel_use_effect_get(Ecore_IMF_Context *ctx); EAPI void ecore_imf_context_input_panel_geometry_get(Ecore_IMF_Context *ctx, int *x, int *y, int *w, int *h); EAPI void ecore_imf_context_input_panel_private_key_set(Ecore_IMF_Context *ctx, int layout_index, int key_index, const char *img_path, const char* label, int key_value, const char* key_string); EAPI Eina_List *ecore_imf_context_input_panel_private_key_list_get(Ecore_IMF_Context *ctx); -EINA_DEPRECATED EAPI void ecore_imf_context_input_panel_reset(Ecore_IMF_Context *ctx); /* Same as reset to default property*/ -EINA_DEPRECATED EAPI void ecore_imf_context_input_panel_orient_set(Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Orient orientation); -EINA_DEPRECATED EAPI Ecore_IMF_Input_Panel_Orient ecore_imf_context_input_panel_orient_get(Ecore_IMF_Context *ctx); EAPI Ecore_IMF_Input_Panel_State ecore_imf_context_input_panel_state_get(Ecore_IMF_Context *ctx); EAPI void ecore_imf_context_input_panel_event_callback_add(Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Event type, void (*func) (void *data, Ecore_IMF_Context *ctx, int value), const void *data); EAPI void ecore_imf_context_input_panel_event_callback_del(Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Event type, void (*func) (void *data, Ecore_IMF_Context *ctx, int value)); EAPI void ecore_imf_context_input_panel_key_disabled_set(Ecore_IMF_Context *ctx, int layout_index, int key_index, Eina_Bool disabled); EAPI Eina_List *ecore_imf_context_input_panel_key_disabled_list_get(Ecore_IMF_Context *ctx); EAPI void ecore_imf_context_input_panel_move(Ecore_IMF_Context *ctx, int x, int y); -EINA_DEPRECATED EAPI void ecore_imf_context_input_panel_caps_mode_set(Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Caps_Mode mode); - -EINA_DEPRECATED EAPI void ecore_imf_context_keyboard_language_set(Ecore_IMF_Context *ctx, Ecore_IMF_Keyboard_Lang lang); -EINA_DEPRECATED EAPI Ecore_IMF_Keyboard_Lang ecore_imf_context_keyboard_language_get(Ecore_IMF_Context *ctx); - -/* functions to control isf */ -EINA_DEPRECATED EAPI int ecore_imf_context_ise_get_ise_language(Ecore_IMF_Context *ctx, const char* ise_name, char ***langlist); -EINA_DEPRECATED EAPI void ecore_imf_context_ise_set_isf_language(Ecore_IMF_Context *ctx, const char* lang); -EINA_DEPRECATED EAPI void ecore_imf_context_ise_get_active_isename(Ecore_IMF_Context *ctx, char* name); -EINA_DEPRECATED EAPI void ecore_imf_context_ise_set_active_ise_by_name(Ecore_IMF_Context *ctx, const char* name); -EINA_DEPRECATED EAPI void ecore_imf_context_ise_set_active_ise_by_uuid(Ecore_IMF_Context *ctx, const char* uuid); -EINA_DEPRECATED EAPI int ecore_imf_context_ise_get_iselist(Ecore_IMF_Context *ctx, char*** iselist); /* The following entry points must be exported by each input method module */ diff --git a/src/lib/ecore_imf/ecore_imf_context.c b/src/lib/ecore_imf/ecore_imf_context.c index ab89436..bc85ea1 100644 --- a/src/lib/ecore_imf/ecore_imf_context.c +++ b/src/lib/ecore_imf/ecore_imf_context.c @@ -1307,141 +1307,6 @@ ecore_imf_context_input_panel_imdata_get (Ecore_IMF_Context *ctx, char *data, in } /** - * Get ISE Language of given ISE. -- Not supported for now -- - * @ingroup Ecore_IMF_Context_IMControl_Group - */ -EINA_DEPRECATED EAPI int -ecore_imf_context_ise_get_ise_language (Ecore_IMF_Context *ctx, const char* ise_name, char ***langlist) -{ - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_ise_get_ise_language"); - return -1; - } - - if (!ise_name) return -1; - - if (ctx->klass->ise_get_ise_language) - return ctx->klass->ise_get_ise_language(ctx, ise_name, langlist); - else - return -1; -} - -/** - * Set keyboard language. - * - * @param ctx An #Ecore_IMF_Context. - * @param lang see Ecore_IMF_Input_Panel_Lang - * @ingroup Ecore_IMF_Context_IMControl_Group - * THIS API IS NOT SUPPORTED NOW - * @since 1.1.0 - */ -EINA_DEPRECATED EAPI void -ecore_imf_context_keyboard_language_set (Ecore_IMF_Context *ctx, Ecore_IMF_Keyboard_Lang lang) -{ - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_keyboard_language_set"); - return; - } -// if (ctx->klass->ise_set_language) ctx->klass->ise_set_language(ctx, lang); -} - -/** - * Get keyboard language. - * - * @param ctx An #Ecore_IMF_Context. - * @return Ecore_IMF_Input_Panel_Lang - * @ingroup Ecore_IMF_Context_IMControl_Group - * THIS API IS NOT SUPPORTED NOW - * @since 1.1.0 - */ -EINA_DEPRECATED EAPI Ecore_IMF_Keyboard_Lang -ecore_imf_context_keyboard_language_get (Ecore_IMF_Context *ctx) -{ - Ecore_IMF_Keyboard_Lang lang = ECORE_IMF_KEYBOARD_LANG_NATIVE; - - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_keyboard_language_get"); - return lang; - } -/* - if (ctx->klass->input_panel_language_get) - lang = ctx->klass->input_panel_language_get(ctx); -*/ - return lang; -} - -/** - * Set ISF Language. -- Not supported for now -- - * @ingroup Ecore_IMF_Context_IMControl_Group - */ -EINA_DEPRECATED EAPI void -ecore_imf_context_ise_set_isf_language (Ecore_IMF_Context *ctx, const char* lang) -{ - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_ise_set_isf_language"); - return; - } - - if (!lang) return; - - if (ctx->klass->ise_set_isf_language) - ctx->klass->ise_set_isf_language(ctx, lang); -} - -/** - * Set whether animation effect of the input panel is shown or not. - * - * @param ctx An #Ecore_IMF_Context. - * @param use_effect whether animation effect is shown or not - * @ingroup Ecore_IMF_Context_IMControl_Group - * @since 1.1.0 - */ -EINA_DEPRECATED EAPI void -ecore_imf_context_input_panel_use_effect_set (Ecore_IMF_Context *ctx, Eina_Bool use_effect) -{ - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_input_panel_use_effect_set"); - return; - } - - if (ctx->klass->input_panel_use_effect_set) - ctx->klass->input_panel_use_effect_set(ctx, use_effect); - - ctx->use_effect = use_effect; -} - -/** - * Get whether the input panel supports animation effect or not when it is shown or hidden. - * - * @param ctx An #Ecore_IMF_Context. - * @param use_effect whether animation effect is shown or not - * @ingroup Ecore_IMF_Context_IMControl_Group - * @since 1.1.0 - */ -EINA_DEPRECATED EAPI Eina_Bool -ecore_imf_context_input_panel_use_effect_get (Ecore_IMF_Context *ctx) -{ - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_input_panel_use_effect_get"); - return EINA_TRUE; - } - - return ctx->use_effect; -} - -/** * Get the position of the current active input panel. * * @param ctx An #Ecore_IMF_Context. @@ -1634,166 +1499,6 @@ ecore_imf_context_input_panel_key_disabled_list_get (Ecore_IMF_Context *ctx) } /** - * Restore all default properties of input panel. - * - * @param ctx An #Ecore_IMF_Context. - * @ingroup Ecore_IMF_Context_IMControl_Group - * @since 1.1.0 - */ -EINA_DEPRECATED EAPI void -ecore_imf_context_input_panel_reset (Ecore_IMF_Context *ctx) -{ - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_input_panel_reset"); - return; - } - - if (ctx->klass->input_panel_reset) ctx->klass->input_panel_reset(ctx); -} - -/** - * Set the screen orientation of input panel - * To show the keypad in landscape mode application should first call this API with 2nd parameter as 90 or 270. - * After then only application should call @ref ecore_imf_context_input_panel_show. - * - * @param ctx An #Ecore_IMF_Context. - * @param orientation the orientation of input panel - * @ingroup Ecore_IMF_Context_IMControl_Group - * @since 1.1.0 - */ -EINA_DEPRECATED EAPI void -ecore_imf_context_input_panel_orient_set (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Panel_Orient orientation) -{ - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_input_panel_orient_set"); - return; - } - - if (ctx->klass->input_panel_orient_set) - ctx->klass->input_panel_orient_set(ctx, orientation*90); - - ctx->input_panel_orient = orientation; -} - -/** - * Get the screen orientation of input panel. - * - * @param ctx An #Ecore_IMF_Context. - * @return The screen orientation of input panel - * @ingroup Ecore_IMF_Context_IMControl_Group - * @since 1.1.0 - */ -EINA_DEPRECATED EAPI Ecore_IMF_Input_Panel_Orient -ecore_imf_context_input_panel_orient_get (Ecore_IMF_Context *ctx) -{ - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_input_panel_orient_get"); - return ECORE_IMF_INPUT_PANEL_ORIENT_NONE; - } - - return ctx->input_panel_orient; -} - -/** - * Get name of current active input panel. - * - * @param ctx An #Ecore_IMF_Context. - * @param name input panel name to be got - * @ingroup Ecore_IMF_Context_IMControl_Group - */ -EINA_DEPRECATED EAPI void -ecore_imf_context_ise_get_active_isename (Ecore_IMF_Context *ctx, char* name) -{ - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_ise_get_active_isename"); - return; - } - - if (!name) return; - - if (ctx->klass->ise_get_active_isename) - ctx->klass->ise_get_active_isename(ctx, name); -} - -/** - * Choose the active input panel by its name. - * - * @param ctx An #Ecore_IMF_Context. - * @param name input panel name to be set - * @ingroup Ecore_IMF_Context_IMControl_Group - */ -EINA_DEPRECATED EAPI void -ecore_imf_context_ise_set_active_ise_by_name (Ecore_IMF_Context *ctx, const char* name) -{ - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_ise_set_active_ise_by_name"); - return; - } - - if (!name) return; - - if (ctx->klass->ise_set_active_ise_by_name) - ctx->klass->ise_set_active_ise_by_name(ctx, name); -} - -/** - * Set input panel by its uuid. - * - * @param ctx An #Ecore_IMF_Context. - * @param uuid input panel uuid to be set - * @ingroup Ecore_IMF_Context_IMControl_Group - */ -EINA_DEPRECATED EAPI void -ecore_imf_context_ise_set_active_ise_by_uuid (Ecore_IMF_Context *ctx, const char* uuid) -{ - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_ise_set_active_ise_by_uuid"); - return; - } - - if (!uuid) return; - - if (ctx->klass->ise_set_active_ise_by_uuid) - ctx->klass->ise_set_active_ise_by_uuid(ctx, uuid); -} - -/** - * Get list of input panels. - * - * @param ctx An #Ecore_IMF_Context. - * @param iselist pointer to the list to be got. - * @return int ise counter of iselist - * @ingroup Ecore_IMF_Context_IMControl_Group - */ -EINA_DEPRECATED EAPI int -ecore_imf_context_ise_get_iselist (Ecore_IMF_Context *ctx, char*** iselist) -{ - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_ise_get_iselist"); - return -1; - } - - if (ctx->klass->ise_get_iselist) - return ctx->klass->ise_get_iselist(ctx, iselist); - else - return -1; -} - -/** * Get state of current active input panel. * * @param ctx An #Ecore_IMF_Context. @@ -1896,25 +1601,3 @@ ecore_imf_context_input_panel_move (Ecore_IMF_Context *ctx, int x, int y) ctx->input_panel_y = y; } -/** - * Set the caps mode of the input panel. - * - * @param ctx An #Ecore_IMF_Context. - * @param mode the caps mode - * @ingroup Ecore_IMF_Context_IMControl_Group - * @since 1.1.0 - */ -EINA_DEPRECATED EAPI void -ecore_imf_context_input_panel_caps_mode_set (Ecore_IMF_Context *ctx, - Ecore_IMF_Input_Panel_Caps_Mode mode) -{ - if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT)) - { - ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, - "ecore_imf_context_input_panel_caps_mode_set"); - return; - } - - if (ctx->klass->input_panel_caps_mode_set) - ctx->klass->input_panel_caps_mode_set(ctx, mode); -} -- 2.7.4