discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=eba912cf6a570ef3391eae733e56c9a46b9de0b7
commit eba912cf6a570ef3391eae733e56c9a46b9de0b7 Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 5 10:51:36 2014 -0500 e_client_resizing_get() -> e_client_util_resizing_get() functions in e_client.x should be namespaced with e_client_util to indicate that they are inline (and in e_client.x) --- src/bin/e_actions.c | 2 +- src/bin/e_client.c | 16 ++++++++-------- src/bin/e_client.x | 2 +- src/bin/e_comp_object.c | 6 +++--- src/bin/e_comp_x.c | 4 ++-- src/bin/e_pixmap.c | 2 +- src/modules/wl_desktop_shell/e_mod_main.c | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index 3c8950f..8159ef8 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -185,7 +185,7 @@ ACT_FN_GO_SIGNAL(window_resize, ) else { if (!params) params = ""; - if (e_client_resizing_get((E_Client *)obj)) + if (e_client_util_resizing_get((E_Client *)obj)) e_client_signal_resize_end((E_Client *)obj, params, sig, src); else e_client_signal_resize_begin((E_Client *)obj, params, sig, src); diff --git a/src/bin/e_client.c b/src/bin/e_client.c index dcd2daa..397f667 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -1338,7 +1338,7 @@ _e_client_cb_evas_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_ _e_client_zone_update(ec); - if (e_client_resizing_get(ec) || (ecresize == ec)) + if (e_client_util_resizing_get(ec) || (ecresize == ec)) _e_client_hook_call(E_CLIENT_HOOK_RESIZE_UPDATE, ec); e_remember_update(ec); } @@ -2596,7 +2596,7 @@ e_client_mouse_move(E_Client *ec, Evas_Point *output) evas_object_move(ec->frame, new_x, new_y); e_zone_flip_coords_handle(ec->zone, output->x, output->y); } - else if (e_client_resizing_get(ec)) + else if (e_client_util_resizing_get(ec)) { _e_client_resize_handle(ec); } @@ -3792,7 +3792,7 @@ e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev) { E_OBJECT_CHECK(ec); E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE); - if (e_client_resizing_get(ec) || (ec->moving)) return; + if (e_client_util_resizing_get(ec) || (ec->moving)) return; if (!_e_client_move_begin(ec)) return; @@ -3827,7 +3827,7 @@ e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev) E_OBJECT_CHECK(ec); E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE); if (ec->lock_user_size || ec->shaded || ec->shading) return; - if (e_client_resizing_get(ec) || (ec->moving)) return; + if (e_client_util_resizing_get(ec) || (ec->moving)) return; if (ev) { char source[256]; @@ -3893,7 +3893,7 @@ e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUS { E_OBJECT_CHECK(ec); E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE); - if (e_client_resizing_get(ec)) + if (e_client_util_resizing_get(ec)) { _e_client_resize_end(ec); ec->changes.reset_gravity = 1; @@ -4146,7 +4146,7 @@ e_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_U E_OBJECT_CHECK(ec); E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE); - if (e_client_resizing_get(ec) || (ec->moving)) return; + if (e_client_util_resizing_get(ec) || (ec->moving)) return; if (!_e_client_move_begin(ec)) return; ec->moving = 1; e_pointer_mode_push(ec, E_POINTER_MOVE); @@ -4184,7 +4184,7 @@ e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, con E_OBJECT_CHECK(ec); E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE); - if (e_client_resizing_get(ec) || (ec->moving)) return; + if (e_client_util_resizing_get(ec) || (ec->moving)) return; if (!strcmp(dir, "tl")) { resize_mode = E_POINTER_RESIZE_TL; @@ -4243,7 +4243,7 @@ e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char { E_OBJECT_CHECK(ec); E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE); - if (!e_client_resizing_get(ec)) return; + if (!e_client_util_resizing_get(ec)) return; _e_client_resize_handle(ec); _e_client_resize_end(ec); ec->changes.reset_gravity = 1; diff --git a/src/bin/e_client.x b/src/bin/e_client.x index dbe1fa5..bcbe0f1 100644 --- a/src/bin/e_client.x +++ b/src/bin/e_client.x @@ -98,7 +98,7 @@ e_client_util_win_get(const E_Client *ec) } static inline Eina_Bool -e_client_resizing_get(const E_Client *ec) +e_client_util_resizing_get(const E_Client *ec) { if (!ec) return EINA_FALSE; return (ec->resize_mode != E_POINTER_RESIZE_NONE); diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index d8ef33a..1ec503b 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -701,7 +701,7 @@ _e_comp_intercept_move(void *data, Evas_Object *obj, int x, int y) return; } cw->ec->x = x, cw->ec->y = y; - if (e_client_resizing_get(cw->ec) && (!cw->force_move)) return; + if (e_client_util_resizing_get(cw->ec) && (!cw->force_move)) return; if (!cw->ec->shading) { cw->ec->client.x = ix; @@ -753,7 +753,7 @@ _e_comp_intercept_resize(void *data, Evas_Object *obj, int w, int h) } return; } - if ((!cw->ec->internal) && e_client_resizing_get(cw->ec) && cw->ec->netwm.sync.request && + if ((!cw->ec->internal) && e_client_util_resizing_get(cw->ec) && cw->ec->netwm.sync.request && ((cw->ec->w != w) && (cw->ec->h != h))) { /* this is ugly. */ @@ -2814,7 +2814,7 @@ e_comp_object_render_update_add(Evas_Object *obj) if (e_object_is_del(E_OBJECT(cw->ec))) CRI("CAN'T RENDER A DELETED CLIENT!"); if (!e_pixmap_usable_get(cw->ec->pixmap)) return; - //if (e_client_resizing_get(cw->ec) && (e_pixmap_type_get(cw->ec->pixmap) == E_PIXMAP_TYPE_WL)) + //if (e_client_util_resizing_get(cw->ec) && (e_pixmap_type_get(cw->ec->pixmap) == E_PIXMAP_TYPE_WL)) //INF("WL RENDER UPDATE"); if (!cw->update) { diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 6f4237c..dc8ca59 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -2080,7 +2080,7 @@ _e_comp_x_mouse_move(void *d EINA_UNUSED, int t EINA_UNUSED, Ecore_Event_Mouse_M if (!ec) return ECORE_CALLBACK_RENEW; E_COMP_X_PIXMAP_CHECK ECORE_CALLBACK_RENEW; if (ec->comp_data->deleted) return ECORE_CALLBACK_RENEW; - if (e_client_resizing_get(ec) && + if (e_client_util_resizing_get(ec) && ec->netwm.sync.request && ec->comp_data->alarm ) @@ -3256,7 +3256,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec) // if (ec->icccm.step_w < 1) ec->icccm.step_w = 1; // if (ec->icccm.step_h < 1) ec->icccm.step_h = 1; // if doing a resize, fix it up - if (e_client_resizing_get(ec)) + if (e_client_util_resizing_get(ec)) { int x, y, w, h, new_w, new_h; diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c index c8f9156..97952cd 100644 --- a/src/bin/e_pixmap.c +++ b/src/bin/e_pixmap.c @@ -333,7 +333,7 @@ e_pixmap_refresh(E_Pixmap *cp) success = !!pixmap; if (!success) break; if (ecore_x_present_exists() && cp->client->comp_data->pw && cp->client->comp_data->ph && - (!e_client_resizing_get(cp->client))) //PRESENT is unreliable during resizes + (!e_client_util_resizing_get(cp->client))) //PRESENT is unreliable during resizes { pw = cp->client->comp_data->pw; ph = cp->client->comp_data->ph; diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c index d9d99a3..18b5a6c 100644 --- a/src/modules/wl_desktop_shell/e_mod_main.c +++ b/src/modules/wl_desktop_shell/e_mod_main.c @@ -820,7 +820,7 @@ _e_wl_shell_shell_surface_configure(E_Wayland_Surface *ews, Evas_Coord x, Evas_C else if ((changed_type) || (x != 0) || (y != 0) || (ews->geometry.w != w) || (ews->geometry.h != h)) { - if (ews->ec && e_client_resizing_get(ews->ec)) return; + if (ews->ec && e_client_util_resizing_get(ews->ec)) return; ews->geometry.w = w; ews->geometry.h = h; ews->geometry.changed = EINA_TRUE; --
