Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_border.c e_border.h e_container.c e_container.h
e_desk.c e_desk.h e_includes.h e_int_menus.c e_main.c e_zone.c
e_zone.h
Removed Files:
e_iconify.c e_iconify.h
Log Message:
Client list update.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- Makefile.am 13 Mar 2005 11:17:26 -0000 1.18
+++ Makefile.am 15 Mar 2005 10:25:47 -0000 1.19
@@ -37,7 +37,6 @@
e_place.h \
e_resist.h \
e_startup.h \
-e_iconify.h \
e_hints.h \
e_gadman.h \
e_signals.h \
@@ -75,7 +74,6 @@
e_place.c \
e_resist.c \
e_startup.c \
-e_iconify.c \
e_hints.c \
e_gadman.c \
e_signals.c \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- e_border.c 15 Mar 2005 09:35:51 -0000 1.113
+++ e_border.c 15 Mar 2005 10:25:47 -0000 1.114
@@ -310,9 +310,7 @@
bd->changed = 1;
bd->zone = e_zone_current_get(con);
- bd->zone->clients = evas_list_append(bd->zone->clients, bd);
bd->desk = e_desk_current_get(bd->zone);
- bd->desk->clients = evas_list_append(bd->desk->clients, bd);
con->clients = evas_list_append(con->clients, bd);
borders = evas_list_append(borders, bd);
@@ -338,8 +336,6 @@
E_OBJECT_CHECK(zone);
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
if (bd->zone == zone) return;
- bd->zone->clients = evas_list_remove(bd->zone->clients, bd);
- zone->clients = evas_list_append(zone->clients, bd);
bd->zone = zone;
if (bd->desk->zone != bd->zone)
@@ -377,8 +373,6 @@
E_OBJECT_CHECK(desk);
E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
if (bd->desk == desk) return;
- bd->desk->clients = evas_list_remove(bd->desk->clients, bd);
- desk->clients = evas_list_append(desk->clients, bd);
bd->desk = desk;
e_border_zone_set(bd, desk->zone);
@@ -947,9 +941,6 @@
e_border_desk_set(bd, desk);
bd->iconic = 0;
e_border_show(bd);
- /* FIXME: DEPRECATED?
- e_iconify_border_remove(bd);
- */
edje_object_signal_emit(bd->bg_object, "uniconify", "");
}
iconic = 0;
@@ -1055,6 +1046,11 @@
}
}
+Evas_List *
+e_border_clients_get()
+{
+ return borders;
+}
/* local subsystem functions */
static void
@@ -1111,8 +1107,6 @@
ecore_x_window_del(bd->win);
bd->container->clients = evas_list_remove(bd->container->clients, bd);
- bd->zone->clients = evas_list_remove(bd->zone->clients, bd);
- bd->desk->clients = evas_list_remove(bd->desk->clients, bd);
borders = evas_list_remove(borders, bd);
free(bd);
@@ -3503,10 +3497,6 @@
{
bd->container->clients = evas_list_remove(bd->container->clients, bd);
bd->container->clients =
evas_list_append_relative(bd->container->clients, bd, after);
- bd->zone->clients = evas_list_remove(bd->zone->clients, bd);
- bd->zone->clients = evas_list_append_relative(bd->zone->clients, bd,
after);
- bd->desk->clients = evas_list_remove(bd->desk->clients, bd);
- bd->desk->clients = evas_list_append_relative(bd->desk->clients, bd,
after);
borders = evas_list_remove(borders, bd);
borders = evas_list_append_relative(borders, bd, after);
}
@@ -3514,10 +3504,6 @@
{
bd->container->clients = evas_list_remove(bd->container->clients, bd);
bd->container->clients = evas_list_append(bd->container->clients, bd);
- bd->zone->clients = evas_list_remove(bd->zone->clients, bd);
- bd->zone->clients = evas_list_append(bd->zone->clients, bd);
- bd->desk->clients = evas_list_remove(bd->desk->clients, bd);
- bd->desk->clients = evas_list_append(bd->desk->clients, bd);
borders = evas_list_remove(borders, bd);
borders = evas_list_append(borders, bd);
}
@@ -3530,10 +3516,6 @@
{
bd->container->clients = evas_list_remove(bd->container->clients, bd);
bd->container->clients =
evas_list_prepend_relative(bd->container->clients, bd, before);
- bd->zone->clients = evas_list_remove(bd->zone->clients, bd);
- bd->zone->clients = evas_list_prepend_relative(bd->zone->clients, bd,
before);
- bd->desk->clients = evas_list_remove(bd->desk->clients, bd);
- bd->desk->clients = evas_list_prepend_relative(bd->desk->clients, bd,
before);
borders = evas_list_remove(borders, bd);
borders = evas_list_prepend_relative(borders, bd, before);
}
@@ -3541,10 +3523,6 @@
{
bd->container->clients = evas_list_remove(bd->container->clients, bd);
bd->container->clients = evas_list_prepend(bd->container->clients, bd);
- bd->zone->clients = evas_list_remove(bd->zone->clients, bd);
- bd->zone->clients = evas_list_prepend(bd->zone->clients, bd);
- bd->desk->clients = evas_list_remove(bd->desk->clients, bd);
- bd->desk->clients = evas_list_prepend(bd->desk->clients, bd);
borders = evas_list_remove(borders, bd);
borders = evas_list_prepend(borders, bd);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- e_border.h 10 Mar 2005 23:54:49 -0000 1.29
+++ e_border.h 15 Mar 2005 10:25:48 -0000 1.30
@@ -306,7 +306,7 @@
EAPI void e_border_idler_before(void);
-EAPI void e_border_iconified_list(void);
+EAPI Evas_List *e_border_clients_get();
extern EAPI int E_EVENT_BORDER_RESIZE;
extern EAPI int E_EVENT_BORDER_MOVE;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- e_container.c 11 Mar 2005 13:09:06 -0000 1.32
+++ e_container.c 15 Mar 2005 10:25:48 -0000 1.33
@@ -227,14 +227,6 @@
}
}
-Evas_List *
-e_container_clients_list_get(E_Container *con)
-{
- E_OBJECT_CHECK_RETURN(con, NULL);
- E_OBJECT_TYPE_CHECK_RETURN(con, E_CONTAINER_TYPE, NULL);
- return con->clients;
-}
-
E_Zone *
e_container_zone_at_point_get(E_Container *con, int x, int y)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_container.h 13 Feb 2005 10:44:02 -0000 1.14
+++ e_container.h 15 Mar 2005 10:25:48 -0000 1.15
@@ -84,7 +84,6 @@
EAPI void e_container_raise(E_Container *con);
EAPI void e_container_lower(E_Container *con);
-EAPI Evas_List *e_container_clients_list_get(E_Container *con);
EAPI E_Zone *e_container_zone_at_point_get(E_Container *con, int x, int
y);
EAPI E_Zone *e_container_zone_number_get(E_Container *con, int num);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_desk.c 18 Feb 2005 10:29:18 -0000 1.22
+++ e_desk.c 15 Mar 2005 10:25:48 -0000 1.23
@@ -43,7 +43,6 @@
desk = E_OBJECT_ALLOC(E_Desk, E_DESK_TYPE, _e_desk_free);
if (!desk) return NULL;
- desk->clients = NULL;
desk->zone = zone;
desk->num = ++desk_count;
snprintf(name, sizeof(name), "Desktop %d, %d", x, y);
@@ -237,7 +236,6 @@
_e_desk_free(E_Desk *desk)
{
E_FREE(desk->name);
- evas_list_free(desk->clients);
free(desk);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_desk.h 15 Feb 2005 12:11:31 -0000 1.11
+++ e_desk.h 15 Mar 2005 10:26:05 -0000 1.12
@@ -22,8 +22,6 @@
char visible : 1;
Evas_Object *bg_object;
-
- Evas_List *clients;
};
struct _E_Event_Desk_Show
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_includes.h 13 Mar 2005 08:21:01 -0000 1.8
+++ e_includes.h 15 Mar 2005 10:26:05 -0000 1.9
@@ -27,7 +27,6 @@
#include "e_place.h"
#include "e_resist.h"
#include "e_startup.h"
-#include "e_iconify.h"
#include "e_hints.h"
#include "e_gadman.h"
#include "e_signals.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_int_menus.c 18 Feb 2005 10:30:02 -0000 1.38
+++ e_int_menus.c 15 Mar 2005 10:26:05 -0000 1.39
@@ -421,23 +421,22 @@
E_Menu_Item *mi;
Evas_List *l, *borders = NULL;
E_Menu *root;
+ E_Zone *zone;
e_menu_pre_activate_callback_set(m, NULL, NULL);
root = e_menu_root_get(m);
- /* get the current containers clients */
- if ((root) && (root->zone))
- {
- for (l = e_zone_clients_list_get(root->zone); l; l = l->next)
- borders = evas_list_append(borders, l->data);
+ /* get the current clients */
+ if (root)
+ zone = root->zone;
+ for (l = e_border_clients_get(); l; l = l->next)
+ {
+ E_Border *border;
+
+ border = l->data;
+ if ((border->zone == zone) || (border->iconic))
+ borders = evas_list_append(borders, border);
}
- /* get the iconified clients from other containers */
- for (l = e_iconify_clients_list_get(); l; l = l->next)
- {
- if (!evas_list_find(borders, l->data))
- borders = evas_list_append(borders, l->data);
- }
-
if (!borders)
{
/* FIXME here we want nothing, but that crashes!!! */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- e_main.c 13 Mar 2005 11:17:26 -0000 1.52
+++ e_main.c 15 Mar 2005 10:26:05 -0000 1.53
@@ -271,15 +271,6 @@
}
_e_main_shutdown_push(e_module_shutdown);
- /* setup iconification */
- if (!e_iconify_init())
- {
- e_error_message_show("Enlightenment cannot setup its iconify system.");
- _e_main_shutdown(-1);
- }
- else
- _e_main_shutdown_push(e_iconify_shutdown);
-
if (!nowelcome)
{
/* explicitly show a gui dialog */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_zone.c 10 Mar 2005 10:14:35 -0000 1.26
+++ e_zone.c 15 Mar 2005 10:26:05 -0000 1.27
@@ -209,15 +209,6 @@
evas_object_show(o);
}
-Evas_List *
-e_zone_clients_list_get(E_Zone *zone)
-{
- E_OBJECT_CHECK_RETURN(zone, NULL);
- E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, NULL);
- return zone->clients;
-}
-
-
static void
_e_zone_free(E_Zone *zone)
{
@@ -315,7 +306,7 @@
E_Desk **new_desks;
E_Desk *desk, *new_desk;
int x, y, xx, yy, moved;
- Evas_List *client;
+ Evas_List *l;
E_Border *bd;
E_Event_Zone_Desk_Count_Set *ev;
@@ -332,7 +323,7 @@
for(y = 0; y < yy; y++)
{
if (x < zone->desk_x_count && y < zone->desk_y_count)
- desk = (E_Desk *) zone->desks[x + (y * zone->desk_x_count)];
+ desk = zone->desks[x + (y * zone->desk_x_count)];
else
desk = e_desk_new(zone, x, y);
new_desks[x + (y * xx)] = desk;
@@ -342,20 +333,16 @@
if (xx < zone->desk_x_count)
for (y = 0; y < zone->desk_y_count; y++)
{
- new_desk = (E_Desk *)
- zone->desks[xx - 1 + (y * zone->desk_x_count)];
+ new_desk = zone->desks[xx - 1 + (y * zone->desk_x_count)];
for (x = xx; x < zone->desk_x_count; x++)
{
- desk = (E_Desk *)
- zone->desks[x + (y * zone->desk_x_count)];
+ desk = zone->desks[x + (y * zone->desk_x_count)];
- /* Here desk->clients is removed from the list on desk_set
- * so we want to iterate whilst it is not NULL */
- while (desk->clients)
+ for (l = zone->container->clients; l; l = l->next)
{
- bd = (E_Border *) desk->clients->data;
-
- e_border_desk_set(bd, new_desk);
+ bd = l->data;
+ if (bd->desk == desk)
+ e_border_desk_set(bd, new_desk);
}
e_object_del(E_OBJECT(desk));
}
@@ -363,19 +350,16 @@
if (yy < zone->desk_y_count)
for (x = 0; x < zone->desk_x_count; x++)
{
- new_desk = (E_Desk *)
- zone->desks[x + ((yy - 1) * zone->desk_x_count)];
+ new_desk = zone->desks[x + ((yy - 1) * zone->desk_x_count)];
for (y = yy; y < zone->desk_y_count; y++)
{
- desk = (E_Desk *)
- zone->desks[x + (y * zone->desk_x_count)];
+ desk = zone->desks[x + (y * zone->desk_x_count)];
- /* again, list shrinking as we iterate */
- while (desk->clients)
+ for (l = zone->container->clients; l; l = l->next)
{
- bd = (E_Border *) desk->clients->data;
-
- e_border_desk_set(bd, new_desk);
+ bd = l->data;
+ if (bd->desk == desk)
+ e_border_desk_set(bd, new_desk);
}
e_object_del(E_OBJECT(desk));
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_zone.h 21 Feb 2005 16:16:40 -0000 1.14
+++ e_zone.h 15 Mar 2005 10:26:05 -0000 1.15
@@ -31,8 +31,6 @@
int desk_x_count, desk_y_count;
int desk_x_current, desk_y_current;
E_Desk **desks;
- Evas_List *clients;
-
};
struct _E_Event_Zone_Desk_Count_Set
@@ -48,7 +46,6 @@
EAPI void e_zone_move_resize(E_Zone *zone, int x, int y, int w, int h);
EAPI E_Zone *e_zone_current_get(E_Container *con);
EAPI void e_zone_bg_reconfigure(E_Zone *zone);
-EAPI Evas_List *e_zone_clients_list_get(E_Zone *zone);
EAPI void e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count);
EAPI void e_zone_desk_count_get(E_Zone *zone, int *x_count, int
*y_count);
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
