wIconUpdate image preselected
authorRodolfo García Peñas (kix) <kix@kix.es>
Wed, 14 Nov 2012 18:53:04 +0000 (14 19:53 +0100)
committerCarlos R. Mafra <crmafra@gmail.com>
Sat, 17 Nov 2012 19:38:36 +0000 (17 20:38 +0100)
The function wIconUpdate can receive a image to setup as icon image.
If image is NULL, then use the original method, using different procedures
to get the image.

src/appicon.c
src/client.c
src/dock.c
src/icon.c
src/icon.h
src/wmspec.c

index 7b59792..902559c 100644 (file)
@@ -151,7 +151,7 @@ void makeAppIconFor(WApplication *wapp)
 
        /* Create the icon */
        wapp->app_icon = wAppIconCreate(wapp->main_window_desc);
-       wIconUpdate(wapp->app_icon->icon);
+       wIconUpdate(wapp->app_icon->icon, NULL);
 
        /* Now, paint the icon */
        if (!WFLAGP(wapp->main_window_desc, no_appicon))
@@ -256,7 +256,7 @@ void removeAppIconFor(WApplication *wapp)
                wapp->app_icon->icon->icon_win = None;
 
                /* Update the icon images */
-               wIconUpdate(wapp->app_icon->icon);
+               wIconUpdate(wapp->app_icon->icon, NULL);
 
                /* Paint it */
                wAppIconPaint(wapp->app_icon);
@@ -991,7 +991,7 @@ void create_appicon_from_dock(WWindow *wwin, WApplication *wapp, Window main_win
                        wapp->app_icon->icon->icon_win = mainw->wm_hints->icon_window;
 
                /* Update the icon images */
-               wIconUpdate(wapp->app_icon->icon);
+               wIconUpdate(wapp->app_icon->icon, NULL);
 
                /* Paint it */
                wAppIconPaint(wapp->app_icon);
index 89f6277..975adb1 100644 (file)
@@ -482,11 +482,11 @@ void wClientCheckProperty(WWindow * wwin, XPropertyEvent * event)
                                WApplication *wapp;
 
                                if (wwin->flags.miniaturized && wwin->icon) {
-                                       wIconUpdate(wwin->icon);
+                                       wIconUpdate(wwin->icon, NULL);
                                }
                                wapp = wApplicationOf(wwin->main_window);
                                if (wapp && wapp->app_icon) {
-                                       wIconUpdate(wapp->app_icon->icon);
+                                       wIconUpdate(wapp->app_icon->icon, NULL);
                                        wAppIconPaint(wapp->app_icon);
                                }
                        }
index d7d5c53..6e2e0e3 100644 (file)
@@ -541,7 +541,7 @@ static void keepIconsCallback(WMenu *menu, WMenuEntry *entry)
                                aicon->icon->shadowed = 0;
 
                                /* Update the icon images */
-                               wIconUpdate(aicon->icon);
+                               wIconUpdate(aicon->icon, NULL);
 
                                /* Paint it */
                                wAppIconPaint(aicon);
@@ -1938,7 +1938,7 @@ Bool wDockAttachIcon(WDock *dock, WAppIcon *icon, int x, int y, Bool update_icon
 
        /* Update the icon images */
        if (lupdate_icon)
-               wIconUpdate(icon->icon);
+               wIconUpdate(icon->icon, NULL);
 
        /* Paint it */
        wAppIconPaint(icon);
@@ -2089,7 +2089,7 @@ static Bool moveIconBetweenDocks(WDock *src, WDock *dest, WAppIcon *icon, int x,
 
        /* Update the icon images */
        if (update_icon)
-               wIconUpdate(icon->icon);
+               wIconUpdate(icon->icon, NULL);
 
        /* Paint it */
        wAppIconPaint(icon);
@@ -2166,7 +2166,7 @@ void wDockDetach(WDock *dock, WAppIcon *icon)
 
                /* Update the icon images */
                if (update_icon)
-                       wIconUpdate(icon->icon);
+                       wIconUpdate(icon->icon, NULL);
 
                /* Paint it */
                wAppIconPaint(icon);
index 843cb73..e336793 100644 (file)
@@ -94,7 +94,7 @@ static void tileObserver(void *self, WMNotification *notif)
 {
        WIcon *icon = (WIcon *) self;
 
-       wIconUpdate(icon);
+       wIconUpdate(icon, NULL);
 
        XClearArea(dpy, icon->core->window, 0, 0, 1, 1, True);
 }
@@ -152,7 +152,7 @@ WIcon *icon_create_for_wwindow(WWindow *wwin)
 
        icon->tile_type = TILE_NORMAL;
 
-       wIconUpdate(icon);
+       wIconUpdate(icon, NULL);
 
        WMAddNotificationObserver(appearanceObserver, icon, WNIconAppearanceSettingsChanged, icon);
        WMAddNotificationObserver(tileObserver, icon, WNIconTileSettingsChanged, icon);
@@ -177,7 +177,7 @@ WIcon *icon_create_for_dock(WScreen *scr, char *command, char *wm_instance, char
 
        icon->tile_type = tile;
 
-       wIconUpdate(icon);
+       wIconUpdate(icon, NULL);
 
        WMAddNotificationObserver(appearanceObserver, icon, WNIconAppearanceSettingsChanged, icon);
        WMAddNotificationObserver(tileObserver, icon, WNIconTileSettingsChanged, icon);
@@ -346,7 +346,7 @@ void wIconChangeTitle(WIcon *icon, char *new_title)
        icon->icon_name = new_title;
 
        if (changed)
-               wIconUpdate(icon);
+               wIconUpdate(icon, NULL);
        else
                wIconPaint(icon);
 }
@@ -400,7 +400,7 @@ Bool wIconChangeImageFile(WIcon *icon, char *file)
                /* Set the new image */
                icon->file_image = image;
                icon->file = wstrdup(path);
-               wIconUpdate(icon);
+               wIconUpdate(icon, NULL);
        } else {
                error = 1;
        }
@@ -597,26 +597,30 @@ static void unset_icon_image(WIcon *icon)
        }
 }
 
