gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-28 17:32:29 +01:00
Code Issues Projects Releases Wiki Activity

New functions get_*_icon_from_x11

Browse Source 
A new functions get_pixmap_icon_from_x11 and get_rimage_icon_from_x11
are included in icon.h

1. get_pixmap_icon_from_x11, set the rimage at icon->file_image
   The code sets net_icon_image in icon->file_image
2. The get_rimage_icon_from_x11 function, 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:59 +01:00
committed by Carlos R. Mafra
parent ceedad4231
commit 3e83e9d5ae
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/icon.c
View File

@@ -67,6 +67,8 @@ 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);
static void get_rimage_icon_from_default_icon(WIcon *icon); static void get_rimage_icon_from_default_icon(WIcon *icon);
static void get_pixmap_icon_from_x11(WIcon *icon);
static void get_rimage_icon_from_x11(WIcon *icon);
static void icon_update_pixmap(WIcon *icon, RImage *image); static void icon_update_pixmap(WIcon *icon, RImage *image);
static void unset_icon_image(WIcon *icon); static void unset_icon_image(WIcon *icon);
@@ -611,7 +613,7 @@ void wIconUpdate(WIcon *icon)
get_pixmap_icon_from_icon_win(icon); get_pixmap_icon_from_icon_win(icon);
} else if (wwin && wwin->net_icon_image) { } else if (wwin && wwin->net_icon_image) {
/* Use _NET_WM_ICON icon */ /* Use _NET_WM_ICON icon */
icon_update_pixmap(icon, wwin->net_icon_image); get_pixmap_icon_from_x11(icon);
} else if (wwin && wwin->wm_hints && (wwin->wm_hints->flags & IconPixmapHint)) { } else if (wwin && wwin->wm_hints && (wwin->wm_hints->flags & IconPixmapHint)) {
/* Get the Pixmap from the wm_hints, else, from the user */ /* Get the Pixmap from the wm_hints, else, from the user */
if (get_pixmap_icon_from_wm_hints(icon)) if (get_pixmap_icon_from_wm_hints(icon))
@@ -630,6 +632,25 @@ void wIconUpdate(WIcon *icon)
wIconPaint(icon); wIconPaint(icon);
} }
static void get_pixmap_icon_from_x11(WIcon *icon)
{
/* Set the icon->file_image */
get_rimage_icon_from_x11(icon);
/* Update icon->pixmap */
icon_update_pixmap(icon, icon->file_image);
}
static void get_rimage_icon_from_x11(WIcon *icon)
{
/* Remove the icon image */
unset_icon_image(icon);
/* Set the new icon image */
icon->file = NULL;
icon->file_image = RRetainImage(icon->owner->net_icon_image);
}
static void get_rimage_icon_from_user_icon(WIcon *icon) static void get_rimage_icon_from_user_icon(WIcon *icon)
{ {
if (icon->file_image) if (icon->file_image)