Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_desk.c e_desk.h e_zone.c
Log Message:
i've gone over vd's - read the diff :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_desk.c 22 Mar 2005 18:51:35 -0000 1.24
+++ e_desk.c 9 Apr 2005 00:13:09 -0000 1.25
@@ -11,17 +11,12 @@
static void _e_desk_free(E_Desk *desk);
static void _e_border_event_desk_show_free(void *data, void *ev);
-static int desk_count;
-
int E_EVENT_DESK_SHOW = 0;
int
e_desk_init(void)
{
- desk_count = 0;
-
E_EVENT_DESK_SHOW = ecore_event_type_new();
-
return 1;
}
@@ -44,7 +39,8 @@
if (!desk) return NULL;
desk->zone = zone;
- desk->num = ++desk_count;
+ desk->x = x;
+ desk->y = y;
snprintf(name, sizeof(name), "Desktop %d, %d", x, y);
desk->name = strdup(name);
return desk;
@@ -62,8 +58,8 @@
void
e_desk_show(E_Desk *desk)
{
- Evas_List *l;
- int x, y;
+ Evas_List *l;
+ int x, y;
E_Event_Desk_Show *ev;
E_OBJECT_CHECK(desk);
@@ -76,14 +72,10 @@
if (bd->desk->zone == desk->zone && !bd->iconic)
{
- if (bd->desk == desk || bd->sticky)
- {
- e_border_show(bd);
- }
+ if ((bd->desk == desk) || (bd->sticky))
+ e_border_show(bd);
else
- {
- e_border_hide(bd, 1);
- }
+ e_border_hide(bd, 1);
}
}
@@ -91,10 +83,11 @@
{
for (y = 0; y < desk->zone->desk_y_count; y++)
{
- E_Desk *next;
- next = e_desk_at_xy_get(desk->zone,x, y);
- next->visible = 0;
- if (next == desk)
+ E_Desk *desk2;
+
+ desk2 = e_desk_at_xy_get(desk->zone,x, y);
+ desk2->visible = 0;
+ if (desk2 == desk)
{
desk->zone->desk_x_current = x;
desk->zone->desk_y_current = y;
@@ -138,7 +131,6 @@
{
E_OBJECT_CHECK_RETURN(zone, NULL);
E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, NULL);
-
return e_desk_at_xy_get(zone, zone->desk_x_current, zone->desk_y_current);
}
@@ -151,7 +143,7 @@
if ((x >= zone->desk_x_count) || (y >= zone->desk_y_count))
return NULL;
- return (E_Desk *) zone->desks[x + (y * zone->desk_x_count)];
+ return (E_Desk *)zone->desks[x + (y * zone->desk_x_count)];
}
void
@@ -162,21 +154,8 @@
E_OBJECT_CHECK(desk);
E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
- for (xx = 0; xx < desk->zone->desk_x_count; xx++)
- {
- for (yy = 0; yy < desk->zone->desk_y_count; yy++)
- {
- E_Desk *next;
- next = e_desk_at_xy_get(desk->zone, xx, yy);
-
- if (next == desk)
- {
- *x = xx;
- *y = yy;
- return;
- }
- }
- }
+ if (x) *x = desk->x;
+ if (y) *y = desk->y;
}
void
@@ -187,19 +166,19 @@
E_OBJECT_CHECK(zone);
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
- if (zone->desk_x_count < 2 && zone->desk_y_count < 2)
- return;
+ if ((zone->desk_x_count < 2) &&
+ (zone->desk_y_count < 2))
+ return;
x = zone->desk_x_current;
y = zone->desk_y_current;
-
+
x++;
if (x >= zone->desk_x_count)
{
x = 0;
y++;
- if (y >= zone->desk_y_count)
- y = 0;
+ if (y >= zone->desk_y_count) y = 0;
}
e_desk_show(e_desk_at_xy_get(zone, x, y));
@@ -213,7 +192,8 @@
E_OBJECT_CHECK(zone);
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
- if (zone->desk_x_count < 2 && zone->desk_y_count < 2)
+ if ((zone->desk_x_count < 2) &&
+ (zone->desk_y_count < 2))
return;
x = zone->desk_x_current;
@@ -224,11 +204,8 @@
{
x = zone->desk_x_count - 1;
y--;
- if (y < 0)
- y = zone->desk_y_count - 1;
-
+ if (y < 0) y = zone->desk_y_count - 1;
}
-
e_desk_show(e_desk_at_xy_get(zone, x, y));
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_desk.h 15 Mar 2005 10:26:05 -0000 1.12
+++ e_desk.h 9 Apr 2005 00:13:09 -0000 1.13
@@ -18,7 +18,7 @@
E_Zone *zone;
char *name;
- int num;
+ int x, y;
char visible : 1;
Evas_Object *bg_object;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_zone.c 22 Mar 2005 09:09:12 -0000 1.28
+++ e_zone.c 9 Apr 2005 00:13:09 -0000 1.29
@@ -313,60 +313,62 @@
E_Event_Zone_Desk_Count_Set *ev;
xx = x_count;
- if (xx < 1)
- xx = 1;
+ if (xx < 1) xx = 1;
yy = y_count;
- if (yy < 1)
- yy = 1;
+ if (yy < 1) yy = 1;
new_desks = malloc(xx * yy * sizeof(E_Desk *));
-
for (x = 0; x < xx; x++)
- for(y = 0; y < yy; y++)
- {
- if (x < zone->desk_x_count && y < zone->desk_y_count)
- desk = zone->desks[x + (y * zone->desk_x_count)];
- else
- desk = e_desk_new(zone, x, y);
- new_desks[x + (y * xx)] = desk;
- }
+ {
+ for (y = 0; y < yy; y++)
+ {
+ if ((x < zone->desk_x_count) && (y < zone->desk_y_count))
+ desk = zone->desks[x + (y * zone->desk_x_count)];
+ else
+ desk = e_desk_new(zone, x, y);
+ new_desks[x + (y * xx)] = desk;
+ }
+ }
/* catch windoes that have fallen off the end if we got smaller */
if (xx < zone->desk_x_count)
- for (y = 0; y < zone->desk_y_count; y++)
- {
- new_desk = zone->desks[xx - 1 + (y * zone->desk_x_count)];
- for (x = xx; x < zone->desk_x_count; x++)
- {
- desk = zone->desks[x + (y * zone->desk_x_count)];
-
- for (l = zone->container->clients; l; l = l->next)
- {
- bd = l->data;
- if (bd->desk == desk)
- e_border_desk_set(bd, new_desk);
- }
- e_object_del(E_OBJECT(desk));
- }
- }
+ {
+ for (y = 0; y < zone->desk_y_count; y++)
+ {
+ new_desk = zone->desks[xx - 1 + (y * zone->desk_x_count)];
+ for (x = xx; x < zone->desk_x_count; x++)
+ {
+ desk = zone->desks[x + (y * zone->desk_x_count)];
+
+ for (l = zone->container->clients; l; l = l->next)
+ {
+ bd = l->data;
+ if (bd->desk == desk)
+ e_border_desk_set(bd, new_desk);
+ }
+ e_object_del(E_OBJECT(desk));
+ }
+ }
+ }
if (yy < zone->desk_y_count)
- for (x = 0; x < zone->desk_x_count; x++)
- {
- new_desk = zone->desks[x + ((yy - 1) * zone->desk_x_count)];
- for (y = yy; y < zone->desk_y_count; y++)
- {
- desk = zone->desks[x + (y * zone->desk_x_count)];
-
- for (l = zone->container->clients; l; l = l->next)
- {
- bd = l->data;
- if (bd->desk == desk)
- e_border_desk_set(bd, new_desk);
- }
- e_object_del(E_OBJECT(desk));
- }
- }
-
+ {
+ for (x = 0; x < zone->desk_x_count; x++)
+ {
+ new_desk = zone->desks[x + ((yy - 1) * zone->desk_x_count)];
+ for (y = yy; y < zone->desk_y_count; y++)
+ {
+ desk = zone->desks[x + (y * zone->desk_x_count)];
+
+ for (l = zone->container->clients; l; l = l->next)
+ {
+ bd = l->data;
+ if (bd->desk == desk)
+ e_border_desk_set(bd, new_desk);
+ }
+ e_object_del(E_OBJECT(desk));
+ }
+ }
+ }
if (zone->desks) free(zone->desks);
zone->desks = new_desks;
-------------------------------------------------------
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
