styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Slightly modified (formatting) patch from Ravenlock <ravenlock@tx.rr.com> to 

add separators to the client list. Current desk is always at the top,
other clients are grouped by desk with separators between.


SVN revision: 28312
This commit is contained in:
Christopher Michael 2007-02-12 06:01:39 +00:00
parent ecdd19d001
commit 247c61d3b6
1 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/bin/e_int_menus.c
View File

@ -890,12 +890,33 @@ _e_int_menus_sys_free_hook(void *obj)
_e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation, "sys"));
}
static int
_e_int_menus_clients_sort_border_cb(void *d1, void *d2)
{
E_Border *bd1;
E_Border *bd2;
int j,k;
if (!d1) return 1;
if (!d2) return -1;
bd1 = d1;
bd2 = d2;
j = bd1->desk->y * 12 + bd1->desk->x;
k = bd2->desk->y * 12 + bd2->desk->x;
if (j > k) return 1;
if (j < k) return -1;
if (j = k) return 0;
}
static void
_e_int_menus_clients_pre_cb(void *data, E_Menu *m)
{
E_Menu *subm;
E_Menu_Item *mi;
Evas_List *l, *borders = NULL, *alt = NULL;
Evas_List *l = NULL, *borders = NULL, *alt = NULL;
E_Zone *zone = NULL;
E_Desk *desk = NULL;
Main_Data *dat;
@ -924,12 +945,12 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
/* FIXME here we want nothing, but that crashes!!! */
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("(No Windows)"));
// return;
}
for (l = borders; l; l = l->next)
{
E_Border *bd = l->data;
E_Border *bd;
bd = l->data;
if (bd->desk != desk)
{
alt = evas_list_append(alt, bd);
@ -937,15 +958,24 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
}
_e_int_menus_clients_item_create(bd, m);
}
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
alt = evas_list_sort(alt, evas_list_count(alt),
_e_int_menus_clients_sort_border_cb);
desk = NULL;
if (evas_list_count(alt) > 0)
{
for (l = alt; l; l = l->next)
{
E_Border *bd = l->data;
E_Border *bd;
bd = l->data;
if (bd->desk != desk)
{
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
desk = bd->desk;
}
_e_int_menus_clients_item_create(bd, m);
}
mi = e_menu_item_new(m);