parent
21ccc8a443
commit
d9aa5194e4
|
@ -84,7 +84,7 @@ e_container_new(E_Manager *man)
|
|||
|
||||
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 @@ e_container_new(E_Manager *man)
|
|||
}
|
||||
}
|
||||
if (!skip)
|
||||
zone = e_zone_new(con, zx, zy, zw, zh);
|
||||
zone = e_zone_new(con, i, zx, zy, zw, zh);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,14 +14,11 @@ static void _e_zone_cb_bg_mouse_up(void *data, Evas *evas, Evas_Object *obj, voi
|
|||
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_shutdown(void)
|
|||
}
|
||||
|
||||
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 @@ e_zone_new(E_Container *con, int x, int y, int w, int h)
|
|||
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 @@ e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count)
|
|||
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)
|
||||
|
|
|
@ -19,6 +19,9 @@ struct _E_Zone
|
|||
|
||||
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 @@ struct _E_Event_Zone_Desk_Count_Set
|
|||
|
||||
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);
|
||||
|
|
Loading…
Reference in New Issue