From 92014f5ee9dbb849c837b9736fc263976d230e9c Mon Sep 17 00:00:00 2001 From: caro Date: Sat, 25 Sep 2010 07:03:02 +0000 Subject: [PATCH] int --> Eina_Bool please review it git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@52730 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_evas/Ecore_Evas.h | 84 +++++++------- src/lib/ecore_evas/ecore_evas.c | 190 ++++++++++++++++---------------- src/lib/ecore_evas/ecore_evas_private.h | 2 +- src/lib/ecore_evas/ecore_evas_util.c | 26 ++--- src/lib/ecore_evas/ecore_evas_x.c | 36 +++--- 5 files changed, 169 insertions(+), 169 deletions(-) diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h index 5b06cce..f373a05 100644 --- a/src/lib/ecore_evas/Ecore_Evas.h +++ b/src/lib/ecore_evas/Ecore_Evas.h @@ -133,8 +133,8 @@ EAPI int ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type eng EAPI int ecore_evas_init(void); EAPI int ecore_evas_shutdown(void); -EAPI void ecore_evas_app_comp_sync_set(int do_sync); -EAPI int ecore_evas_app_comp_sync_get(void); +EAPI void ecore_evas_app_comp_sync_set(Eina_Bool do_sync); +EAPI Eina_Bool ecore_evas_app_comp_sync_get(void); EAPI Eina_List *ecore_evas_engines_get(void); EAPI void ecore_evas_engines_free(Eina_List *engines); @@ -144,8 +144,8 @@ EAPI Ecore_Evas *ecore_evas_new(const char *engine_name, int x, int y, int w, in /* engine/target specific init calls */ EAPI Ecore_Evas *ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h); EAPI Ecore_X_Window ecore_evas_software_x11_window_get(const Ecore_Evas *ee); -EAPI void ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee, int on); -EAPI int ecore_evas_software_x11_direct_resize_get(const Ecore_Evas *ee); +EAPI void ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on); +EAPI Eina_Bool ecore_evas_software_x11_direct_resize_get(const Ecore_Evas *ee); EAPI void ecore_evas_software_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win); #define ECORE_EVAS_GL_X11_OPT_NONE 0 @@ -155,28 +155,28 @@ EAPI void ecore_evas_software_x11_extra_event_window_add(Ecore_Evas * EAPI Ecore_Evas *ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h); EAPI Ecore_Evas *ecore_evas_gl_x11_options_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h, const int *opt); EAPI Ecore_X_Window ecore_evas_gl_x11_window_get(const Ecore_Evas *ee); -EAPI void ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee, int on); -EAPI int ecore_evas_gl_x11_direct_resize_get(const Ecore_Evas *ee); +EAPI void ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on); +EAPI Eina_Bool ecore_evas_gl_x11_direct_resize_get(const Ecore_Evas *ee); EAPI void ecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win); EAPI void ecore_evas_gl_x11_pre_post_swap_callback_set(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e)); EAPI Ecore_Evas *ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h); EAPI Ecore_X_Window ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee); -EAPI void ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, int on); -EAPI int ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee); +EAPI void ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on); +EAPI Eina_Bool ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee); EAPI void ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win); EAPI Ecore_Evas *ecore_evas_software_x11_8_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h); EAPI Ecore_X_Window ecore_evas_software_x11_8_window_get(const Ecore_Evas *ee); EAPI Ecore_X_Window ecore_evas_software_x11_8_subwindow_get(const Ecore_Evas *ee); -EAPI void ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee, int on); -EAPI int ecore_evas_software_x11_8_direct_resize_get(const Ecore_Evas *ee); +EAPI void ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee, Eina_Bool on); +EAPI Eina_Bool ecore_evas_software_x11_8_direct_resize_get(const Ecore_Evas *ee); EAPI void ecore_evas_software_x11_8_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win); EAPI Ecore_Evas *ecore_evas_software_x11_16_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h); EAPI Ecore_X_Window ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee); -EAPI void ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, int on); -EAPI int ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee); +EAPI void ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, Eina_Bool on); +EAPI Eina_Bool ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee); EAPI void ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win); EAPI Ecore_Evas *ecore_evas_fb_new(const char *disp_name, int rotation, int w, int h); @@ -290,12 +290,12 @@ EAPI void ecore_evas_geometry_get(const Ecore_Evas *ee, int *x, int *y, i EAPI void ecore_evas_rotation_set(Ecore_Evas *ee, int rot); EAPI void ecore_evas_rotation_with_resize_set(Ecore_Evas *ee, int rot); EAPI int ecore_evas_rotation_get(const Ecore_Evas *ee); -EAPI void ecore_evas_shaped_set(Ecore_Evas *ee, int shaped); -EAPI int ecore_evas_shaped_get(const Ecore_Evas *ee); -EAPI void ecore_evas_alpha_set(Ecore_Evas *ee, int alpha); -EAPI int ecore_evas_alpha_get(const Ecore_Evas *ee); -EAPI void ecore_evas_transparent_set(Ecore_Evas *ee, int transparent); -EAPI int ecore_evas_transparent_get(const Ecore_Evas *ee); +EAPI void ecore_evas_shaped_set(Ecore_Evas *ee, Eina_Bool shaped); +EAPI Eina_Bool ecore_evas_shaped_get(const Ecore_Evas *ee); +EAPI void ecore_evas_alpha_set(Ecore_Evas *ee, Eina_Bool alpha); +EAPI Eina_Bool ecore_evas_alpha_get(const Ecore_Evas *ee); +EAPI void ecore_evas_transparent_set(Ecore_Evas *ee, Eina_Bool transparent); +EAPI Eina_Bool ecore_evas_transparent_get(const Ecore_Evas *ee); EAPI void ecore_evas_show(Ecore_Evas *ee); EAPI void ecore_evas_hide(Ecore_Evas *ee); EAPI int ecore_evas_visibility_get(const Ecore_Evas *ee); @@ -319,37 +319,37 @@ EAPI void ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, EAPI void ecore_evas_cursor_get(const Ecore_Evas *ee, Evas_Object **obj, int *layer, int *hot_x, int *hot_y); EAPI void ecore_evas_layer_set(Ecore_Evas *ee, int layer); EAPI int ecore_evas_layer_get(const Ecore_Evas *ee); -EAPI void ecore_evas_focus_set(Ecore_Evas *ee, int on); -EAPI int ecore_evas_focus_get(const Ecore_Evas *ee); -EAPI void ecore_evas_iconified_set(Ecore_Evas *ee, int on); -EAPI int ecore_evas_iconified_get(const Ecore_Evas *ee); -EAPI void ecore_evas_borderless_set(Ecore_Evas *ee, int on); -EAPI int ecore_evas_borderless_get(const Ecore_Evas *ee); -EAPI void ecore_evas_override_set(Ecore_Evas *ee, int on); -EAPI int ecore_evas_override_get(const Ecore_Evas *ee); -EAPI void ecore_evas_maximized_set(Ecore_Evas *ee, int on); -EAPI int ecore_evas_maximized_get(const Ecore_Evas *ee); -EAPI void ecore_evas_fullscreen_set(Ecore_Evas *ee, int on); -EAPI int ecore_evas_fullscreen_get(const Ecore_Evas *ee); +EAPI void ecore_evas_focus_set(Ecore_Evas *ee, Eina_Bool on); +EAPI Eina_Bool ecore_evas_focus_get(const Ecore_Evas *ee); +EAPI void ecore_evas_iconified_set(Ecore_Evas *ee, Eina_Bool on); +EAPI Eina_Bool ecore_evas_iconified_get(const Ecore_Evas *ee); +EAPI void ecore_evas_borderless_set(Ecore_Evas *ee, Eina_Bool on); +EAPI Eina_Bool ecore_evas_borderless_get(const Ecore_Evas *ee); +EAPI void ecore_evas_override_set(Ecore_Evas *ee, Eina_Bool on); +EAPI Eina_Bool ecore_evas_override_get(const Ecore_Evas *ee); +EAPI void ecore_evas_maximized_set(Ecore_Evas *ee, Eina_Bool on); +EAPI Eina_Bool ecore_evas_maximized_get(const Ecore_Evas *ee); +EAPI void ecore_evas_fullscreen_set(Ecore_Evas *ee, Eina_Bool on); +EAPI Eina_Bool ecore_evas_fullscreen_get(const Ecore_Evas *ee); EAPI void ecore_evas_avoid_damage_set(Ecore_Evas *ee, Ecore_Evas_Avoid_Damage_Type on); EAPI Ecore_Evas_Avoid_Damage_Type ecore_evas_avoid_damage_get(const Ecore_Evas *ee); -EAPI void ecore_evas_withdrawn_set(Ecore_Evas *ee, int withdrawn); -EAPI int ecore_evas_withdrawn_get(const Ecore_Evas *ee); -EAPI void ecore_evas_sticky_set(Ecore_Evas *ee, int sticky); -EAPI int ecore_evas_sticky_get(const Ecore_Evas *ee); -EAPI void ecore_evas_ignore_events_set(Ecore_Evas *ee, int ignore); -EAPI int ecore_evas_ignore_events_get(const Ecore_Evas *ee); -EAPI void ecore_evas_manual_render_set(Ecore_Evas *ee, int manual_render); -EAPI int ecore_evas_manual_render_get(const Ecore_Evas *ee); +EAPI void ecore_evas_withdrawn_set(Ecore_Evas *ee, Eina_Bool withdrawn); +EAPI Eina_Bool ecore_evas_withdrawn_get(const Ecore_Evas *ee); +EAPI void ecore_evas_sticky_set(Ecore_Evas *ee, Eina_Bool sticky); +EAPI Eina_Bool ecore_evas_sticky_get(const Ecore_Evas *ee); +EAPI void ecore_evas_ignore_events_set(Ecore_Evas *ee, Eina_Bool ignore); +EAPI Eina_Bool ecore_evas_ignore_events_get(const Ecore_Evas *ee); +EAPI void ecore_evas_manual_render_set(Ecore_Evas *ee, Eina_Bool manual_render); +EAPI Eina_Bool ecore_evas_manual_render_get(const Ecore_Evas *ee); EAPI void ecore_evas_manual_render(Ecore_Evas *ee); -EAPI void ecore_evas_comp_sync_set(Ecore_Evas *ee, int do_sync); -EAPI int ecore_evas_comp_sync_get(const Ecore_Evas *ee); +EAPI void ecore_evas_comp_sync_set(Ecore_Evas *ee, Eina_Bool do_sync); +EAPI Eina_Bool ecore_evas_comp_sync_get(const Ecore_Evas *ee); EAPI Ecore_Window ecore_evas_window_get(const Ecore_Evas *ee); -EAPI int ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_Associate_Flags flags); -EAPI int ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj); +EAPI Eina_Bool ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_Associate_Flags flags); +EAPI Eina_Bool ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj); EAPI Evas_Object *ecore_evas_object_associate_get(const Ecore_Evas *ee); /* helper function to be used with ECORE_GETOPT_CALLBACK_*() */ diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index 866e8e8..2742023 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c @@ -287,15 +287,15 @@ ecore_evas_shutdown(void) return _ecore_evas_init_count; } -int _ecore_evas_app_comp_sync = 1; +Eina_Bool _ecore_evas_app_comp_sync = 1; EAPI void -ecore_evas_app_comp_sync_set(int do_sync) +ecore_evas_app_comp_sync_set(Eina_Bool do_sync) { _ecore_evas_app_comp_sync = do_sync; } -EAPI int +EAPI Eina_Bool ecore_evas_app_comp_sync_get(void) { return _ecore_evas_app_comp_sync; @@ -1505,17 +1505,17 @@ ecore_evas_rotation_get(const Ecore_Evas *ee) /** * Set whether an Ecore_Evas is shaped or not. * @param ee The Ecore_Evas to shape - * @param shaped 1 to shape, 0 to not + * @param shaped EINA_TRUE to shape, EINA_FALSE to not * * This function allows one to make an Ecore_Evas shaped to the contents of the - * evas. If @p shaped is 1, @p ee will be transparent in parts of the evas that - * contain no objects. If @p shaped is 0, then @p ee will be rectangular, and + * evas. If @p shaped is EINA_TRUE, @p ee will be transparent in parts of the evas that + * contain no objects. If @p shaped is EINA_FALSE, then @p ee will be rectangular, and * and parts with no data will show random framebuffer artifacting. For * non-shaped Ecore_Evases, it is recommend to cover the entire evas with a * background object. */ EAPI void -ecore_evas_shaped_set(Ecore_Evas *ee, int shaped) +ecore_evas_shaped_set(Ecore_Evas *ee, Eina_Bool shaped) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { @@ -1530,26 +1530,26 @@ ecore_evas_shaped_set(Ecore_Evas *ee, int shaped) /** * Query whether an Ecore_Evas is shaped or not. * @param ee The Ecore_Evas to query. - * @return 1 if shaped, 0 if not. + * @return EINA_TRUE if shaped, EINA_FALSE if not. * - * This function returns 1 if @p ee is shaped, and 0 if not. + * This function returns EINA_TRUE if @p ee is shaped, and EINA_FALSE if not. */ -EAPI int +EAPI Eina_Bool ecore_evas_shaped_get(const Ecore_Evas *ee) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_shaped_get"); - return 0; + return EINA_FALSE; } - return ee->shaped ? 1:0; + return ee->shaped ? EINA_TRUE : EINA_FALSE; } /** * Set whether an Ecore_Evas has an alpha channel or not. * @param ee The Ecore_Evas to shape - * @param alpha 1 to enable the alpha channel, 0 to disable it + * @param alpha EINA_TRUE to enable the alpha channel, EINA_FALSE to disable it * * This function allows you to make an Ecore_Evas translucent using an * alpha channel. See ecore_evas_shaped_set() for details. The difference @@ -1559,7 +1559,7 @@ ecore_evas_shaped_get(const Ecore_Evas *ee) * it's transparent). */ EAPI void -ecore_evas_alpha_set(Ecore_Evas *ee, int alpha) +ecore_evas_alpha_set(Ecore_Evas *ee, Eina_Bool alpha) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { @@ -1574,27 +1574,27 @@ ecore_evas_alpha_set(Ecore_Evas *ee, int alpha) /** * Query whether an Ecore_Evas has an alpha channel. * @param ee The Ecore_Evas to query. - * @return 1 if ee has an alpha channel, 0 if it does not. + * @return EINA_TRUE if ee has an alpha channel, EINA_FALSE if it does not. * - * This function returns 1 if @p ee has an alpha channel, and 0 if + * This function returns EINA_TRUE if @p ee has an alpha channel, and EINA_FALSE if * it does not. */ -EAPI int +EAPI Eina_Bool ecore_evas_alpha_get(const Ecore_Evas *ee) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_alpha_get"); - return 0; + return EINA_FALSE; } - return ee->alpha ? 1:0; + return ee->alpha ? EINA_TRUE : EINA_FALSE; } /** * Set whether an Ecore_Evas has an transparent window or not. * @param ee The Ecore_Evas to shape - * @param transparent 1 to enable the transparent window, 0 to disable it + * @param transparent EINA_TRUE to enable the transparent window, EINA_FALSE to disable it * * This function allows you to make an Ecore_Evas translucent using an * alpha channel. See ecore_evas_shaped_set() for details. The difference @@ -1604,7 +1604,7 @@ ecore_evas_alpha_get(const Ecore_Evas *ee) * it's transparent). */ EAPI void -ecore_evas_transparent_set(Ecore_Evas *ee, int transparent) +ecore_evas_transparent_set(Ecore_Evas *ee, Eina_Bool transparent) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { @@ -1619,21 +1619,21 @@ ecore_evas_transparent_set(Ecore_Evas *ee, int transparent) /** * Query whether an Ecore_Evas has an alpha channel. * @param ee The Ecore_Evas to query. - * @return 1 if ee has an alpha channel, 0 if it does not. + * @return EINA_TRUE if ee has an alpha channel, EINA_FALSE if it does not. * - * This function returns 1 if @p ee has an alpha channel, and 0 if + * This function returns EINA_TRUE if @p ee has an alpha channel, and EINA_FALSE if * it does not. */ -EAPI int +EAPI Eina_Bool ecore_evas_transparent_get(const Ecore_Evas *ee) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_transparent_get"); - return 0; + return EINA_FALSE; } - return ee->transparent ? 1:0; + return ee->transparent ? EINA_TRUE : 0; } /** @@ -2205,12 +2205,12 @@ ecore_evas_layer_get(const Ecore_Evas *ee) /** * Set the focus of an Ecore_Evas' window * @param ee The Ecore_Evas - * @param on 1 for focus, 0 to defocus. + * @param on EINA_TRUE for focus, EINA_FALSE to defocus. * - * This function focuses @p ee if @p on is 1, or defocuses @p ee if @p on is 0. + * This function focuses @p ee if @p on is EINA_TRUE, or defocuses @p ee if @p on is EINA_FALSE. */ EAPI void -ecore_evas_focus_set(Ecore_Evas *ee, int on) +ecore_evas_focus_set(Ecore_Evas *ee, Eina_Bool on) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { @@ -2225,31 +2225,31 @@ ecore_evas_focus_set(Ecore_Evas *ee, int on) /** * Query whether an Ecore_Evas' window is focused or not * @param ee The Ecore_Evas to set - * @return 1 if @p ee if focused, 0 if not. + * @return EINA_TRUE if @p ee if focused, EINA_FALSE if not. * */ -EAPI int +EAPI Eina_Bool ecore_evas_focus_get(const Ecore_Evas *ee) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_focus_get"); - return 0; + return EINA_FALSE; } - return ee->prop.focused ? 1:0; + return ee->prop.focused ? EINA_TRUE : EINA_FALSE; } /** * Iconify or uniconify an Ecore_Evas' window * @param ee The Ecore_Evas - * @param on 1 to iconify, 0 to uniconify. + * @param on EINA_TRUE to iconify, EINA_FALSE to uniconify. * - * This function iconifies @p ee if @p on is 1, or uniconifies @p ee if @p on - * is 0. + * This function iconifies @p ee if @p on is EINA_TRUE, or uniconifies @p ee if @p on + * is EINA_FALSE. */ EAPI void -ecore_evas_iconified_set(Ecore_Evas *ee, int on) +ecore_evas_iconified_set(Ecore_Evas *ee, Eina_Bool on) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { @@ -2264,31 +2264,31 @@ ecore_evas_iconified_set(Ecore_Evas *ee, int on) /** * Query whether an Ecore_Evas' window is iconified or not * @param ee The Ecore_Evas to set - * @return 1 if @p ee is iconified, 0 if not. + * @return EINA_TRUE if @p ee is iconified, EINA_FALSE if not. * */ -EAPI int +EAPI Eina_Bool ecore_evas_iconified_get(const Ecore_Evas *ee) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_iconified_get"); - return 0; + return EINA_FALSE; } - return ee->prop.iconified ? 1:0; + return ee->prop.iconified ? EINA_TRUE : EINA_FALSE; } /** * Set whether an Ecore_Evas' window is borderless or not * @param ee The Ecore_Evas - * @param on 1 for borderless, 0 for bordered. + * @param on EINA_TRUE for borderless, EINA_FALSE for bordered. * - * This function makes @p ee borderless if @p on is 1, or bordered if @p on - * is 0. + * This function makes @p ee borderless if @p on is EINA_TRUE, or bordered if @p on + * is EINA_FALSE. */ EAPI void -ecore_evas_borderless_set(Ecore_Evas *ee, int on) +ecore_evas_borderless_set(Ecore_Evas *ee, Eina_Bool on) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { @@ -2303,31 +2303,31 @@ ecore_evas_borderless_set(Ecore_Evas *ee, int on) /** * Query whether an Ecore_Evas' window is borderless or not * @param ee The Ecore_Evas to set - * @return 1 if @p ee is borderless, 0 if not. + * @return EINA_TRUE if @p ee is borderless, EINA_FALSE if not. * */ -EAPI int +EAPI Eina_Bool ecore_evas_borderless_get(const Ecore_Evas *ee) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_borderless_get"); - return 0; + return EINA_FALSE; } - return ee->prop.borderless ? 1:0; + return ee->prop.borderless ? EINA_TRUE : EINA_FALSE; } /** * Tell the WM whether or not to ignore an Ecore_Evas' window * @param ee The Ecore_Evas - * @param on 1 to ignore, 0 to not. + * @param on EINA_TRUE to ignore, EINA_FALSE to not. * - * This function causes the window manager to ignore @p ee if @p on is 1, - * or not ignore @p ee if @p on is 0. + * This function causes the window manager to ignore @p ee if @p on is EINA_TRUE, + * or not ignore @p ee if @p on is EINA_FALSE. */ EAPI void -ecore_evas_override_set(Ecore_Evas *ee, int on) +ecore_evas_override_set(Ecore_Evas *ee, Eina_Bool on) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { @@ -2342,31 +2342,31 @@ ecore_evas_override_set(Ecore_Evas *ee, int on) /** * Query whether an Ecore_Evas' window is overridden or not * @param ee The Ecore_Evas to set - * @return 1 if @p ee is overridden, 0 if not. + * @return EINA_TRUE if @p ee is overridden, EINA_FALSE if not. * */ -EAPI int +EAPI Eina_Bool ecore_evas_override_get(const Ecore_Evas *ee) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_override_get"); - return 0; + return EINA_FALSE; } - return ee->prop.override ? 1:0; + return ee->prop.override ? EINA_TRUE : EINA_FALSE; } /** * Maximize (or unmaximize) an Ecore_Evas' window * @param ee The Ecore_Evas - * @param on 1 to maximize, 0 to unmaximize. + * @param on EINA_TRUE to maximize, EINA_FALSE to unmaximize. * - * This function maximizes @p ee if @p on is 1, or unmaximizes @p ee - * if @p on is 0. + * This function maximizes @p ee if @p on is EINA_TRUE, or unmaximizes @p ee + * if @p on is EINA_FALSE. */ EAPI void -ecore_evas_maximized_set(Ecore_Evas *ee, int on) +ecore_evas_maximized_set(Ecore_Evas *ee, Eina_Bool on) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { @@ -2381,31 +2381,31 @@ ecore_evas_maximized_set(Ecore_Evas *ee, int on) /** * Query whether an Ecore_Evas' window is maximized or not * @param ee The Ecore_Evas to set - * @return 1 if @p ee is maximized, 0 if not. + * @return EINA_TRUE if @p ee is maximized, EINA_FALSE if not. * */ -EAPI int +EAPI Eina_Bool ecore_evas_maximized_get(const Ecore_Evas *ee) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_maximized_get"); - return 0; + return EINA_FALSE; } - return ee->prop.maximized ? 1:0; + return ee->prop.maximized ? EINA_TRUE : EINA_FALSE; } /** * Set whether or not an Ecore_Evas' window is fullscreen * @param ee The Ecore_Evas - * @param on 1 fullscreen, 0 not. + * @param on EINA_TRUE fullscreen, EINA_FALSE not. * - * This function causes @p ee to be fullscreen if @p on is 1, - * or not if @p on is 0. + * This function causes @p ee to be fullscreen if @p on is EINA_TRUE, + * or not if @p on is EINA_FALSE. */ EAPI void -ecore_evas_fullscreen_set(Ecore_Evas *ee, int on) +ecore_evas_fullscreen_set(Ecore_Evas *ee, Eina_Bool on) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { @@ -2420,26 +2420,26 @@ ecore_evas_fullscreen_set(Ecore_Evas *ee, int on) /** * Query whether an Ecore_Evas' window is fullscreen or not * @param ee The Ecore_Evas to set - * @return 1 if @p ee is fullscreen, 0 if not. + * @return EINA_TRUE if @p ee is fullscreen, EINA_FALSE if not. * */ -EAPI int +EAPI Eina_Bool ecore_evas_fullscreen_get(const Ecore_Evas *ee) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_fullscreen_get"); - return 0; + return EINA_FALSE; } - return ee->prop.fullscreen ? 1:0; + return ee->prop.fullscreen ? EINA_TRUE : EINA_FALSE; } /** * Set whether or not an Ecore_Evas' window should avoid damage * * @param ee The Ecore_Evas - * @param on 1 to avoid damage, 0 to not + * @param The type of the damage management * * This function causes @p ee to be drawn to a pixmap to avoid recalculations. * On expose events it will copy from the pixmap to the window. @@ -2460,7 +2460,7 @@ ecore_evas_avoid_damage_set(Ecore_Evas *ee, Ecore_Evas_Avoid_Damage_Type on) /** * Query whether an Ecore_Evas' window avoids damage or not * @param ee The Ecore_Evas to set - * @return 1 if @p ee avoids damage, 0 if not. + * @return The type of the damage management * */ EAPI Ecore_Evas_Avoid_Damage_Type @@ -2470,7 +2470,7 @@ ecore_evas_avoid_damage_get(const Ecore_Evas *ee) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_avoid_damage_get"); - return 0; + return ECORE_EVAS_AVOID_DAMAGE_NONE; } return ee->prop.avoid_damage; } @@ -2482,7 +2482,7 @@ ecore_evas_avoid_damage_get(const Ecore_Evas *ee) * */ EAPI void -ecore_evas_withdrawn_set(Ecore_Evas *ee, int withdrawn) +ecore_evas_withdrawn_set(Ecore_Evas *ee, Eina_Bool withdrawn) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { @@ -2501,16 +2501,16 @@ ecore_evas_withdrawn_set(Ecore_Evas *ee, int withdrawn) * @return The Ecore_Evas window's withdrawn state. * */ -EAPI int +EAPI Eina_Bool ecore_evas_withdrawn_get(const Ecore_Evas *ee) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_withdrawn_get"); - return 0; + return EINA_FALSE; } else - return ee->prop.withdrawn ? 1:0; + return ee->prop.withdrawn ? EINA_TRUE : EINA_FALSE; } /** @@ -2521,7 +2521,7 @@ ecore_evas_withdrawn_get(const Ecore_Evas *ee) * */ EAPI void -ecore_evas_sticky_set(Ecore_Evas *ee, int sticky) +ecore_evas_sticky_set(Ecore_Evas *ee, Eina_Bool sticky) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { @@ -2541,16 +2541,16 @@ ecore_evas_sticky_set(Ecore_Evas *ee, int sticky) * @return The Ecore_Evas window's sticky state. * */ -EAPI int +EAPI Eina_Bool ecore_evas_sticky_get(const Ecore_Evas *ee) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_sticky_get"); - return 0; + return EINA_FALSE; } else - return ee->prop.sticky ? 1:0; + return ee->prop.sticky ? EINA_TRUE : EINA_FALSE; } /** @@ -2561,7 +2561,7 @@ ecore_evas_sticky_get(const Ecore_Evas *ee) * */ EAPI void -ecore_evas_ignore_events_set(Ecore_Evas *ee, int ignore) +ecore_evas_ignore_events_set(Ecore_Evas *ee, Eina_Bool ignore) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { @@ -2581,20 +2581,20 @@ ecore_evas_ignore_events_set(Ecore_Evas *ee, int ignore) * @return The Ecore_Evas window's ignore state. * */ -EAPI int +EAPI Eina_Bool ecore_evas_ignore_events_get(const Ecore_Evas *ee) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_ignore_events_get"); - return 0; + return EINA_FALSE; } - return ee->ignore_events ? 1 : 0; + return ee->ignore_events ? EINA_TRUE : EINA_FALSE; } EAPI void -ecore_evas_manual_render_set(Ecore_Evas *ee, int manual_render) +ecore_evas_manual_render_set(Ecore_Evas *ee, Eina_Bool manual_render) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { @@ -2605,16 +2605,16 @@ ecore_evas_manual_render_set(Ecore_Evas *ee, int manual_render) ee->manual_render = manual_render; } -EAPI int +EAPI Eina_Bool ecore_evas_manual_render_get(const Ecore_Evas *ee) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_manual_render_get"); - return 0; + return EINA_FALSE; } - return ee->manual_render ? 1 : 0; + return ee->manual_render ? EINA_TRUE : EINA_FALSE; } EAPI void @@ -2631,7 +2631,7 @@ ecore_evas_manual_render(Ecore_Evas *ee) } EAPI void -ecore_evas_comp_sync_set(Ecore_Evas *ee, int do_sync) +ecore_evas_comp_sync_set(Ecore_Evas *ee, Eina_Bool do_sync) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { @@ -2642,14 +2642,14 @@ ecore_evas_comp_sync_set(Ecore_Evas *ee, int do_sync) ee->no_comp_sync = !do_sync; } -EAPI int +EAPI Eina_Bool ecore_evas_comp_sync_get(const Ecore_Evas *ee) { if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, "ecore_evas_comp_sync_get"); - return 0; + return EINA_FALSE; } return !ee->no_comp_sync; } diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h index ff9d818..a89d6fc 100644 --- a/src/lib/ecore_evas/ecore_evas_private.h +++ b/src/lib/ecore_evas/ecore_evas_private.h @@ -380,6 +380,6 @@ void _ecore_evas_free(Ecore_Evas *ee); void _ecore_evas_idle_timeout_update(Ecore_Evas *ee); void _ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int timestamp); -extern int _ecore_evas_app_comp_sync; +extern Eina_Bool _ecore_evas_app_comp_sync; #endif diff --git a/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c index edca36d..15fac2f 100644 --- a/src/lib/ecore_evas/ecore_evas_util.c +++ b/src/lib/ecore_evas/ecore_evas_util.c @@ -255,9 +255,9 @@ _ecore_evas_object_evas_check(const char *function, const Ecore_Evas *ee, const * @param ee The Ecore_Evas to associate to @a obj * @param obj The object to associate to @a ee * @param flags The association flags. - * @return 1 on success, 0 otherwise. + * @return EINA_TRUE on success, EINA_FALSE otherwise. */ -EAPI int +EAPI Eina_Bool ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_Associate_Flags flags) { Ecore_Evas *old_ee; @@ -266,12 +266,12 @@ ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_ if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__); - return 0; + return EINA_FALSE; } - CHECK_PARAM_POINTER_RETURN("obj", obj, 0); + CHECK_PARAM_POINTER_RETURN("obj", obj, EINA_FALSE); if (!_ecore_evas_object_evas_check(__FUNCTION__, ee, obj)) - return 0; + return EINA_FALSE; old_ee = _evas_object_associate_get(obj);; if (old_ee) @@ -282,7 +282,7 @@ ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_ ecore_evas_object_dissociate(ee, old_obj); _ecore_evas_object_associate(ee, obj, flags); - return 1; + return EINA_TRUE; } /** @@ -290,9 +290,9 @@ ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_ * * @param ee The Ecore_Evas to dissociate from @a obj * @param obj The object to dissociate from @a ee - * @return 1 on success, 0 otherwise. + * @return EINA_TRUE on success, EINA_FALSE otherwise. */ -EAPI int +EAPI Eina_Bool ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj) { Ecore_Evas *old_ee; @@ -301,27 +301,27 @@ ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj) if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__); - return 0; + return EINA_FALSE; } - CHECK_PARAM_POINTER_RETURN("obj", obj, 0); + CHECK_PARAM_POINTER_RETURN("obj", obj, EINA_FALSE); old_ee = _evas_object_associate_get(obj); if (ee != old_ee) { ERR("ERROR: trying to dissociate object that is not using " "this Ecore_Evas: %p != %p", ee, old_ee); - return 0; + return EINA_FALSE; } old_obj = _ecore_evas_associate_get(ee); if (old_obj != obj) { ERR("ERROR: trying to dissociate object that is not being " "used by this Ecore_Evas: %p != %p", old_obj, obj); - return 0; + return EINA_FALSE; } _ecore_evas_object_dissociate(ee, obj); - return 1; + return EINA_TRUE; } EAPI Evas_Object * diff --git a/src/lib/ecore_evas/ecore_evas_x.c b/src/lib/ecore_evas/ecore_evas_x.c index 0dc895d..a45cc72 100644 --- a/src/lib/ecore_evas/ecore_evas_x.c +++ b/src/lib/ecore_evas/ecore_evas_x.c @@ -3225,7 +3225,7 @@ ecore_evas_software_x11_window_get(const Ecore_Evas *ee __UNUSED__) */ #ifdef BUILD_ECORE_EVAS_SOFTWARE_X11 EAPI void -ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee, int on) +ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on) { ee->engine.x.direct_resize = on; if (ee->prop.avoid_damage) @@ -3249,7 +3249,7 @@ ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee, int on) } #else EAPI void -ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee __UNUSED__, int on __UNUSED__) +ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee __UNUSED__, Eina_Bool on __UNUSED__) { } #endif @@ -3260,13 +3260,13 @@ ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee __UNUSED__, int on __UN * FIXME: To be fixed. */ #ifdef BUILD_ECORE_EVAS_SOFTWARE_X11 -EAPI int +EAPI Eina_Bool ecore_evas_software_x11_direct_resize_get(const Ecore_Evas *ee) { return ee->engine.x.direct_resize; } #else -EAPI int +EAPI Eina_Bool ecore_evas_software_x11_direct_resize_get(const Ecore_Evas *ee __UNUSED__) { return 0; @@ -3456,13 +3456,13 @@ ecore_evas_gl_x11_window_get(const Ecore_Evas *ee __UNUSED__) */ #ifdef BUILD_ECORE_EVAS_OPENGL_X11 EAPI void -ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee, int on) +ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on) { ee->engine.x.direct_resize = on; } #else EAPI void -ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee __UNUSED__, int on __UNUSED__) +ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee __UNUSED__, Eina_Bool on __UNUSED__) { } #endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */ @@ -3473,13 +3473,13 @@ ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee __UNUSED__, int on __UNUSED__ * FIXME: To be fixed. */ #ifdef BUILD_ECORE_EVAS_OPENGL_X11 -EAPI int +EAPI Eina_Bool ecore_evas_gl_x11_direct_resize_get(const Ecore_Evas *ee) { return ee->engine.x.direct_resize; } #else -EAPI int +EAPI Eina_Bool ecore_evas_gl_x11_direct_resize_get(const Ecore_Evas *ee __UNUSED__) { return 0; @@ -3748,13 +3748,13 @@ ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee __UNUSED__) */ #if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB) EAPI void -ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, int on) +ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on) { ee->engine.x.direct_resize = on; } #else EAPI void -ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee __UNUSED__, int on __UNUSED__) +ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee __UNUSED__, Eina_Bool on __UNUSED__) { } #endif /* ! BUILD_ECORE_EVAS_XRENDER_X11 && ! BUILD_ECORE_EVAS_XRENDER_XCB */ @@ -3765,13 +3765,13 @@ ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee __UNUSED__, int on __UNU * FIXME: To be fixed. */ #if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB) -EAPI int +EAPI Eina_Bool ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee) { return ee->engine.x.direct_resize; } #else -EAPI int +EAPI Eina_Bool ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee __UNUSED__) { return 0; @@ -3971,7 +3971,7 @@ ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee __UNUSED__) */ #if BUILD_ECORE_EVAS_SOFTWARE_16_X11 EAPI void -ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, int on) +ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, Eina_Bool on) { ee->engine.x.direct_resize = on; if (ee->prop.avoid_damage) @@ -3995,7 +3995,7 @@ ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, int on) } #else EAPI void -ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee __UNUSED__, int on __UNUSED__) +ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee __UNUSED__, Eina_Bool on __UNUSED__) { } #endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ @@ -4006,13 +4006,13 @@ ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee __UNUSED__, int on _ * FIXME: To be fixed. */ #if BUILD_ECORE_EVAS_SOFTWARE_16_X11 -EAPI int +EAPI Eina_Bool ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee) { return ee->engine.x.direct_resize; } #else -EAPI int +EAPI Eina_Bool ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee __UNUSED__) { return 0; @@ -4291,7 +4291,7 @@ ecore_evas_software_x11_8_subwindow_get(const Ecore_Evas *ee) * FIXME: To be fixed. */ EAPI void -ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee, int on) +ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee, Eina_Bool on) { #if defined (BUILD_ECORE_EVAS_SOFTWARE_8_X11) ee->engine.x.direct_resize = on; @@ -4325,7 +4325,7 @@ ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee, int on) * * FIXME: To be fixed. */ -EAPI int +EAPI Eina_Bool ecore_evas_software_x11_8_direct_resize_get(const Ecore_Evas *ee) { #if defined (BUILD_ECORE_EVAS_SOFTWARE_8_X11) -- 2.7.4