From 906816fc18d5f029208cab5887d7e1433bbb1de5 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Fri, 11 Jul 2008 19:26:46 +0000
Subject: [PATCH] Provide iconbox icon fallback if normal methods fail.

SVN revision: 35067
---
 src/icons.c | 98 +++++++++++++++++++++++++++++++++++++----------------
 src/icons.h | 12 +++----
 2 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/src/icons.c b/src/icons.c
index dd55dc85..ef31f708 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -24,6 +24,7 @@
 #include "E.h"
 #include "eimage.h"
 #include "ewins.h"
+#include "iclass.h"
 #include "icons.h"
 #include "windowmatch.h"
 #include "xwin.h"
@@ -66,30 +67,12 @@ NetwmIconFindBestSize(unsigned int *val, unsigned int len, int size)
    return k;
 }
 
-static EImage      *
-IB_SnapEWin(EWin * ewin, int size)
+static void
+IB_IconGetSize(int ww, int hh, int size, int scale, int *pw, int *ph)
 {
-   /* Make snapshot of window */
-   int                 w, h, ww, hh, scale;
-   EImage             *im;
-   Drawable            draw;
-
-   if (!EoIsShown(ewin))
-      return NULL;
-
-   ww = EoGetW(ewin);
-   hh = EoGetH(ewin);
-   if (ww <= 0 || hh <= 0)
-      return NULL;
-
-   if (ewin->state.shaded)
-      EwinInstantUnShade(ewin);
-   EwinRaise(ewin);
+   int                 w, h;
 
    w = h = size;
-
-   /* Oversample for nicer snapshots */
-   scale = 4;
    w *= scale;
    h *= scale;
 
@@ -107,6 +90,33 @@ IB_SnapEWin(EWin * ewin, int size)
 	h = hh;
      }
 
+   *pw = w;
+   *ph = h;
+}
+
+static EImage      *
+IB_SnapEWin(EWin * ewin, int size)
+{
+   /* Make snapshot of window */
+   int                 w, h, ww, hh;
+   EImage             *im;
+   Drawable            draw;
+
+   if (!EoIsShown(ewin))
+      return NULL;
+
+   ww = EoGetW(ewin);
+   hh = EoGetH(ewin);
+   if (ww <= 0 || hh <= 0)
+      return NULL;
+
+   if (ewin->state.shaded)
+      EwinInstantUnShade(ewin);
+   EwinRaise(ewin);
+
+   /* Oversample for nicer snapshots */
+   IB_IconGetSize(ww, hh, size, 4, &w, &h);
+
    draw = EoGetPixmap(ewin);
    if (draw != None)
      {
@@ -185,14 +195,42 @@ IB_GetEIcon(EWin * ewin)
    return im;
 }
 
+static EImage      *
+IB_GetFallbackIcon(EWin * ewin, int size)
+{
+   int                 w, h, ww, hh;
+   ImageClass         *ic;
+   EImage             *im;
+
+   ww = EoGetW(ewin);
+   hh = EoGetH(ewin);
+   if (ww <= 0)
+      ww = 1;
+   if (hh <= 0)
+      hh = 1;
+
+   IB_IconGetSize(ww, hh, size, 1, &w, &h);
+
+   ic = ImageclassFind("ICONBOX_HORIZONTAL", 1);
+   im = ImageclassGetImageBlended(ic, EoGetWin(ewin), w, h, 0, 0,
+				  STATE_NORMAL, ST_SOLID);
+
+   return im;
+}
+
 #define N_MODES 5
-#define N_TYPES 3
+#define N_TYPES 4
 static const char   ewin_icon_modes[N_MODES][N_TYPES] = {
-   {EWIN_ICON_TYPE_SNAP, EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_IMG},
-   {EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_SNAP},
-   {EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_SNAP, EWIN_ICON_TYPE_APP},
-   {EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_NONE},
-   {EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_NONE},
+   {EWIN_ICON_TYPE_SNAP, EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_IMG,
+    EWIN_ICON_TYPE_FB},
+   {EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_SNAP,
+    EWIN_ICON_TYPE_FB},
+   {EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_SNAP, EWIN_ICON_TYPE_APP,
+    EWIN_ICON_TYPE_FB},
+   {EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_NONE,
+    EWIN_ICON_TYPE_NONE},
+   {EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_NONE,
+    EWIN_ICON_TYPE_NONE},
 };
 
 EImage             *
@@ -207,8 +245,6 @@ EwinIconImageGet(EWin * ewin, int size, int mode)
    for (i = 0; i < N_TYPES; i++)
      {
 	type = ewin_icon_modes[mode][i];
-	if (type >= N_TYPES)
-	   continue;
 
 	switch (type)
 	  {
@@ -226,6 +262,10 @@ EwinIconImageGet(EWin * ewin, int size, int mode)
 	  case EWIN_ICON_TYPE_IMG:
 	     im = IB_GetEIcon(ewin);
 	     break;
+
+	  case EWIN_ICON_TYPE_FB:
+	     im = IB_GetFallbackIcon(ewin, size);
+	     break;
 	  }
 	if (im)
 	   goto done;
diff --git a/src/icons.h b/src/icons.h
index ea381e9c..8c46121c 100644
--- a/src/icons.h
+++ b/src/icons.h
@@ -25,13 +25,13 @@
 #define _ICONS_H_
 
 #include "eimage.h"
+#include "ewins.h"
 
-typedef enum {
-   EWIN_ICON_TYPE_APP,
-   EWIN_ICON_TYPE_IMG,
-   EWIN_ICON_TYPE_SNAP,
-   EWIN_ICON_TYPE_NONE,
-} ewin_icon_e;
+#define EWIN_ICON_TYPE_NONE     0
+#define EWIN_ICON_TYPE_APP      1
+#define EWIN_ICON_TYPE_IMG      2
+#define EWIN_ICON_TYPE_SNAP     3
+#define EWIN_ICON_TYPE_FB       4
 
 EImage             *EwinIconImageGet(EWin * ewin, int size, int mode);