gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

Split get_pixmap_icon_from_wm_hints() into two

Browse Source 
The function get_pixmap_icon_from_wm_hints() is splitted in two
functions now:

1. get_rimage_icon_from_wm_hints, set the rimage at icon->image
   The code comes from the function get_pixmap_icon_from_default_icon()
2. The get_pixmap_icon_from_wm_hints() function, but now only converts
   the icon->file_image in icon->pixmap
This commit is contained in:
Rodolfo García Peñas (kix)
2012-11-03 19:53:58 +01:00
committed by Carlos R. Mafra
parent c79eaa59b2
commit ceedad4231
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/icon.c
View File

@@ -62,6 +62,7 @@ static WIcon *icon_create_core(WScreen *scr, int coord_x, int coord_y);
static void get_pixmap_icon_from_icon_win(WIcon *icon); static void get_pixmap_icon_from_icon_win(WIcon *icon);
static int get_pixmap_icon_from_wm_hints(WIcon *icon); static int get_pixmap_icon_from_wm_hints(WIcon *icon);
static int get_rimage_icon_from_wm_hints(WIcon *icon);
static void get_pixmap_icon_from_user_icon(WIcon *icon); static void get_pixmap_icon_from_user_icon(WIcon *icon);
static void get_rimage_icon_from_user_icon(WIcon *icon); static void get_rimage_icon_from_user_icon(WIcon *icon);
static void get_pixmap_icon_from_default_icon(WIcon *icon); static void get_pixmap_icon_from_default_icon(WIcon *icon);
@@ -749,8 +750,8 @@ static void get_pixmap_icon_from_icon_win(WIcon * icon)
None, wCursor[WCUR_ARROW]); None, wCursor[WCUR_ARROW]);
} }
/* Get the Pixmap from the XWindow wm_hints */ /* Get the RImage from the XWindow wm_hints */
static int get_pixmap_icon_from_wm_hints(WIcon *icon) static int get_rimage_icon_from_wm_hints(WIcon *icon)
{ {
RImage *image = NULL; RImage *image = NULL;
unsigned int w, h, d; unsigned int w, h, d;
@@ -765,9 +766,23 @@ static int get_pixmap_icon_from_wm_hints(WIcon *icon)
if (!image) if (!image)
return 1; return 1;
icon_update_pixmap(icon, image); /* FIXME: If unset_icon_image, pointer double free then crash
unset_icon_image(icon); */
icon->file_image = image;
return 0; return 0;
}
/* Get the Pixmap from the XWindow wm_hints */
static int get_pixmap_icon_from_wm_hints(WIcon *icon)
{
int ret;
ret = get_rimage_icon_from_wm_hints(icon);
if (ret == 0)
icon_update_pixmap(icon, icon->file_image);
return ret;
} }
void wIconPaint(WIcon * icon) void wIconPaint(WIcon * icon)