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

New netwm icon api. 

SVN revision: 16934
This commit is contained in:
sebastid 2005-09-25 16:43:34 +00:00 committed by sebastid
parent 0b96f239cc
commit bae370b31d
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/e_border.c
View File

@ -2097,12 +2097,13 @@ e_border_icon_add(E_Border *bd, Evas *evas)
edje_object_file_set(o, a->path, "icon"); edje_object_file_set(o, a->path, "icon");
} }
} }
else if (bd->client.netwm.icon.data) else if (bd->client.netwm.icons)
{ {
/* TODO: Use the right icon */
o = e_icon_add(evas); o = e_icon_add(evas);
e_icon_data_set(o, bd->client.netwm.icon.data, e_icon_data_set(o, bd->client.netwm.icons[0].data,
bd->client.netwm.icon.width, bd->client.netwm.icons[0].width,
bd->client.netwm.icon.height); bd->client.netwm.icons[0].height);
e_icon_alpha_set(o, 1); e_icon_alpha_set(o, 1);
} }
return o; return o;
@ -4200,10 +4201,9 @@ _e_border_eval(E_Border *bd)
} }
if (bd->client.netwm.fetch.icon) if (bd->client.netwm.fetch.icon)
{ {
if (bd->client.netwm.icon.data) free(bd->client.netwm.icon.data); E_FREE(bd->client.netwm.icons);
if (!ecore_x_netwm_icon_get(bd->client.win, if (!ecore_x_netwm_icons_get(bd->client.win,
&bd->client.netwm.icon.width, &bd->client.netwm.icon.height, &bd->client.netwm.icons, &bd->client.netwm.num_icons))
&bd->client.netwm.icon.data, &bd->client.netwm.icon.size))
printf("ERROR: Fetch icon from client\n"); printf("ERROR: Fetch icon from client\n");
else else
bd->changes.icon = 1; bd->changes.icon = 1;

8
src/bin/e_border.h
View File

@ -196,12 +196,8 @@ struct _E_Border
unsigned int desktop; unsigned int desktop;
char *name; char *name;
char *icon_name; char *icon_name;
struct { Ecore_X_Icon *icons;
unsigned int *data; int num_icons;
int width;
int height;
int size;
} icon;
unsigned int user_time; unsigned int user_time;
struct { struct {
int left; int left;