From 4d07ec2c00fe05eb19271c656b12f7845fe573b6 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 20 Aug 2013 10:59:47 +0100 Subject: [PATCH] remove black_ecore_evas this was used in illume, which is now dead. --- src/bin/e_utils.c | 14 -------- src/bin/e_utils.h | 1 - src/bin/e_zone.c | 86 +---------------------------------------------- src/bin/e_zone.h | 4 --- 4 files changed, 1 insertion(+), 104 deletions(-) diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c index f2d09e2ac..44232111d 100644 --- a/src/bin/e_utils.c +++ b/src/bin/e_utils.c @@ -501,20 +501,6 @@ e_util_mime_icon_get(const char *mime, unsigned int size) return efreet_mime_type_icon_get(mime, e_config->icon_theme, e_util_icon_size_normalize(size)); } -EAPI E_Zone * -e_util_zone_window_find(Ecore_X_Window win) -{ - const Eina_List *l, *ll; - E_Comp *c; - E_Zone *zone; - - EINA_LIST_FOREACH(e_comp_list(), l, c) - EINA_LIST_FOREACH(c->zones, ll, zone) - if (zone->black_win == win) return zone; - - return NULL; -} - EAPI E_Client * e_util_desk_client_above(E_Client *ec) { diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h index 6c1a7157a..d8225b6c7 100644 --- a/src/bin/e_utils.h +++ b/src/bin/e_utils.h @@ -33,7 +33,6 @@ EAPI int e_util_icon_theme_set(Evas_Object *obj, const char *icon); EAPI unsigned int e_util_icon_size_normalize(unsigned int desired); EAPI int e_util_menu_item_theme_icon_set(E_Menu_Item *mi, const char *icon); EAPI const char *e_util_mime_icon_get(const char *mime, unsigned int size); -EAPI E_Zone *e_util_zone_window_find(Ecore_X_Window win); EAPI E_Client *e_util_desk_client_above(E_Client *ec); EAPI E_Client *e_util_desk_client_below(E_Client *ec); EAPI int e_util_edje_collection_exists(const char *file, const char *coll); diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c index efd54afd8..7490c3a1c 100644 --- a/src/bin/e_zone.c +++ b/src/bin/e_zone.c @@ -77,65 +77,6 @@ e_zone_all_edge_flip_eval(void) e_zone_edge_flip_eval(zone); } -static void -_e_zone_black_new(E_Zone *zone) -{ - Evas_Object *o; - char name[256]; - - if (zone->black_ecore_evas) return; - zone->black_ecore_evas = e_canvas_new(zone->comp->win, - zone->x, zone->y, 1, 1, 1, 1, - (Ecore_X_Window*)&zone->black_win); - e_canvas_add(zone->black_ecore_evas); - ecore_evas_layer_set(zone->black_ecore_evas, 6); - zone->black_evas = ecore_evas_get(zone->black_ecore_evas); - - o = evas_object_rectangle_add(zone->black_evas); - evas_object_move(o, 0, 0); - evas_object_resize(o, zone->w, zone->h); - evas_object_color_set(o, 0, 0, 0, 255); - evas_object_show(o); - - ecore_evas_name_class_set(zone->black_ecore_evas, "E", "Black_Window"); - snprintf(name, sizeof(name), "Enlightenment Black Zone (%d)", zone->num); - ecore_evas_title_set(zone->black_ecore_evas, name); -} - -static void -_e_zone_black_free(E_Zone *zone) -{ - if (!zone->black_ecore_evas) return; - e_canvas_del(zone->black_ecore_evas); - ecore_evas_free(zone->black_ecore_evas); - zone->black_ecore_evas = NULL; - zone->black_win = 0; -} - -static void -_e_zone_black_get(E_Zone *zone) -{ - zone->black_need++; - if (!zone->black_ecore_evas) return; - if (zone->black_need == 1) - { - ecore_evas_move(zone->black_ecore_evas, zone->x, zone->y); - ecore_evas_resize(zone->black_ecore_evas, zone->w, zone->h); - } -} - -static void -_e_zone_black_unget(E_Zone *zone) -{ - zone->black_need--; - if (!zone->black_ecore_evas) return; - if (zone->black_need == 0) - { - ecore_evas_move(zone->black_ecore_evas, zone->x, zone->y); - ecore_evas_resize(zone->black_ecore_evas, 1, 1); - } -} - static void _e_zone_cb_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info) { @@ -332,8 +273,6 @@ e_zone_new(E_Comp *c, int num, int id, int x, int y, int w, int h) e_object_del_attach_func_set(E_OBJECT(zone), _e_zone_object_del_attach); - _e_zone_black_new(zone); - e_zone_all_edge_flip_eval(); if (starting) return zone; @@ -381,11 +320,6 @@ e_zone_move(E_Zone *zone, _e_zone_edge_move_resize(zone); e_zone_bg_reconfigure(zone); - if (zone->black_need > 0) - { - ecore_evas_move(zone->black_ecore_evas, zone->x, zone->y); - ecore_evas_resize(zone->black_ecore_evas, zone->w, zone->h); - } } EAPI void @@ -413,11 +347,6 @@ e_zone_resize(E_Zone *zone, _e_zone_edge_move_resize(zone); e_zone_bg_reconfigure(zone); - if (zone->black_need > 0) - { - ecore_evas_move(zone->black_ecore_evas, zone->x, zone->y); - ecore_evas_resize(zone->black_ecore_evas, zone->w, zone->h); - } } EAPI Eina_Bool @@ -456,11 +385,6 @@ e_zone_move_resize(E_Zone *zone, _e_zone_edge_move_resize(zone); e_zone_bg_reconfigure(zone); - if (zone->black_need > 0) - { - ecore_evas_move(zone->black_ecore_evas, zone->x, zone->y); - ecore_evas_resize(zone->black_ecore_evas, zone->w, zone->h); - } return EINA_TRUE; } @@ -475,7 +399,7 @@ e_zone_current_get(E_Comp *c) { int x, y; - ecore_x_pointer_xy_get(c->win, &x, &y); + ecore_evas_pointer_xy_get(c->ee, &x, &y); EINA_LIST_FOREACH(c->zones, l, zone) { if (E_INSIDE(x, y, zone->x, zone->y, zone->w, zone->h)) @@ -1421,12 +1345,6 @@ _e_zone_free(E_Zone *zone) EVAS_CALLBACK_MOUSE_UP, _e_zone_cb_bg_mouse_up); - if (zone->black_ecore_evas) - { - e_canvas_del(zone->black_ecore_evas); - ecore_evas_free(zone->black_ecore_evas); - zone->black_ecore_evas = NULL; - } E_FREE_FUNC(zone->cur_mouse_action, e_object_unref); /* remove handlers */ @@ -1460,8 +1378,6 @@ _e_zone_free(E_Zone *zone) } free(zone->desks); - _e_zone_black_free(zone); - free(zone); } diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h index bc749235e..022dd2ec6 100644 --- a/src/bin/e_zone.h +++ b/src/bin/e_zone.h @@ -81,10 +81,6 @@ struct _E_Zone E_Action *cur_mouse_action; Eina_List *popups; - Ecore_Evas *black_ecore_evas; - Evas *black_evas; - Ecore_Window black_win; - int black_need; int id; struct