From 34d906fa4202a07e06a3d0006d3d243e9d36d522 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 13 Mar 2015 17:19:17 -0400 Subject: [PATCH] e_zone functions no longer require E_Comp param --- src/bin/e_actions.c | 2 +- src/bin/e_client.c | 8 +++---- src/bin/e_comp.c | 2 +- src/bin/e_comp_canvas.c | 6 +++--- src/bin/e_comp_x.c | 2 +- src/bin/e_configure.c | 2 +- src/bin/e_fm.c | 6 +++--- src/bin/e_int_menus.c | 4 ++-- src/bin/e_resist.c | 2 +- src/bin/e_utils.c | 4 ++-- src/bin/e_zone.c | 21 ++++++++----------- src/bin/e_zone.h | 4 ++-- src/modules/conf/e_mod_main.c | 2 +- src/modules/conf_display/e_int_config_desk.c | 2 +- src/modules/conf_shelves/e_int_config_shelf.c | 2 +- src/modules/conf_theme/e_int_config_theme.c | 2 +- .../conf_theme/e_int_config_transitions.c | 2 +- .../conf_theme/e_int_config_wallpaper.c | 8 +++---- src/modules/everything/e_mod_main.c | 16 ++------------ src/modules/fileman/e_mod_main.c | 15 ++----------- src/modules/pager_plain/e_mod_main.c | 4 +--- src/modules/policy_mobile/e_mod_config.c | 11 +++------- src/modules/shot/e_mod_main.c | 2 +- src/modules/syscon/e_mod_main.c | 2 +- src/modules/teamwork/e_mod_tw.c | 4 ++-- src/modules/tiling/e_mod_tiling.c | 4 +--- src/modules/winlist/e_winlist.c | 2 +- 27 files changed, 53 insertions(+), 88 deletions(-) diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index da276a89a..e48a89106 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -1354,7 +1354,7 @@ _e_actions_zone_get(E_Object *obj) if (obj->type == (int)E_MANAGER_TYPE) return e_util_zone_current_get((E_Manager *)obj); else if (obj->type == (int)E_COMP_TYPE) - return e_zone_current_get((E_Comp *)obj); + return e_zone_current_get(); else if (obj->type == (int)E_ZONE_TYPE) return (E_Zone *)obj; else if (obj->type == (int)E_CLIENT_TYPE) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index f1ff85b60..807872ec8 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -1721,7 +1721,7 @@ _e_client_eval(E_Client *ec) { if (ec->parent) { - if (ec->parent->zone != e_zone_current_get(e_comp)) + if (ec->parent->zone != e_zone_current_get()) { e_client_zone_set(ec, ec->parent->zone); e_zone_useful_geometry_get(ec->zone, &zx, &zy, &zw, &zh); @@ -2461,7 +2461,7 @@ e_client_new(E_Pixmap *cp, int first_map, int internal) if (ec->override) _e_client_zone_update(ec); else - e_client_desk_set(ec, e_desk_current_get(e_zone_current_get(e_comp))); + e_client_desk_set(ec, e_desk_current_get(e_zone_current_get())); ec->icccm.title = NULL; ec->icccm.name = NULL; @@ -3418,7 +3418,7 @@ e_client_focused_set(E_Client *ec) /* if there unfocus client is fullscreen and visible */ if ((!e_config->allow_above_fullscreen) && (ec_unfocus->fullscreen) && (!ec_unfocus->iconic) && (!ec_unfocus->hidden) && - (ec_unfocus->zone == e_zone_current_get(e_comp)) && + (ec_unfocus->zone == e_zone_current_get()) && ((ec_unfocus->desk == e_desk_current_get(ec_unfocus->zone)) || (ec_unfocus->sticky))) { Eina_Bool have_vis_child = EINA_FALSE; @@ -4745,7 +4745,7 @@ e_client_under_pointer_get(E_Desk *desk, E_Client *exclude) if (exclude->zone) desk = e_desk_current_get(exclude->zone); else - desk = e_desk_current_get(e_zone_current_get(e_comp)); + desk = e_desk_current_get(e_zone_current_get()); } } diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 36dea5b82..876df9d3c 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -410,7 +410,7 @@ _e_comp_cb_update(E_Comp *c) evas_object_geometry_get(c->fps_fg, NULL, NULL, &w, &h); w += 8; h += 8; - z = e_zone_current_get(c); + z = e_zone_current_get(); if (z) { switch (conf->fps_corner) diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c index 2b23d9b89..b26a0b191 100644 --- a/src/bin/e_comp_canvas.c +++ b/src/bin/e_comp_canvas.c @@ -163,11 +163,11 @@ e_comp_canvas_init() EINA_LIST_FOREACH(screens, l, scr) { - e_zone_new(e_comp, scr->screen, scr->escreen, scr->x, scr->y, scr->w, scr->h); + e_zone_new(scr->screen, scr->escreen, scr->x, scr->y, scr->w, scr->h); } } else - e_zone_new(e_comp, 0, 0, 0, 0, e_comp->man->w, e_comp->man->h); + e_zone_new(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); @@ -369,7 +369,7 @@ e_comp_canvas_update(void) } else { - zone = e_zone_new(e_comp, scr->screen, scr->escreen, + zone = e_zone_new(scr->screen, scr->escreen, scr->x, scr->y, scr->w, scr->h); printf("@@@ NEW ZONE = %p\n", zone); changed = EINA_TRUE; diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index c1ef3d0e0..56342133f 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -4834,7 +4834,7 @@ _e_comp_x_manage_windows(E_Comp *c) if (ret == 1) zone = e_comp_zone_number_get(id); if (!zone) - zone = e_zone_current_get(c); + zone = e_zone_current_get(); ret = ecore_x_window_prop_card32_get(windows[i], E_ATOM_DESK, deskxy, 2); diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index 093d66d8d..0e9120f49 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -78,7 +78,7 @@ e_configure_registry_call(const char *path, Evas_Object *parent, const char *par custom_desktop_exec.func(custom_desktop_exec.data, e_comp, params, eci->desktop); else - e_exec(e_zone_current_get(e_comp), + e_exec(e_zone_current_get(), eci->desktop, NULL, NULL, "config"); } break; diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 56af8276d..f1fed3373 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -8971,7 +8971,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp) } ecore_evas_pointer_xy_get(e_comp->ee, &x, &y); - zone = e_zone_current_get(e_comp); + zone = e_zone_current_get(); if (!zone) { e_object_del(E_OBJECT(mn)); @@ -9304,7 +9304,7 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp) } ecore_evas_pointer_xy_get(e_comp->ee, &x, &y); - zone = e_zone_current_get(e_comp); + zone = e_zone_current_get(); if (!zone) { e_object_del(E_OBJECT(mn)); @@ -11734,7 +11734,7 @@ e_fm2_drop_menu(Evas_Object *obj, char *args) "e/fileman/default/button/abort"); ecore_evas_pointer_xy_get(e_comp->ee, &x, &y); - zone = e_zone_current_get(e_comp); + zone = e_zone_current_get(); if (!zone) goto error; e_menu_activate_mouse(menu, zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN, 0); return; diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index 6351af5dc..8ce727735 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -1414,7 +1414,7 @@ _e_int_menus_clients_pre_cb(void *data __UNUSED__, E_Menu *m) e_menu_pre_activate_callback_set(m, NULL, NULL); /* get the current clients */ - zone = e_zone_current_get(e_comp); + zone = e_zone_current_get(); desk = e_desk_current_get(zone); if (e_config->clientlist_sort_by == E_CLIENTLIST_SORT_MOST_RECENT) @@ -1722,7 +1722,7 @@ _e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m) e_menu_pre_activate_callback_set(m, NULL, NULL); c = e_comp; - zone = e_zone_current_get(c); + zone = e_zone_current_get(); /* get the current clients */ shelves = e_shelf_list(); diff --git a/src/bin/e_resist.c b/src/bin/e_resist.c index 0ffb4fdcc..ebcabc44a 100644 --- a/src/bin/e_resist.c +++ b/src/bin/e_resist.c @@ -65,7 +65,7 @@ e_resist_client_position(E_Comp *c, Eina_List *skiplist, } } - desk = e_desk_current_get(e_zone_current_get(c)); + desk = e_desk_current_get(e_zone_current_get()); l = e_shelf_list_all(); EINA_LIST_FREE(l, es) { diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c index a690c3c43..71c4dd021 100644 --- a/src/bin/e_utils.c +++ b/src/bin/e_utils.c @@ -56,7 +56,7 @@ e_util_zone_current_get(E_Manager *man) { E_OBJECT_CHECK_RETURN(man, NULL); E_OBJECT_TYPE_CHECK_RETURN(man, E_MANAGER_TYPE, NULL); - return e_zone_current_get(man->comp); + return e_zone_current_get(); } EAPI int @@ -826,7 +826,7 @@ e_util_win_auto_resize_fill(Evas_Object *win) if (ec) zone = ec->zone; if (!zone) - zone = e_zone_current_get(e_comp); + zone = e_zone_current_get(); if (zone) { diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c index 5e95d131d..17d052d6e 100644 --- a/src/bin/e_zone.c +++ b/src/bin/e_zone.c @@ -180,7 +180,7 @@ _e_zone_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *e } EAPI E_Zone * -e_zone_new(E_Comp *c, int num, int id, int x, int y, int w, int h) +e_zone_new(int num, int id, int x, int y, int w, int h) { E_Zone *zone; Evas_Object *o; @@ -190,8 +190,6 @@ e_zone_new(E_Comp *c, int num, int id, int x, int y, int w, int h) zone = E_OBJECT_ALLOC(E_Zone, E_ZONE_TYPE, _e_zone_free); if (!zone) return NULL; - zone->comp = c; - zone->x = x; zone->y = y; zone->w = w; @@ -210,9 +208,9 @@ e_zone_new(E_Comp *c, int num, int id, int x, int y, int w, int h) snprintf(name, sizeof(name), "Zone %d", zone->num); zone->name = eina_stringshare_add(name); - c->zones = eina_list_append(c->zones, zone); + e_comp->zones = eina_list_append(e_comp->zones, zone); - o = evas_object_rectangle_add(c->evas); + o = evas_object_rectangle_add(e_comp->evas); zone->bg_clip_object = o; evas_object_repeat_events_set(o, 1); evas_object_layer_set(o, E_LAYER_BG); @@ -222,7 +220,7 @@ e_zone_new(E_Comp *c, int num, int id, int x, int y, int w, int h) evas_object_color_set(o, 255, 255, 255, 255); evas_object_show(o); - o = evas_object_rectangle_add(c->evas); + o = evas_object_rectangle_add(e_comp->evas); zone->bg_event_object = o; evas_object_name_set(o, "zone->bg_event_object"); evas_object_clip_set(o, zone->bg_clip_object); @@ -397,25 +395,24 @@ e_zone_move_resize(E_Zone *zone, } EAPI E_Zone * -e_zone_current_get(E_Comp *c) +e_zone_current_get(void) { Eina_List *l = NULL; E_Zone *zone; - E_OBJECT_CHECK_RETURN(c, NULL); if (!starting) { int x, y; - ecore_evas_pointer_xy_get(c->ee, &x, &y); - EINA_LIST_FOREACH(c->zones, l, zone) + ecore_evas_pointer_xy_get(e_comp->ee, &x, &y); + EINA_LIST_FOREACH(e_comp->zones, l, zone) { if (E_INSIDE(x, y, zone->x, zone->y, zone->w, zone->h)) return zone; } } - if (!c->zones) return NULL; - return eina_list_data_get(c->zones); + if (!e_comp->zones) return NULL; + return eina_list_data_get(e_comp->zones); } EAPI void diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h index e0e5ca32f..2aa4baeef 100644 --- a/src/bin/e_zone.h +++ b/src/bin/e_zone.h @@ -121,12 +121,12 @@ struct _E_Event_Zone_Edge EINTERN int e_zone_init(void); EINTERN int e_zone_shutdown(void); -EAPI E_Zone *e_zone_new(E_Comp *con, int num, int id, int x, int y, int w, int h); +EAPI E_Zone *e_zone_new(int num, int id, int x, int y, int w, int h); EAPI void e_zone_name_set(E_Zone *zone, const char *name); EAPI void e_zone_move(E_Zone *zone, int x, int y); EAPI void e_zone_resize(E_Zone *zone, int w, int h); EAPI Eina_Bool e_zone_move_resize(E_Zone *zone, int x, int y, int w, int h); -EAPI E_Zone *e_zone_current_get(E_Comp *c); +EAPI E_Zone *e_zone_current_get(void); EAPI void e_zone_bg_reconfigure(E_Zone *zone); EAPI void e_zone_flip_coords_handle(E_Zone *zone, int x, int y); EAPI void e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count); diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c index 1a07c0696..31c339989 100644 --- a/src/modules/conf/e_mod_main.c +++ b/src/modules/conf/e_mod_main.c @@ -373,7 +373,7 @@ _e_mod_action_conf_cb(E_Object *obj, const char *params) if (obj->type == E_MANAGER_TYPE) zone = e_util_zone_current_get((E_Manager *)obj); else if (obj->type == E_COMP_TYPE) - zone = e_zone_current_get((E_Comp*)obj); + zone = e_zone_current_get(); else if (obj->type == E_ZONE_TYPE) zone = ((E_Zone *)obj); else diff --git a/src/modules/conf_display/e_int_config_desk.c b/src/modules/conf_display/e_int_config_desk.c index a3ce0ddd2..4fc00136c 100644 --- a/src/modules/conf_display/e_int_config_desk.c +++ b/src/modules/conf_display/e_int_config_desk.c @@ -166,7 +166,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) Evas_Object *o, *of, *ol, *ob; E_Zone *zone; - zone = e_zone_current_get(e_comp); + zone = e_zone_current_get(); o = e_widget_list_add(evas, 0, 0); diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c index bd2d0e8bb..64c45eaf4 100644 --- a/src/modules/conf_shelves/e_int_config_shelf.c +++ b/src/modules/conf_shelves/e_int_config_shelf.c @@ -125,7 +125,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data e_dialog_resizable_set(cfd->dia, 1); ol = e_widget_list_add(evas, 0, 0); - zone = e_zone_current_get(e_comp); + zone = e_zone_current_get(); snprintf(buf, sizeof(buf), _("Configured Shelves: Display %d"), zone->num); of = e_widget_framelist_add(evas, buf, 0); cfdata->o_list = e_widget_ilist_add(evas, 24, 24, &(cfdata->cur_shelf)); diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c index db4539c9a..b4c7c1ca3 100644 --- a/src/modules/conf_theme/e_int_config_theme.c +++ b/src/modules/conf_theme/e_int_config_theme.c @@ -665,7 +665,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia E_Radio_Group *rg; char path[PATH_MAX]; - z = e_zone_current_get(e_comp); + z = e_zone_current_get(); e_dialog_resizable_set(cfd->dia, 1); ot = e_widget_table_add(e_win_evas_win_get(evas), 0); diff --git a/src/modules/conf_theme/e_int_config_transitions.c b/src/modules/conf_theme/e_int_config_transitions.c index 00837716b..7c56a44f8 100644 --- a/src/modules/conf_theme/e_int_config_transitions.c +++ b/src/modules/conf_theme/e_int_config_transitions.c @@ -166,7 +166,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia Eina_List *l; char *t; - zone = e_zone_current_get(e_comp); + zone = e_zone_current_get(); o = e_widget_table_add(e_win_evas_win_get(evas), 0); diff --git a/src/modules/conf_theme/e_int_config_wallpaper.c b/src/modules/conf_theme/e_int_config_wallpaper.c index 9c8b229e2..8b4dca5f2 100644 --- a/src/modules/conf_theme/e_int_config_wallpaper.c +++ b/src/modules/conf_theme/e_int_config_wallpaper.c @@ -343,7 +343,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) E_Desk *desk; comp = e_manager_current_get()->comp; - zone = e_zone_current_get(comp); + zone = e_zone_current_get(); desk = e_desk_current_get(zone); cfbg = e_bg_config_get(comp->num, zone->num, desk->x, desk->y); @@ -412,7 +412,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data e_dialog_resizable_set(cfd->dia, 1); - zone = e_zone_current_get(e_comp); + zone = e_zone_current_get(); o = e_widget_list_add(evas, 0, 1); rg = e_widget_radio_group_new(&(cfdata->fmdir)); @@ -566,7 +566,7 @@ _adv_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data * e_dialog_resizable_set(cfd->dia, 1); - zone = e_zone_current_get(e_comp); + zone = e_zone_current_get(); o = e_widget_list_add(evas, 0, 1); rg = e_widget_radio_group_new(&(cfdata->fmdir)); @@ -655,7 +655,7 @@ _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) E_Zone *z; E_Desk *d; - if (!(z = e_zone_current_get(e_comp))) return 0; + if (!(z = e_zone_current_get())) return 0; if (!(d = e_desk_current_get(z))) return 0; if (cfdata->use_theme_bg) { diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c index 1ad490a61..7839bf59d 100644 --- a/src/modules/everything/e_mod_main.c +++ b/src/modules/everything/e_mod_main.c @@ -541,23 +541,11 @@ _e_mod_run_defer_cb(void *data) } static void -_e_mod_action_cb(E_Object *obj, const char *params) +_e_mod_action_cb(E_Object *obj EINA_UNUSED, const char *params) { E_Zone *zone = NULL; - if (obj) - { - if (obj->type == E_MANAGER_TYPE) - zone = e_util_zone_current_get((E_Manager *)obj); - else if (obj->type == E_COMP_TYPE) - zone = e_zone_current_get((E_Comp *)obj); - else if (obj->type == E_ZONE_TYPE) - zone = e_zone_current_get(((E_Zone *)obj)->comp); - else - zone = e_util_zone_current_get(e_manager_current_get()); - } - if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); - + zone = e_zone_current_get(); if (!zone) return; IF_RELEASE(_params); diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c index f79a707eb..0eb254e62 100644 --- a/src/modules/fileman/e_mod_main.c +++ b/src/modules/fileman/e_mod_main.c @@ -157,23 +157,12 @@ _e_mod_action_fileman_reset_cb(E_Object *obj EINA_UNUSED, const char *params EIN } static void -_e_mod_action_fileman_cb(E_Object *obj, +_e_mod_action_fileman_cb(E_Object *obj EINA_UNUSED, const char *params) { E_Zone *zone = NULL; - if (obj) - { - if (obj->type == E_MANAGER_TYPE) - zone = e_util_zone_current_get((E_Manager *)obj); - else if (obj->type == E_COMP_TYPE) - zone = e_zone_current_get((E_Comp *)obj); - else if (obj->type == E_ZONE_TYPE) - zone = e_zone_current_get(((E_Zone *)obj)->comp); - else - zone = e_zone_current_get(e_comp); - } - if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); if (zone) { if (params && params[0] == '/') diff --git a/src/modules/pager_plain/e_mod_main.c b/src/modules/pager_plain/e_mod_main.c index f06e340fd..f1084e2cd 100644 --- a/src/modules/pager_plain/e_mod_main.c +++ b/src/modules/pager_plain/e_mod_main.c @@ -1961,7 +1961,6 @@ static void _pager_window_cb_drag_finished(E_Drag *drag, int dropped) { Pager_Win *pw; - E_Comp *comp; E_Zone *zone; E_Desk *desk; int x = 0, y = 0, dx, dy; @@ -1974,8 +1973,7 @@ _pager_window_cb_drag_finished(E_Drag *drag, int dropped) int zx, zy, zw, zh; /* wasn't dropped (on pager). move it to position of mouse on screen */ - comp = e_comp; - zone = e_zone_current_get(comp); + zone = e_zone_current_get(); desk = e_desk_current_get(zone); e_client_zone_set(pw->client, zone); diff --git a/src/modules/policy_mobile/e_mod_config.c b/src/modules/policy_mobile/e_mod_config.c index 6c198e7f6..da6d23619 100644 --- a/src/modules/policy_mobile/e_mod_config.c +++ b/src/modules/policy_mobile/e_mod_config.c @@ -226,12 +226,9 @@ static Evas_Object * _pol_cfd_data_basic_widgets_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *base, *fl, *lb, *lo, *o; - E_Comp *comp; E_Zone *zone; Eina_List *l; - comp = e_comp; - base = e_widget_list_add(evas, 0, 0); fl = e_widget_framelist_add(evas, _("Softkey"), 0); @@ -255,14 +252,14 @@ _pol_cfd_data_basic_widgets_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, e_widget_ilist_multi_select_set(o, EINA_FALSE); e_widget_size_min_set(o, 100, 100); e_widget_on_change_hook_set(o, _pol_cfd_hook_zone_change, cfdata); - EINA_LIST_REVERSE_FOREACH(comp->zones, l, zone) + EINA_LIST_REVERSE_FOREACH(e_comp->zones, l, zone) e_widget_ilist_append(o, NULL, zone->name, NULL, zone, NULL); e_widget_ilist_go(o); e_widget_ilist_selected_set(o, 0); e_widget_list_object_append(lo, o, 1, 1, 0.5); /* update virtual desktops of first zone */ - zone = eina_list_data_get(comp->zones); + zone = eina_list_data_get(e_comp->zones); _pol_cfd_desk_list_update(cfdata, zone); e_widget_framelist_object_append(fl, lo); @@ -274,7 +271,6 @@ _pol_cfd_data_basic_widgets_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, void e_mod_pol_conf_init(Mod *mod) { - E_Comp *comp; E_Zone *zone; E_Desk *desk; Config *conf; @@ -316,8 +312,7 @@ e_mod_pol_conf_init(Mod *mod) conf->use_softkey = 1; conf->softkey_size = 42; - comp = e_comp; - zone = e_zone_current_get(comp); + zone = e_zone_current_get(); desk = e_desk_current_get(zone); _pol_conf_desk_add(conf, desk); } diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c index ce052e17c..ca3ce8297 100644 --- a/src/modules/shot/e_mod_main.c +++ b/src/modules/shot/e_mod_main.c @@ -940,7 +940,7 @@ _e_mod_action_cb(E_Object *obj, const char *params) if (obj->type == E_MANAGER_TYPE) zone = e_util_zone_current_get((E_Manager *)obj); else if (obj->type == E_COMP_TYPE) - zone = e_zone_current_get((E_Comp *)obj); + zone = e_zone_current_get(); else if (obj->type == E_ZONE_TYPE) zone = ((E_Zone *)obj); else diff --git a/src/modules/syscon/e_mod_main.c b/src/modules/syscon/e_mod_main.c index 254a38452..fcd094aa1 100644 --- a/src/modules/syscon/e_mod_main.c +++ b/src/modules/syscon/e_mod_main.c @@ -85,7 +85,7 @@ _e_mod_action_syscon_cb(E_Object *obj, const char *params) if (obj->type == E_MANAGER_TYPE) zone = e_util_zone_current_get((E_Manager *)obj); else if (obj->type == E_COMP_TYPE) - zone = e_zone_current_get((E_Comp *)obj); + zone = e_zone_current_get(); else if (obj->type == E_ZONE_TYPE) zone = e_util_zone_current_get(((E_Zone *)obj)->comp->man); else diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c index ff5248ffe..78dde17e5 100644 --- a/src/modules/teamwork/e_mod_tw.c +++ b/src/modules/teamwork/e_mod_tw.c @@ -779,7 +779,7 @@ tw_show_helper(Evas_Object *o, int w, int h) int px, py, pw, ph; double ratio = tw_config->popup_size / 100.; E_Client *ec = NULL; - E_Zone *zone = e_zone_current_get(e_comp); + E_Zone *zone = e_zone_current_get(); evas_object_hide(tw_mod->pop); evas_object_del(tw_mod->pop); @@ -885,7 +885,7 @@ tw_video_opened_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) return; } - zone = e_zone_current_get(e_comp); + zone = e_zone_current_get(); w = MIN(zone->w, (ratio * (double)zone->w)); ratio = emotion_object_ratio_get(obj); if (ratio > 0.0) iw = (ih * ratio) + 0.5; diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c index a78499580..2fe3dbd58 100644 --- a/src/modules/tiling/e_mod_tiling.c +++ b/src/modules/tiling/e_mod_tiling.c @@ -118,9 +118,7 @@ static const E_Gadcon_Client_Class _gc_class = static E_Desk * get_current_desk(void) { - E_Manager *m = e_manager_current_get(); - E_Comp *c = m->comp; - E_Zone *z = e_zone_current_get(c); + E_Zone *z = e_zone_current_get(); return e_desk_current_get(z); } diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c index 86cd6d0c0..a6252d06a 100644 --- a/src/modules/winlist/e_winlist.c +++ b/src/modules/winlist/e_winlist.c @@ -284,7 +284,7 @@ e_winlist_hide(void) } if (e_config->winlist_list_move_after_select) { - e_client_zone_set(ec, e_zone_current_get(e_comp)); + e_client_zone_set(ec, e_zone_current_get()); e_client_desk_set(ec, e_desk_current_get(ec->zone)); } else if (ec->desk)