gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-30 10:22:34 +01:00
Code Issues Projects Releases Wiki Activity

get_rimage_icon_from_wm_hints returns image

Browse Source 
The function get_rimage_icon_from_wm_hints now returns an image.
This commit is contained in:
Rodolfo García Peñas (kix)
2012-11-15 00:44:00 +01:00
committed by Carlos R. Mafra
parent 5bfac9036d
commit 3f2c87fb06
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/icon.c
View File

@@ -62,7 +62,6 @@ static WIcon *icon_create_core(WScreen *scr, int coord_x, int coord_y);
static void set_dockapp_in_icon(WIcon *icon); static void set_dockapp_in_icon(WIcon *icon);
static void get_rimage_icon_from_icon_win(WIcon *icon); static void get_rimage_icon_from_icon_win(WIcon *icon);
static int get_rimage_icon_from_wm_hints(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_rimage_icon_from_default_icon(WIcon *icon); static void get_rimage_icon_from_default_icon(WIcon *icon);
static void get_rimage_icon_from_x11(WIcon *icon); static void get_rimage_icon_from_x11(WIcon *icon);
@@ -617,7 +616,9 @@ void wIconUpdate(WIcon *icon, RImage *image)
get_rimage_icon_from_x11(icon); get_rimage_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_rimage_icon_from_wm_hints(icon)) unset_icon_image(icon);
icon->file_image = get_rimage_icon_from_wm_hints(icon);
if (!icon->file_image)
get_rimage_icon_from_user_icon(icon); get_rimage_icon_from_user_icon(icon);
} else { } else {
/* Get the Pixmap from the user */ /* Get the Pixmap from the user */
@@ -746,7 +747,7 @@ static void set_dockapp_in_icon(WIcon *icon)
} }
/* Get the RImage from the XWindow wm_hints */ /* Get the RImage from the XWindow wm_hints */
static int get_rimage_icon_from_wm_hints(WIcon *icon) RImage *get_rimage_icon_from_wm_hints(WIcon *icon)
{ {
RImage *image = NULL; RImage *image = NULL;
unsigned int w, h, d; unsigned int w, h, d;
@@ -754,20 +755,17 @@ static int get_rimage_icon_from_wm_hints(WIcon *icon)
if (!getSize(wwin->wm_hints->icon_pixmap, &w, &h, &d)) { if (!getSize(wwin->wm_hints->icon_pixmap, &w, &h, &d)) {
icon->owner->wm_hints->flags &= ~IconPixmapHint; icon->owner->wm_hints->flags &= ~IconPixmapHint;
return 1; return NULL;
} }
image = get_wwindow_image_from_wmhints(wwin, icon); image = get_wwindow_image_from_wmhints(wwin, icon);
if (!image) if (!image)
return 1; return NULL;
/* Resize the icon to the wPreferences.icon_size size */ /* Resize the icon to the wPreferences.icon_size size */
image = wIconValidateIconSize(image, wPreferences.icon_size); image = wIconValidateIconSize(image, wPreferences.icon_size);
unset_icon_image(icon); return image;
icon->file_image = image;
return 0;
} }
void wIconPaint(WIcon *icon) void wIconPaint(WIcon *icon)

1
src/icon.h
View File

@@ -66,6 +66,7 @@ void update_icon_pixmap(WIcon *icon);
Bool wIconChangeImageFile(WIcon *icon, char *file); Bool wIconChangeImageFile(WIcon *icon, char *file);
RImage *wIconValidateIconSize(RImage *icon, int max_size); RImage *wIconValidateIconSize(RImage *icon, int max_size);
RImage *get_rimage_icon_from_wm_hints(WIcon *icon);
char *wIconStore(WIcon *icon); char *wIconStore(WIcon *icon);
char *get_name_for_instance_class(char *wm_instance, char *wm_class); char *get_name_for_instance_class(char *wm_instance, char *wm_class);