Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_container.c e_zone.c e_zone.h
Log Message:
Use xinerama screen id for zone id.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_container.c 13 Feb 2005 11:36:19 -0000 1.25
+++ e_container.c 13 Feb 2005 12:33:30 -0000 1.26
@@ -84,7 +84,7 @@
n = ecore_x_xinerama_screen_count_get();
if (n == 0)
- zone = e_zone_new(con, 0, 0, con->w, con->h);
+ zone = e_zone_new(con, 0, 0, 0, con->w, con->h);
else
{
for (i = 0; i < n; i++)
@@ -107,7 +107,7 @@
}
}
if (!skip)
- zone = e_zone_new(con, zx, zy, zw, zh);
+ zone = e_zone_new(con, i, zx, zy, zw, zh);
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_zone.c 7 Feb 2005 11:27:08 -0000 1.22
+++ e_zone.c 13 Feb 2005 12:33:30 -0000 1.23
@@ -14,14 +14,11 @@
static void _e_zone_cb_bg_mouse_move(void *data, Evas *evas, Evas_Object *obj,
void *event_info);
static void _e_zone_event_zone_desk_count_set_free(void *data, void *ev);
-static int zone_count;
-
int E_EVENT_ZONE_DESK_COUNT_SET = 0;
int
e_zone_init(void)
{
- zone_count = 0;
E_EVENT_ZONE_DESK_COUNT_SET = ecore_event_type_new();
return 1;
@@ -34,7 +31,7 @@
}
E_Zone *
-e_zone_new(E_Container *con, int x, int y, int w, int h)
+e_zone_new(E_Container *con, int num, int x, int y, int w, int h)
{
E_Zone *zone;
char name[40];
@@ -48,7 +45,7 @@
zone->y = y;
zone->w = w;
zone->h = h;
- zone->num = ++zone_count;
+ zone->num = num;
snprintf(name, sizeof(name), "Zone %d", zone->num);
zone->name = strdup(name);
@@ -314,7 +311,6 @@
Evas_List *client;
E_Border *bd;
E_Event_Zone_Desk_Count_Set *ev;
- E_Event_Border_Desk_Set *evb;
xx = x_count;
if (xx < 1)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_zone.h 7 Feb 2005 13:51:09 -0000 1.12
+++ e_zone.h 13 Feb 2005 12:33:31 -0000 1.13
@@ -19,6 +19,9 @@
int x, y, w, h;
char *name;
+ /* num matches the id of the xinerama screen
+ * this zone belongs to.
+ */
int num;
E_Container *container;
@@ -40,7 +43,7 @@
EAPI int e_zone_init(void);
EAPI int e_zone_shutdown(void);
-EAPI E_Zone *e_zone_new(E_Container *con, int x, int y, int w, int h);
+EAPI E_Zone *e_zone_new(E_Container *con, int num, int x, int y, int w, int
h);
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 void e_zone_move_resize(E_Zone *zone, int x, int y, int w, int h);
-------------------------------------------------------
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
