enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

Fetch the border name(s) once and reuse them. 

SVN revision: 28409
This commit is contained in:
Christopher Michael 2007-02-21 01:03:37 +00:00
parent 5010e74e70
commit 0ac7567560
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/bin/e_int_menus.c
View File

@ -922,8 +922,14 @@ _e_int_menus_clients_group_class_cb(void *d1, void *d2)
bd1 = d1; bd1 = d1;
bd2 = d2; bd2 = d2;
if (strcmp((const char*)bd1->client.icccm.class, (const char*)bd2->client.icccm.class) > 0) return 1; if (strcmp((const char*)bd1->client.icccm.class,
if (strcmp((const char*)bd1->client.icccm.class, (const char*)bd2->client.icccm.class) < 0) return -1; (const char*)bd2->client.icccm.class) > 0)
return 1;
if (strcmp((const char*)bd1->client.icccm.class,
(const char*)bd2->client.icccm.class) < 0)
return -1;
return -1; /* Returning '-1' on equal is intentional */ return -1; /* Returning '-1' on equal is intentional */
} }
@ -932,15 +938,19 @@ _e_int_menus_clients_sort_alpha_cb(void *d1, void *d2)
{ {
E_Border *bd1; E_Border *bd1;
E_Border *bd2; E_Border *bd2;
const char *name1;
const char *name2;
if (!d1) return 1; if (!d1) return 1;
if (!d2) return -1; if (!d2) return -1;
bd1 = d1; bd1 = d1;
bd2 = d2; bd2 = d2;
name1 = e_border_name_get(bd1);
name2 = e_border_name_get(bd2);
if (strcasecmp(e_border_name_get(bd1), e_border_name_get(bd2)) > 0) return 1; if (strcasecmp(name1, name2) > 0) return 1;
if (strcasecmp(e_border_name_get(bd1), e_border_name_get(bd2)) < 0) return -1; if (strcasecmp(name1, name2) < 0) return -1;
return 0; return 0;
} }
@ -957,7 +967,8 @@ _e_int_menus_clients_add_by_class(Evas_List *borders, E_Menu *m)
{ {
E_Border *bd; E_Border *bd;
bd = l->data; bd = l->data;
if ( strcmp(class, bd->client.icccm.class) != 0 && e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE) if (strcmp(class, bd->client.icccm.class) != 0 &&
e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE)
{ {
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU) if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
{ {
@ -980,7 +991,8 @@ _e_int_menus_clients_add_by_class(Evas_List *borders, E_Menu *m)
else else
_e_int_menus_clients_item_create(bd, m); _e_int_menus_clients_item_create(bd, m);
} }
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU && subm && mi) if ((e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
&& subm && mi)
e_menu_item_submenu_set(mi, subm); e_menu_item_submenu_set(mi, subm);
} }
@ -1025,7 +1037,8 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Evas_List *borders, E_Menu *
E_Border *bd; E_Border *bd;
bd = l->data; bd = l->data;
if ( bd->desk != desk && e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE) if (bd->desk != desk &&
e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE)
{ {
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU) if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
{ {
@ -1048,7 +1061,8 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Evas_List *borders, E_Menu *
else else
_e_int_menus_clients_item_create(bd, m); _e_int_menus_clients_item_create(bd, m);
} }
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU && subm && mi) if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU
&& subm && mi)
e_menu_item_submenu_set(mi, subm); e_menu_item_submenu_set(mi, subm);
} }
} }