discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=1fe1c942456554846a2caa9b834b2e4e20ee36f6
commit 1fe1c942456554846a2caa9b834b2e4e20ee36f6
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Fri Mar 13 15:54:51 2015 -0400
comp canvas functions no longer require an E_Comp param
---
src/bin/e_actions.c | 14 +++---
src/bin/e_bindings.c | 8 +--
src/bin/e_client.c | 30 +++++------
src/bin/e_comp.c | 2 +-
src/bin/e_comp_canvas.c | 66 ++++++++++++-------------
src/bin/e_comp_canvas.h | 30 +++++------
src/bin/e_comp_object.c | 2 +-
src/bin/e_comp_x.c | 24 ++++-----
src/bin/e_dnd.c | 4 +-
src/bin/e_menu.c | 4 +-
src/bin/e_remember.c | 2 +-
src/bin/e_shelf.c | 14 +++---
src/modules/appmenu/e_mod_appmenu_render.c | 2 +-
src/modules/conf_randr/e_smart_monitor.c | 2 +-
src/modules/conf_theme/e_int_config_wallpaper.c | 4 +-
src/modules/everything/evry.c | 8 +--
src/modules/gadman/e_mod_gadman.c | 2 +-
src/modules/ibar/e_mod_main.c | 4 +-
src/modules/illume2/e_mod_quickpanel.c | 8 +--
src/modules/lokker/lokker.c | 17 +++----
src/modules/policy_mobile/e_mod_config.c | 2 +-
src/modules/tiling/e_mod_tiling.c | 8 +--
src/modules/wl_drm/e_mod_main.c | 2 +-
src/modules/wl_fb/e_mod_main.c | 2 +-
src/modules/wl_x11/e_mod_main.c | 2 +-
25 files changed, 127 insertions(+), 136 deletions(-)
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index 9b9481d..da276a8 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -1305,7 +1305,7 @@ ACT_FN_GO(window_zone_move_by, )
move = eina_list_count(ec->zone->comp->zones) - 1;
else if ((unsigned int)move >= eina_list_count(ec->zone->comp->zones))
move = 0;
- zone = e_comp_zone_number_get(e_comp, move);
+ zone = e_comp_zone_number_get(move);
if (!zone) return;
max = ec->maximized;
fs = ec->fullscreen_policy;
@@ -1655,14 +1655,14 @@ ACT_FN_GO(screen_send_to, )
if (scr != -1)
scr = scr % eina_list_count(e_manager_list());
if (scr < 0) scr += eina_list_count(e_manager_list());
- zone2 = e_comp_zone_number_get(e_comp, 0);
+ zone2 = e_comp_zone_number_get(0);
}
else
{
if (scr != -1)
scr = scr % eina_list_count(zone->comp->zones);
if (scr < 0) scr += eina_list_count(zone->comp->zones);
- zone2 = e_comp_zone_number_get(e_comp, scr);
+ zone2 = e_comp_zone_number_get(scr);
}
if ((zone2) && (zone != zone2))
{
@@ -1692,7 +1692,7 @@ ACT_FN_GO(screen_send_by, )
if (scr != -1)
scr = scr % eina_list_count(e_manager_list());
if (scr < 0) scr += eina_list_count(e_manager_list());
- zone2 = e_comp_zone_number_get(e_comp, 0);
+ zone2 = e_comp_zone_number_get(0);
}
else
{
@@ -1700,7 +1700,7 @@ ACT_FN_GO(screen_send_by, )
if (scr != -1)
scr = scr % eina_list_count(zone->comp->zones);
if (scr < 0) scr += eina_list_count(zone->comp->zones);
- zone2 = e_comp_zone_number_get(e_comp, scr);
+ zone2 = e_comp_zone_number_get(scr);
}
if ((zone2) && (zone != zone2))
{
@@ -1720,7 +1720,7 @@ ACT_FN_GO(screen_send_by, )
act; \
} } \
else if ((con_num < 0) && (zone_num >= 0)) /* c=all zone=1 */ { \
- zone = e_comp_zone_number_get(c, zone_num); \
+ zone = e_comp_zone_number_get(zone_num); \
if (zone) \
act; \
} \
@@ -1729,7 +1729,7 @@ ACT_FN_GO(screen_send_by, )
act; \
} } } \
else { \
- zone = e_comp_zone_number_get(e_comp, zone_num); \
+ zone = e_comp_zone_number_get(zone_num); \
if (zone) act; \
}
diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index 4be99e4..b803dab 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -122,8 +122,8 @@ e_bindings_ecore_event_mouse_wheel_convert(const
Ecore_Event_Mouse_Wheel *ev, E_
memset(event, 0, sizeof(E_Binding_Event_Wheel));
event->direction = ev->direction;
event->z = ev->z;
- event->canvas.x = e_comp_canvas_x_root_adjust(e_comp, ev->root.x);
- event->canvas.y = e_comp_canvas_x_root_adjust(e_comp, ev->root.y);
+ event->canvas.x = e_comp_canvas_x_root_adjust(ev->root.x);
+ event->canvas.y = e_comp_canvas_x_root_adjust(ev->root.y);
event->timestamp = ev->timestamp;
event->modifiers = _e_bindings_modifiers(ev->modifiers);
}
@@ -133,8 +133,8 @@ e_bindings_ecore_event_mouse_button_convert(const
Ecore_Event_Mouse_Button *ev,
{
memset(event, 0, sizeof(E_Binding_Event_Mouse_Button));
event->button = ev->buttons;
- event->canvas.x = e_comp_canvas_x_root_adjust(e_comp, ev->root.x);
- event->canvas.y = e_comp_canvas_x_root_adjust(e_comp, ev->root.y);
+ event->canvas.x = e_comp_canvas_x_root_adjust(ev->root.x);
+ event->canvas.y = e_comp_canvas_x_root_adjust(ev->root.y);
event->timestamp = ev->timestamp;
event->modifiers = _e_bindings_modifiers(ev->modifiers);
diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index d8457d8..ebf5868 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -196,7 +196,7 @@ _e_client_desk_window_profile_wait_desk_delfn(void *data,
void *obj)
if (!ec->e.state.profile.use) return;
- new_desk = e_comp_desk_window_profile_get(e_comp, desk->window_profile);
+ new_desk = e_comp_desk_window_profile_get(desk->window_profile);
if (new_desk)
e_client_desk_set(ec, new_desk);
else
@@ -204,7 +204,7 @@ _e_client_desk_window_profile_wait_desk_delfn(void *data,
void *obj)
for (i = 0; i < ec->e.state.profile.num; i++)
{
p = ec->e.state.profile.available_list[i];
- new_desk = e_comp_desk_window_profile_get(e_comp, p);
+ new_desk = e_comp_desk_window_profile_get(p);
if (new_desk)
{
e_client_desk_set(ec, new_desk);
@@ -1147,16 +1147,16 @@ _e_client_zones_layout_calc(E_Client *ec, int *zx, int
*zy, int *zw, int *zh)
return;
}
- zone_left = e_comp_zone_xy_get(e_comp, (x - w + 5), y);
- zone_right = e_comp_zone_xy_get(e_comp, (x + w + 5), y);
- zone_above = e_comp_zone_xy_get(e_comp, x, (y - h + 5));
- zone_below = e_comp_zone_xy_get(e_comp, x, (y + h + 5));
+ zone_left = e_comp_zone_xy_get((x - w + 5), y);
+ zone_right = e_comp_zone_xy_get((x + w + 5), y);
+ zone_above = e_comp_zone_xy_get(x, (y - h + 5));
+ zone_below = e_comp_zone_xy_get(x, (y + h + 5));
if (!(zone_above) && (y))
- zone_above = e_comp_zone_xy_get(e_comp, x, (h - 5));
+ zone_above = e_comp_zone_xy_get(x, (h - 5));
if (!(zone_left) && (x))
- zone_left = e_comp_zone_xy_get(e_comp, (x - 5), y);
+ zone_left = e_comp_zone_xy_get((x - 5), y);
if (zone_right)
w = zone_right->x + zone_right->w;
@@ -1867,14 +1867,14 @@ _e_client_eval(E_Client *ec)
x = MAX(ec->x, 0);
y = MAX(ec->y, 0);
if ((!ec->re_manage) && ((ec->x != x) || (ec->y != y)))
- zone = e_comp_zone_xy_get(e_comp, x, y);
+ zone = e_comp_zone_xy_get(x, y);
if (!zone)
{
- zone = e_comp_zone_xy_get(e_comp, ec->x + (ec->w / 2), ec->y +
(ec->h / 2));
+ zone = e_comp_zone_xy_get(ec->x + (ec->w / 2), ec->y + (ec->h
/ 2));
if (zone)
{
- E_Zone *z2 = e_comp_zone_xy_get(e_comp, ec->x, ec->y);
+ E_Zone *z2 = e_comp_zone_xy_get(ec->x, ec->y);
if (z2 && (z2 != zone))
{
@@ -1905,13 +1905,13 @@ _e_client_eval(E_Client *ec)
}
}
if (!zone)
- zone = e_comp_zone_xy_get(e_comp, ec->x, ec->y);
+ zone = e_comp_zone_xy_get(ec->x, ec->y);
if (!zone)
- zone = e_comp_zone_xy_get(e_comp, ec->x + ec->w - 1, ec->y);
+ zone = e_comp_zone_xy_get(ec->x + ec->w - 1, ec->y);
if (!zone)
- zone = e_comp_zone_xy_get(e_comp, ec->x + ec->w - 1, ec->y +
ec->h - 1);
+ zone = e_comp_zone_xy_get(ec->x + ec->w - 1, ec->y + ec->h - 1);
if (!zone)
- zone = e_comp_zone_xy_get(e_comp, ec->x, ec->y + ec->h - 1);
+ zone = e_comp_zone_xy_get(ec->x, ec->y + ec->h - 1);
if ((zone) && (zone != ec->zone))
e_client_zone_set(ec, zone);
}
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index f72d8a5..e4120fe 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -810,7 +810,7 @@ _e_comp_free(E_Comp *c)
{
E_FREE_LIST(c->zones, e_object_del);
- e_comp_canvas_clear(c);
+ e_comp_canvas_init();
ecore_evas_free(c->ee);
eina_stringshare_del(c->name);
diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index 8b21e08..8526f04 100644
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -125,38 +125,38 @@ _e_comp_canvas_cb_zone_sort(const void *data1, const void
*data2)
EAPI Eina_Bool
-e_comp_canvas_init(E_Comp *c)
+e_comp_canvas_init()
{
Evas_Object *o;
Eina_List *screens;
- c->evas = ecore_evas_get(c->ee);
+ e_comp->evas = ecore_evas_get(e_comp->ee);
if (e_first_frame)
- evas_event_callback_add(c->evas, EVAS_CALLBACK_RENDER_POST,
_e_comp_canvas_cb_first_frame, c);
- ecore_evas_data_set(c->ee, "comp", c);
- o = evas_object_rectangle_add(c->evas);
- c->bg_blank_object = o;
+ evas_event_callback_add(e_comp->evas, EVAS_CALLBACK_RENDER_POST,
_e_comp_canvas_cb_first_frame, e_comp);
+ ecore_evas_data_set(e_comp->ee, "comp", e_comp);
+ o = evas_object_rectangle_add(e_comp->evas);
+ e_comp->bg_blank_object = o;
evas_object_layer_set(o, E_LAYER_BOTTOM);
evas_object_move(o, 0, 0);
- evas_object_resize(o, c->man->w, c->man->h);
+ evas_object_resize(o, e_comp->man->w, e_comp->man->h);
evas_object_color_set(o, 0, 0, 0, 255);
evas_object_name_set(o, "comp->bg_blank_object");
- evas_object_data_set(o, "e_comp", c);
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
(Evas_Object_Event_Cb)_e_comp_canvas_cb_mouse_down, c);
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,
(Evas_Object_Event_Cb)_e_comp_canvas_cb_mouse_up, c);
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN,
(Evas_Object_Event_Cb)_e_comp_canvas_cb_mouse_in, c);
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL,
(Evas_Object_Event_Cb)_e_comp_canvas_cb_mouse_wheel, c);
+ evas_object_data_set(o, "e_comp", e_comp);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
(Evas_Object_Event_Cb)_e_comp_canvas_cb_mouse_down, e_comp);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,
(Evas_Object_Event_Cb)_e_comp_canvas_cb_mouse_up, e_comp);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN,
(Evas_Object_Event_Cb)_e_comp_canvas_cb_mouse_in, e_comp);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL,
(Evas_Object_Event_Cb)_e_comp_canvas_cb_mouse_wheel, e_comp);
evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, _e_comp_canvas_cb_del,
NULL);
evas_object_show(o);
- ecore_evas_name_class_set(c->ee, "E", "Comp_EE");
- // ecore_evas_manual_render_set(c->ee, conf->lock_fps);
- ecore_evas_show(c->ee);
+ ecore_evas_name_class_set(e_comp->ee, "E", "Comp_EE");
+ // ecore_evas_manual_render_set(e_comp->ee, conf->lock_fps);
+ ecore_evas_show(e_comp->ee);
- evas_event_callback_add(c->evas, EVAS_CALLBACK_RENDER_POST,
_e_comp_canvas_render_post, c);
+ evas_event_callback_add(e_comp->evas, EVAS_CALLBACK_RENDER_POST,
_e_comp_canvas_render_post, e_comp);
- c->ee_win = ecore_evas_window_get(c->ee);
+ e_comp->ee_win = ecore_evas_window_get(e_comp->ee);
screens = (Eina_List *)e_xinerama_screens_get();
if (screens)
@@ -166,11 +166,11 @@ e_comp_canvas_init(E_Comp *c)
EINA_LIST_FOREACH(screens, l, scr)
{
- e_zone_new(c, scr->screen, scr->escreen, scr->x, scr->y, scr->w,
scr->h);
+ e_zone_new(e_comp, scr->screen, scr->escreen, scr->x, scr->y,
scr->w, scr->h);
}
}
else
- e_zone_new(c, 0, 0, 0, 0, c->man->w, c->man->h);
+ e_zone_new(e_comp, 0, 0, 0, 0, e_comp->man->w, e_comp->man->h);
E_LIST_HANDLER_APPEND(handlers, E_EVENT_ZONE_MOVE_RESIZE,
_e_comp_cb_zone_change, NULL);
E_LIST_HANDLER_APPEND(handlers, E_EVENT_ZONE_ADD, _e_comp_cb_zone_change,
NULL);
E_LIST_HANDLER_APPEND(handlers, E_EVENT_ZONE_DEL, _e_comp_cb_zone_change,
NULL);
@@ -179,16 +179,16 @@ e_comp_canvas_init(E_Comp *c)
}
EINTERN void
-e_comp_canvas_clear(E_Comp *c)
+e_comp_canvas_clear(void)
{
- evas_event_freeze(c->evas);
+ evas_event_freeze(e_comp->evas);
edje_freeze();
- E_FREE_FUNC(c->fps_fg, evas_object_del);
- E_FREE_FUNC(c->fps_bg, evas_object_del);
- E_FREE_FUNC(c->autoclose.rect, evas_object_del);
- E_FREE_FUNC(c->shape_job, ecore_job_del);
- E_FREE_FUNC(c->pointer, e_object_del);
+ E_FREE_FUNC(e_comp->fps_fg, evas_object_del);
+ E_FREE_FUNC(e_comp->fps_bg, evas_object_del);
+ E_FREE_FUNC(e_comp->autoclose.rect, evas_object_del);
+ E_FREE_FUNC(e_comp->shape_job, ecore_job_del);
+ E_FREE_FUNC(e_comp->pointer, e_object_del);
}
//////////////////////////////////////////////
@@ -214,7 +214,7 @@ e_comp_all_thaw(void)
}
EAPI E_Zone *
-e_comp_zone_xy_get(const E_Comp *c EINA_UNUSED, Evas_Coord x, Evas_Coord y)
+e_comp_zone_xy_get(Evas_Coord x, Evas_Coord y)
{
const Eina_List *l;
E_Zone *zone;
@@ -225,7 +225,7 @@ e_comp_zone_xy_get(const E_Comp *c EINA_UNUSED, Evas_Coord
x, Evas_Coord y)
}
EAPI E_Zone *
-e_comp_zone_number_get(E_Comp *c EINA_UNUSED, int num)
+e_comp_zone_number_get(int num)
{
Eina_List *l = NULL;
E_Zone *zone = NULL;
@@ -238,7 +238,7 @@ e_comp_zone_number_get(E_Comp *c EINA_UNUSED, int num)
}
EAPI E_Zone *
-e_comp_zone_id_get(E_Comp *c EINA_UNUSED, int id)
+e_comp_zone_id_get(int id)
{
Eina_List *l = NULL;
E_Zone *zone = NULL;
@@ -251,7 +251,7 @@ e_comp_zone_id_get(E_Comp *c EINA_UNUSED, int id)
}
EAPI E_Desk *
-e_comp_desk_window_profile_get(E_Comp *c EINA_UNUSED, const char *profile)
+e_comp_desk_window_profile_get(const char *profile)
{
Eina_List *l = NULL;
E_Zone *zone = NULL;
@@ -417,7 +417,7 @@ e_comp_canvas_update(void)
{
E_Zone *z;
- z = e_comp_zone_number_get(e_comp, 0);
+ z = e_comp_zone_number_get(0);
if (z)
{
changed |= e_zone_move_resize(z, 0, 0, e_comp->man->w,
e_comp->man->h);
@@ -473,7 +473,7 @@ e_comp_canvas_update(void)
}
EAPI void
-e_comp_canvas_fake_layers_init(E_Comp *comp)
+e_comp_canvas_fake_layers_init(void)
{
unsigned int layer;
@@ -482,7 +482,7 @@ e_comp_canvas_fake_layers_init(E_Comp *comp)
{
Evas_Object *o2;
- o2 = comp->layers[layer].obj = evas_object_rectangle_add(comp->evas);
+ o2 = e_comp->layers[layer].obj =
evas_object_rectangle_add(e_comp->evas);
evas_object_layer_set(o2, e_comp_canvas_layer_map_to(layer));
evas_object_name_set(o2, "layer_obj");
}
diff --git a/src/bin/e_comp_canvas.h b/src/bin/e_comp_canvas.h
index 7972d16..9509fe0 100644
--- a/src/bin/e_comp_canvas.h
+++ b/src/bin/e_comp_canvas.h
@@ -15,17 +15,17 @@ struct _E_Event_Compositor_Resize
extern EAPI int E_EVENT_COMPOSITOR_RESIZE;
-EAPI Eina_Bool e_comp_canvas_init(E_Comp *c);
-EINTERN void e_comp_canvas_clear(E_Comp *c);
+EAPI Eina_Bool e_comp_canvas_init(void);
+EINTERN void e_comp_canvas_clear(void);
EAPI void e_comp_all_freeze(void);
EAPI void e_comp_all_thaw(void);
-EAPI E_Zone * e_comp_zone_xy_get(const E_Comp *c, Evas_Coord x, Evas_Coord y);
-EAPI E_Zone * e_comp_zone_number_get(E_Comp *c, int num);
-EAPI E_Zone * e_comp_zone_id_get(E_Comp *c, int id);
-EAPI E_Desk * e_comp_desk_window_profile_get(E_Comp *c, const char *profile);
+EAPI E_Zone * e_comp_zone_xy_get(Evas_Coord x, Evas_Coord y);
+EAPI E_Zone * e_comp_zone_number_get(int num);
+EAPI E_Zone * e_comp_zone_id_get(int id);
+EAPI E_Desk * e_comp_desk_window_profile_get(const char *profile);
EAPI void e_comp_canvas_zone_update(E_Zone *zone);
EAPI void e_comp_canvas_update(void);
-EAPI void e_comp_canvas_fake_layers_init(E_Comp *comp);
+EAPI void e_comp_canvas_fake_layers_init(void);
EAPI void e_comp_canvas_fps_toggle(void);
EAPI E_Layer e_comp_canvas_layer_map_to(unsigned int layer);
EAPI unsigned int e_comp_canvas_layer_map(E_Layer layer);
@@ -41,38 +41,38 @@ EAPI E_Layer e_comp_canvas_client_layer_map_nearest(int
layer);
* - use the "unadjust" functions to go canvas->root
*/
static inline int
-e_comp_canvas_x_root_unadjust(const E_Comp *c, int x)
+e_comp_canvas_x_root_unadjust(int x)
{
int cx;
- ecore_evas_geometry_get(c->ee, &cx, NULL, NULL, NULL);
+ ecore_evas_geometry_get(e_comp->ee, &cx, NULL, NULL, NULL);
return x + cx;
}
static inline int
-e_comp_canvas_y_root_unadjust(const E_Comp *c, int y)
+e_comp_canvas_y_root_unadjust(int y)
{
int cy;
- ecore_evas_geometry_get(c->ee, NULL, &cy, NULL, NULL);
+ ecore_evas_geometry_get(e_comp->ee, NULL, &cy, NULL, NULL);
return y + cy;
}
static inline int
-e_comp_canvas_x_root_adjust(const E_Comp *c, int x)
+e_comp_canvas_x_root_adjust(int x)
{
int cx;
- ecore_evas_geometry_get(c->ee, &cx, NULL, NULL, NULL);
+ ecore_evas_geometry_get(e_comp->ee, &cx, NULL, NULL, NULL);
return x - cx;
}
static inline int
-e_comp_canvas_y_root_adjust(const E_Comp *c, int y)
+e_comp_canvas_y_root_adjust(int y)
{
int cy;
- ecore_evas_geometry_get(c->ee, NULL, &cy, NULL, NULL);
+ ecore_evas_geometry_get(e_comp->ee, NULL, &cy, NULL, NULL);
return y - cy;
}
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index c936475..e437804 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -2585,7 +2585,7 @@ e_comp_object_util_zone_get(Evas_Object *obj)
if (e_win_client_get(obj))
return e_win_client_get(obj)->zone;
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
- zone = e_comp_zone_xy_get(e_comp, x, y);
+ zone = e_comp_zone_xy_get(x, y);
}
return zone;
}
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index db5d942..57d39da 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -1466,7 +1466,7 @@ _e_comp_x_configure_request(void *data EINA_UNUSED, int
type EINA_UNUSED, Ecore
ec->saved.x = x;
ec->saved.y = y;
- zone = e_comp_zone_xy_get(e_comp, x, y);
+ zone = e_comp_zone_xy_get(x, y);
if (zone && (zone->x || zone->y))
{
ec->saved.x -= zone->x;
@@ -1858,7 +1858,7 @@ _e_comp_x_message(void *data EINA_UNUSED, int type
EINA_UNUSED, Ecore_X_Event_Cl
{
if (e_util_strcmp(p, ec->desk->window_profile))
{
- E_Desk *desk = e_comp_desk_window_profile_get(e_comp,
p);
+ E_Desk *desk = e_comp_desk_window_profile_get(p);
if (desk) e_client_desk_set(ec, desk);
}
}
@@ -1940,8 +1940,8 @@ _e_comp_x_message(void *data EINA_UNUSED, int type
EINA_UNUSED, Ecore_X_Event_Cl
x = ev->data.l[1];
y = ev->data.l[2];
e_int_client_menu_show(ec,
- e_comp_canvas_x_root_adjust(e_comp, x),
- e_comp_canvas_y_root_adjust(e_comp, y),
+ e_comp_canvas_x_root_adjust(x),
+ e_comp_canvas_y_root_adjust(y),
0, 0);
}
else if (ev->message_type == ATM_NETWM_PERFORM_BUTTON_ACTION)
@@ -2026,7 +2026,7 @@ _e_comp_x_mouse_in(void *data EINA_UNUSED, int type
EINA_UNUSED, Ecore_X_Event_M
ec = _e_comp_x_client_find_by_window(ev->win);
if (!ec) return ECORE_CALLBACK_RENEW;
if (ec->comp_data->deleted) return ECORE_CALLBACK_RENEW;
- e_client_mouse_in(ec, e_comp_canvas_x_root_adjust(e_comp, ev->root.x),
e_comp_canvas_x_root_adjust(e_comp, ev->root.y));
+ e_client_mouse_in(ec, e_comp_canvas_x_root_adjust(ev->root.x),
e_comp_canvas_x_root_adjust(ev->root.y));
return ECORE_CALLBACK_RENEW;
}
@@ -2046,7 +2046,7 @@ _e_comp_x_mouse_out(void *data EINA_UNUSED, int type
EINA_UNUSED, Ecore_X_Event_
ec = _e_comp_x_client_find_by_window(ev->win);
if (!ec) return ECORE_CALLBACK_RENEW;
if (ec->comp_data->deleted) return ECORE_CALLBACK_RENEW;
- e_client_mouse_out(ec, e_comp_canvas_x_root_adjust(e_comp, ev->root.x),
e_comp_canvas_x_root_adjust(e_comp, ev->root.y));
+ e_client_mouse_out(ec, e_comp_canvas_x_root_adjust(ev->root.x),
e_comp_canvas_x_root_adjust(ev->root.y));
return ECORE_CALLBACK_RENEW;
}
@@ -3220,7 +3220,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client
*ec)
ec->y = zy + zh - ec->h;
// <--
- if (e_comp_zone_xy_get(e_comp, ec->x, ec->y))
+ if (e_comp_zone_xy_get(ec->x, ec->y))
{
if (!E_INSIDE(ec->x, ec->y, ec->zone->x,
ec->zone->y, ec->zone->w, ec->zone->h))
{
@@ -3897,7 +3897,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client
*ec)
E_Zone *zone;
E_Desk *desk;
- zone = e_comp_zone_number_get(e_comp,
inst->screen);
+ zone = e_comp_zone_number_get(inst->screen);
if (zone) e_client_zone_set(ec, zone);
desk = e_desk_at_xy_get(ec->zone, inst->desk_x,
inst->desk_y);
@@ -3976,7 +3976,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client
*ec)
}
else
{
- desk = e_comp_desk_window_profile_get(e_comp, p);
+ desk = e_comp_desk_window_profile_get(p);
if (desk)
{
e_client_desk_set(ec, desk);
@@ -4004,7 +4004,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client
*ec)
for (i = 0; i < ec->e.state.profile.num; i++)
{
p2 = ec->e.state.profile.available_list[i];
- desk = e_comp_desk_window_profile_get(e_comp, p2);
+ desk = e_comp_desk_window_profile_get(p2);
if (desk)
{
e_client_desk_set(ec, desk);
@@ -4832,7 +4832,7 @@ _e_comp_x_manage_windows(E_Comp *c)
E_ATOM_ZONE,
&id, 1);
if (ret == 1)
- zone = e_comp_zone_number_get(c, id);
+ zone = e_comp_zone_number_get(id);
if (!zone)
zone = e_zone_current_get(c);
ret = ecore_x_window_prop_card32_get(windows[i],
@@ -5128,7 +5128,7 @@ _e_comp_x_setup(E_Comp *c, Ecore_X_Window root, int w,
int h)
c->bindings_grab_cb = (Ecore_Cb)_e_comp_x_bindings_grab_cb;
c->bindings_ungrab_cb = (Ecore_Cb)_e_comp_x_bindings_ungrab_cb;
- if (!e_comp_canvas_init(c)) return EINA_FALSE;
+ if (!e_comp_canvas_init()) return EINA_FALSE;
e_grabinput_focus(c->ee_win, E_FOCUS_METHOD_PASSIVE);
diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 55bb3e6..94ec2b8 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -654,7 +654,7 @@ _e_drag_move(E_Drag *drag, int x, int y)
if (((drag->x + drag->dx) == x) && ((drag->y + drag->dy) == y)) return;
- zone = e_comp_zone_xy_get(drag->comp, x, y);
+ zone = e_comp_zone_xy_get(x, y);
if (zone) e_zone_flip_coords_handle(zone, x, y);
drag->x = x - drag->dx;
@@ -990,7 +990,7 @@ _e_drag_end(int x, int y)
if (!_drag_current) return;
win = e_comp_top_window_at_xy_get(e_comp, x, y);
- zone = e_comp_zone_xy_get(e_comp, x, y);
+ zone = e_comp_zone_xy_get(x, y);
/* Pass -1, -1, so that it is possible to drop at the edge. */
if (zone) e_zone_flip_coords_handle(zone, -1, -1);
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 01475b8..8fdeff3 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -2776,8 +2776,8 @@ _e_menu_cb_mouse_up(void *data __UNUSED__, int type
__UNUSED__, void *event)
mi = _e_menu_item_active_get();
if ((!mi) ||
- (E_INSIDE(e_comp_canvas_x_root_adjust(e_comp, ev->root.x),
- e_comp_canvas_y_root_adjust(e_comp, ev->root.y),
+ (E_INSIDE(e_comp_canvas_x_root_adjust(ev->root.x),
+ e_comp_canvas_y_root_adjust(ev->root.y),
mi->x, mi->y, mi->w, mi->h))
)
ret = _e_menu_active_call();
diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c
index b5d0623..c9b7277 100644
--- a/src/bin/e_remember.c
+++ b/src/bin/e_remember.c
@@ -686,7 +686,7 @@ _e_remember_cb_hook_pre_post_fetch(void *data __UNUSED__,
E_Client *ec)
{
E_Zone *zone;
- zone = e_comp_zone_number_get(ec->zone->comp, rem->prop.zone);
+ zone = e_comp_zone_number_get(rem->prop.zone);
if (zone)
e_client_zone_set(ec, zone);
}
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index ba065e6..16db882 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -138,7 +138,7 @@ e_shelf_config_update(void)
E_Zone *zone;
if (cf_es->id <= 0) cf_es->id = id + 1;
- zone = e_comp_zone_number_get(e_comp, cf_es->zone);
+ zone = e_comp_zone_number_get(cf_es->zone);
if (zone)
e_shelf_config_new(zone, cf_es);
id = cf_es->id;
@@ -1669,8 +1669,8 @@ _e_shelf_cb_mouse_move_autohide_fuck_systray(E_Shelf *es)
memset(&ev, 0, sizeof(Ecore_Event_Mouse_Move));
ecore_evas_pointer_xy_get(es->zone->comp->ee, &x, &y);
- ev.root.x = e_comp_canvas_x_root_unadjust(es->zone->comp, x);
- ev.root.y = e_comp_canvas_y_root_unadjust(es->zone->comp, y);
+ ev.root.x = e_comp_canvas_x_root_unadjust(x);
+ ev.root.y = e_comp_canvas_y_root_unadjust(y);
_e_shelf_cb_mouse_in(es, ECORE_EVENT_MOUSE_MOVE, &ev);
return EINA_TRUE;
}
@@ -1793,11 +1793,11 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
* mouse in/out events. in the future, when we remove systray, we
should go
* back to mouse in/out events
*/
- inside = E_INSIDE(e_comp_canvas_x_root_adjust(e_comp, ev->root.x),
- e_comp_canvas_x_root_adjust(e_comp, ev->root.y),
+ inside = E_INSIDE(e_comp_canvas_x_root_adjust(ev->root.x),
+ e_comp_canvas_x_root_adjust(ev->root.y),
es->zone->x, es->zone->y, es->zone->w + 4,
es->zone->h + 4);
- x = e_comp_canvas_x_root_adjust(e_comp, ev->root.x) - es->zone->x;
- y = e_comp_canvas_x_root_adjust(e_comp, ev->root.y) - es->zone->y;
+ x = e_comp_canvas_x_root_adjust(ev->root.x) - es->zone->x;
+ y = e_comp_canvas_x_root_adjust(ev->root.y) - es->zone->y;
if (inside)
inside = (
((E_INSIDE(x, y, es->x, es->y, es->w, es->h)) ||
diff --git a/src/modules/appmenu/e_mod_appmenu_render.c
b/src/modules/appmenu/e_mod_appmenu_render.c
index 3abeb9a..1c95475 100644
--- a/src/modules/appmenu/e_mod_appmenu_render.c
+++ b/src/modules/appmenu/e_mod_appmenu_render.c
@@ -85,7 +85,7 @@ item_menu_open(E_DBusMenu_Item *item, E_Gadcon *gadcon)
e_menu_post_deactivate_callback_set(m, menu_post_deactivate, gadcon);
ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
- zone = e_comp_zone_xy_get(e_comp, x, y);
+ zone = e_comp_zone_xy_get(x, y);
e_menu_activate_mouse(m, zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN, 0);
}
diff --git a/src/modules/conf_randr/e_smart_monitor.c
b/src/modules/conf_randr/e_smart_monitor.c
index d514507..d7719e6 100644
--- a/src/modules/conf_randr/e_smart_monitor.c
+++ b/src/modules/conf_randr/e_smart_monitor.c
@@ -334,7 +334,7 @@ e_smart_monitor_background_set(Evas_Object *obj, Evas_Coord
dx, Evas_Coord dy)
sd->man_num = man->num;
/* get the zone number */
- if (!(zone = e_comp_zone_xy_get(man->comp, dx, dy)))
+ if (!(zone = e_comp_zone_xy_get(dx, dy)))
zone = e_util_zone_current_get(man);
sd->zone_num = zone->num;
diff --git a/src/modules/conf_theme/e_int_config_wallpaper.c
b/src/modules/conf_theme/e_int_config_wallpaper.c
index 39f2928..9c8b229 100644
--- a/src/modules/conf_theme/e_int_config_wallpaper.c
+++ b/src/modules/conf_theme/e_int_config_wallpaper.c
@@ -637,8 +637,8 @@ _adv_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas,
E_Config_Dialog_Data *
ow = e_widget_radio_add(evas, _("This Desktop"), E_CONFIG_WALLPAPER_DESK,
rg);
e_widget_frametable_object_append(of, ow, 0, 1, 1, 1, 1, 0, 1, 0);
ow = e_widget_radio_add(evas, _("This Screen"), E_CONFIG_WALLPAPER_SCREEN,
rg);
- if (!(e_comp_zone_number_get(e_comp, 1) ||
- (e_comp_zone_number_get(e_comp, 0))))
+ if (!(e_comp_zone_number_get(1) ||
+ (e_comp_zone_number_get(0))))
e_widget_disabled_set(ow, 1);
e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0);
e_widget_table_object_append(ot, of, 0, 3, 2, 1, 1, 0, 1, 0);
diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c
index 09a9587..f2d6772 100644
--- a/src/modules/everything/evry.c
+++ b/src/modules/everything/evry.c
@@ -953,8 +953,8 @@ _evry_cb_mouse(void *data, int type, void *event)
{
win->mouse_out = 0;
- if (!E_INSIDE(e_comp_canvas_x_root_adjust(e_comp, ev->root.x),
- e_comp_canvas_y_root_adjust(e_comp, ev->root.y), x, y,
w, h))
+ if (!E_INSIDE(e_comp_canvas_x_root_adjust(ev->root.x),
+ e_comp_canvas_y_root_adjust(ev->root.y), x, y, w, h))
{
win->mouse_out = 1;
return ECORE_CALLBACK_PASS_ON;
@@ -967,8 +967,8 @@ _evry_cb_mouse(void *data, int type, void *event)
win->mouse_button = 0;
if (win->mouse_out &&
- (!E_INSIDE(e_comp_canvas_x_root_adjust(e_comp, ev->root.x),
- e_comp_canvas_y_root_adjust(e_comp, ev->root.y), x, y,
w, h)))
+ (!E_INSIDE(e_comp_canvas_x_root_adjust(ev->root.x),
+ e_comp_canvas_y_root_adjust(ev->root.y), x, y, w, h)))
{
evry_hide(win, 0);
return ECORE_CALLBACK_PASS_ON;
diff --git a/src/modules/gadman/e_mod_gadman.c
b/src/modules/gadman/e_mod_gadman.c
index e0e83bc..4e3df35 100644
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -774,7 +774,7 @@ _gadman_gadcon_dnd_drop_cb(E_Gadcon *gc, E_Gadcon_Client
*gcc)
/* checking if zone was changed for dragged gadget */
mover = _get_mover(gcc);
evas_object_geometry_get(mover, &gx, &gy, NULL, NULL);
- dst_zone = e_comp_zone_xy_get(e_util_comp_current_get(), gx, gy);
+ dst_zone = e_comp_zone_xy_get(gx, gy);
if (dst_zone && (gcc->gadcon->zone != dst_zone))
{
unsigned int layer = gcc->gadcon->id - ID_GADMAN_LAYER_BASE;
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 42c113a..c948866 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -1868,9 +1868,9 @@ _ibar_cb_icon_move(void *data, Evas *e, Evas_Object *obj,
void *event_info __UNU
if (!zone)
{
if (x < 1)
- zone = e_comp_zone_xy_get(e_comp, 0, y);
+ zone = e_comp_zone_xy_get(0, y);
else
- zone = e_comp_zone_xy_get(e_comp, e_comp->man->w - 5, y);
+ zone = e_comp_zone_xy_get(e_comp->man->w - 5, y);
if (!zone)
zone = eina_list_data_get(e_comp->zones);
}
diff --git a/src/modules/illume2/e_mod_quickpanel.c
b/src/modules/illume2/e_mod_quickpanel.c
index b63ab8c..c781870 100644
--- a/src/modules/illume2/e_mod_quickpanel.c
+++ b/src/modules/illume2/e_mod_quickpanel.c
@@ -252,8 +252,8 @@ _e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int
type __UNUSED__, void
if (!(comp = e_util_comp_current_get()))
return ECORE_CALLBACK_PASS_ON;
zn = ev->ec->illume.quickpanel.zone;
- zone = e_comp_zone_number_get(e_comp, zn);
- if (!zone) zone = e_comp_zone_number_get(e_comp, 0);
+ zone = e_comp_zone_number_get(zn);
+ if (!zone) zone = e_comp_zone_number_get(0);
if (!zone) return ECORE_CALLBACK_PASS_ON;
}
@@ -303,8 +303,8 @@ _e_mod_quickpanel_cb_border_remove(void *data __UNUSED__,
int type __UNUSED__, v
if (!(comp = e_util_comp_current_get()))
return ECORE_CALLBACK_PASS_ON;
zn = ev->ec->illume.quickpanel.zone;
- zone = e_comp_zone_number_get(e_comp, zn);
- if (!zone) zone = e_comp_zone_number_get(e_comp, 0);
+ zone = e_comp_zone_number_get(zn);
+ if (!zone) zone = e_comp_zone_number_get(0);
if (!zone) return ECORE_CALLBACK_PASS_ON;
}
diff --git a/src/modules/lokker/lokker.c b/src/modules/lokker/lokker.c
index 2608cc9..d074f44 100644
--- a/src/modules/lokker/lokker.c
+++ b/src/modules/lokker/lokker.c
@@ -152,25 +152,22 @@ _lokker_delete(void)
}
static Eina_Bool
-_pin_mouse_button_down(Lokker_Popup *lp, int t EINA_UNUSED,
Ecore_Event_Mouse_Button *ev)
+_pin_mouse_button_down(Lokker_Popup *lp EINA_UNUSED, int t EINA_UNUSED,
Ecore_Event_Mouse_Button *ev)
{
- Evas *e;
-
if (ev->buttons != 1) return ECORE_CALLBACK_DONE;
- e = e_comp->evas;
- evas_event_feed_mouse_move(e,
- e_comp_canvas_x_root_adjust(lp->zone->comp, ev->root.x),
- e_comp_canvas_y_root_adjust(lp->zone->comp, ev->root.y),
+ evas_event_feed_mouse_move(e_comp->evas,
+ e_comp_canvas_x_root_adjust(ev->root.x),
+ e_comp_canvas_y_root_adjust(ev->root.y),
0, NULL);
- evas_event_feed_mouse_down(e, 1, 0, 0, NULL);
+ evas_event_feed_mouse_down(e_comp->evas, 1, 0, 0, NULL);
return ECORE_CALLBACK_RENEW;
}
static Eina_Bool
-_pin_mouse_button_up(Lokker_Popup *lp, int t EINA_UNUSED,
Ecore_Event_Mouse_Button *ev)
+_pin_mouse_button_up(Lokker_Popup *lp EINA_UNUSED, int t EINA_UNUSED,
Ecore_Event_Mouse_Button *ev)
{
if (ev->buttons != 1) return ECORE_CALLBACK_DONE;
- evas_event_feed_mouse_up(evas_object_evas_get(lp->comp_object), 1, 0, 0,
NULL);
+ evas_event_feed_mouse_up(e_comp->evas, 1, 0, 0, NULL);
return ECORE_CALLBACK_RENEW;
}
diff --git a/src/modules/policy_mobile/e_mod_config.c
b/src/modules/policy_mobile/e_mod_config.c
index 64151b7..6c198e7 100644
--- a/src/modules/policy_mobile/e_mod_config.c
+++ b/src/modules/policy_mobile/e_mod_config.c
@@ -132,7 +132,7 @@ _pol_cfd_data_basic_apply(E_Config_Dialog *cfd EINA_UNUSED,
E_Config_Dialog_Data
EINA_LIST_FOREACH(cfdata->conf->desks, l, d)
{
- zone = e_comp_zone_number_get(e_comp, d->zone_num);
+ zone = e_comp_zone_number_get(d->zone_num);
desk = e_desk_at_xy_get(zone, d->x, d->y);
if (!desk) continue;
diff --git a/src/modules/tiling/e_mod_tiling.c
b/src/modules/tiling/e_mod_tiling.c
index acde1d3..90a6924 100644
--- a/src/modules/tiling/e_mod_tiling.c
+++ b/src/modules/tiling/e_mod_tiling.c
@@ -467,17 +467,11 @@ _restore_free_client(void *_item)
void
change_desk_conf(struct _Config_vdesk *newconf)
{
- E_Manager *m;
- E_Comp *c;
E_Zone *z;
E_Desk *d;
int old_nb_stacks, new_nb_stacks = newconf->nb_stacks;
- m = e_manager_current_get();
- if (!m)
- return;
- c = m->comp;
- z = e_comp_zone_number_get(c, newconf->zone_num);
+ z = e_comp_zone_number_get(newconf->zone_num);
if (!z)
return;
d = e_desk_at_xy_get(z, newconf->x, newconf->y);
diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index 33cff2e..2bc94d7 100644
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -134,7 +134,7 @@ e_modapi_init(E_Module *m)
}
comp->man = e_manager_new(ecore_evas_window_get(comp->ee), comp, w, h);
- if (!e_comp_canvas_init(comp)) return NULL;
+ if (!e_comp_canvas_init()) return NULL;
e_comp_canvas_fake_layers_init(comp);
/* NB: This needs to be called AFTER the comp canvas has been setup */
diff --git a/src/modules/wl_fb/e_mod_main.c b/src/modules/wl_fb/e_mod_main.c
index 1e78173..5251f65 100644
--- a/src/modules/wl_fb/e_mod_main.c
+++ b/src/modules/wl_fb/e_mod_main.c
@@ -44,7 +44,7 @@ e_modapi_init(E_Module *m)
}
comp->man = e_manager_new(ecore_evas_window_get(comp->ee), comp, w, h);
e_comp_wl_init();
- e_comp_canvas_init(comp);
+ e_comp_canvas_init();
e_comp_canvas_fake_layers_init(comp);
comp->pointer = e_pointer_canvas_new(comp->ee, EINA_TRUE);
diff --git a/src/modules/wl_x11/e_mod_main.c b/src/modules/wl_x11/e_mod_main.c
index 40c66df..13fc0cd 100644
--- a/src/modules/wl_x11/e_mod_main.c
+++ b/src/modules/wl_x11/e_mod_main.c
@@ -103,7 +103,7 @@ e_modapi_init(E_Module *m)
}
comp->man = e_manager_new(ecore_evas_window_get(comp->ee), comp, w, h);
- if (!e_comp_canvas_init(comp)) return NULL;
+ if (!e_comp_canvas_init()) return NULL;
e_comp_canvas_fake_layers_init(comp);
/* NB: This needs to be called AFTER comp_canvas has been setup as it
--