-void wIconUpdate(WIcon *icon)
+void wIconUpdate(WIcon *icon, RImage *image)
 {
        WWindow *wwin = icon->owner;
 
-       if (wwin && WFLAGP(wwin, always_user_icon)) {
-               /* Forced use user_icon */
-               get_rimage_icon_from_user_icon(icon);
-       } else if (icon->icon_win != None) {
-               /* Get the Pixmap from the WIcon */
-               get_rimage_icon_from_icon_win(icon);
-       } else if (wwin && wwin->net_icon_image) {
-               /* Use _NET_WM_ICON icon */
-               get_rimage_icon_from_x11(icon);
-       } else if (wwin && wwin->wm_hints && (wwin->wm_hints->flags & IconPixmapHint)) {
-               /* Get the Pixmap from the wm_hints, else, from the user */
-               if (get_rimage_icon_from_wm_hints(icon))
-                       get_rimage_icon_from_user_icon(icon);
+       if (image) {
+               icon->file_image = image;
        } else {
-               /* Get the Pixmap from the user */
-               get_rimage_icon_from_user_icon(icon);
+               if (wwin && WFLAGP(wwin, always_user_icon)) {
+                       /* Forced use user_icon */
+                       get_rimage_icon_from_user_icon(icon);
+               } else if (icon->icon_win != None) {
+                       /* Get the Pixmap from the WIcon */
+                       get_rimage_icon_from_icon_win(icon);
+               } else if (wwin && wwin->net_icon_image) {
+                       /* Use _NET_WM_ICON icon */
+                       get_rimage_icon_from_x11(icon);
+               } else if (wwin && wwin->wm_hints && (wwin->wm_hints->flags & IconPixmapHint)) {
+                       /* Get the Pixmap from the wm_hints, else, from the user */
+                       if (get_rimage_icon_from_wm_hints(icon))
+                               get_rimage_icon_from_user_icon(icon);
+               } else {
+                       /* Get the Pixmap from the user */
+                       get_rimage_icon_from_user_icon(icon);
+               }
        }
 
        update_icon_pixmap(icon);
index 5c83733..74e6211 100644 (file)
@@ -58,7 +58,7 @@ WIcon *icon_create_for_wwindow(WWindow *wwin);
 
 void wIconDestroy(WIcon *icon);
 void wIconPaint(WIcon *icon);
-void wIconUpdate(WIcon *icon);
+void wIconUpdate(WIcon *icon, RImage *image);
 void wIconSelect(WIcon *icon);
 void wIconChangeTitle(WIcon *icon, char *new_title);
 void update_icon_pixmap(WIcon *icon);
index b3dfb8b..c758f0a 100644 (file)
@@ -468,12 +468,12 @@ static void updateIconImage(WWindow *wwin)
 
        /* Refresh the Window Icon */
        if (wwin->icon)
-               wIconUpdate(wwin->icon);
+               wIconUpdate(wwin->icon, NULL);
 
        /* Refresh the application icon */
        WApplication *app = wApplicationOf(wwin->main_window);
        if (app && app->app_icon) {
-               wIconUpdate(app->app_icon->icon);
+               wIconUpdate(app->app_icon->icon, NULL);
                wAppIconPaint(app->app_icon);
        }
 }