attempt to use the mask as well as the pixmap. Probably doesn't work so

2001-08-23  Havoc Pennington  <hp@pobox.com>

	* src/window.c (update_icon): attempt to use the mask as well as
	the pixmap. Probably doesn't work so well.

	* src/tabpopup.c: make this look a little nicer

4 files changed, 181 insertions, 79 deletions

diff --git a/ChangeLog b/ChangeLog
index 8fdc0abb..0b0df573 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-2001-08-22  Havoc Pennington  <hp@pobox.com>
+2001-08-23  Havoc Pennington  <hp@pobox.com>
+
+	* src/window.c (update_icon): attempt to use the mask as well as
+	the pixmap. Probably doesn't work so well.
 
 	* src/tabpopup.c: make this look a little nicer
 
diff --git a/src/tabpopup.c b/src/tabpopup.c
index e1754029..4e1291a5 100644
--- a/src/tabpopup.c
+++ b/src/tabpopup.c
@@ -399,9 +399,8 @@ meta_select_image_expose_event (GtkWidget      *widget,
 	    - (widget->requisition.height - misc->ypad * 2)) *
 	   misc->yalign) + 0.5;
 
-      x -= INSIDE_SELECT_RECT;
-      y -= INSIDE_SELECT_RECT;
-      
+      x -= INSIDE_SELECT_RECT + 1;
+      y -= INSIDE_SELECT_RECT + 1;      
       
       w = widget->requisition.width - OUTSIDE_SELECT_RECT * 2 - 1;
       h = widget->requisition.height - OUTSIDE_SELECT_RECT * 2 - 1;
@@ -430,8 +429,3 @@ meta_select_image_expose_event (GtkWidget      *widget,
 
   return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
 }
-
-
-
-
-
diff --git a/src/ui.c b/src/ui.c
index f11b198c..64f107dc 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -298,6 +298,35 @@ meta_image_window_set_position (MetaImageWindow *iw,
                           x, y, req.width, req.height);
 }
 
+static GdkColormap*
+get_cmap (GdkPixmap *pixmap)
+{
+  GdkColormap *cmap;
+
+  cmap = gdk_drawable_get_colormap (pixmap);
+  if (cmap)
+    g_object_ref (G_OBJECT (cmap));
+
+  if (cmap == NULL)
+    {
+      if (gdk_drawable_get_depth (pixmap) == 1)
+        {
+          /* hell if I know */
+          meta_verbose ("Making up some sort of colormap to get 1-bit pixmap\n");
+          cmap = gdk_colormap_get_system ();
+          g_object_ref (G_OBJECT (cmap));
+        }
+      else
+        {
+          meta_verbose ("Using system cmap to snapshot pixmap\n");
+          cmap = gdk_colormap_get_system ();
+          g_object_ref (G_OBJECT (cmap));
+        }
+    }
+
+  return cmap;
+}
+
 GdkPixbuf*
 meta_gdk_pixbuf_get_from_window (GdkPixbuf   *dest,
                                  Window       xwindow,
@@ -310,7 +339,8 @@ meta_gdk_pixbuf_get_from_window (GdkPixbuf   *dest,
 {
   GdkDrawable *drawable;
   GdkPixbuf *retval;
-
+  GdkColormap *cmap;
+  
   retval = NULL;
   
   drawable = gdk_xid_table_lookup (xwindow);
@@ -319,15 +349,17 @@ meta_gdk_pixbuf_get_from_window (GdkPixbuf   *dest,
     g_object_ref (G_OBJECT (drawable));
   else
     drawable = gdk_window_foreign_new (xwindow);
-      
+
+  cmap = get_cmap (drawable);
+  
   retval = gdk_pixbuf_get_from_drawable (dest,
                                          drawable,
-                                         /* We assume root window cmap */
-                                         gdk_colormap_get_system (),
+                                         cmap,
                                          src_x, src_y,
                                          dest_x, dest_y,
                                          width, height);
-  
+
+  g_object_unref (G_OBJECT (cmap));
   g_object_unref (G_OBJECT (drawable));
 
   return retval;
@@ -345,7 +377,8 @@ meta_gdk_pixbuf_get_from_pixmap (GdkPixbuf   *dest,
 {
   GdkDrawable *drawable;
   GdkPixbuf *retval;
-
+  GdkColormap *cmap;
+  
   retval = NULL;
   
   drawable = gdk_xid_table_lookup (xpixmap);
@@ -354,15 +387,17 @@ meta_gdk_pixbuf_get_from_pixmap (GdkPixbuf   *dest,
     g_object_ref (G_OBJECT (drawable));
   else
     drawable = gdk_pixmap_foreign_new (xpixmap);
-      
+
+  cmap = get_cmap (drawable);
+  
   retval = gdk_pixbuf_get_from_drawable (dest,
                                          drawable,
-                                         /* We assume root window cmap */
-                                         gdk_colormap_get_system (),
+                                         cmap,
                                          src_x, src_y,
                                          dest_x, dest_y,
                                          width, height);
-  
+
+  g_object_unref (G_OBJECT (cmap));
   g_object_unref (G_OBJECT (drawable));
 
   return retval;
diff --git a/src/window.c b/src/window.c
index d38ddec0..e1f54599 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2799,9 +2799,10 @@ update_wm_hints (MetaWindow *window)
           update_icon (window, FALSE);
         }
       
-      meta_verbose ("Read WM_HINTS input: %d iconic: %d group leader: 0x%lx icon: 0x%lx\n",
+      meta_verbose ("Read WM_HINTS input: %d iconic: %d group leader: 0x%lx icon: 0x%lx mask: 0x%lx\n",
                     window->input, window->initially_iconic,
-                    window->xgroup_leader, window->icon_pixmap);
+                    window->xgroup_leader, window->icon_pixmap,
+                    window->icon_mask);
       
       XFree (hints);
     }
@@ -3777,12 +3778,118 @@ get_pixmap_geometry (MetaDisplay *display,
     *d = depth;
 }
 
+static GdkPixbuf*
+apply_mask (GdkPixbuf *pixbuf,
+            GdkPixbuf *mask)
+{
+  int w, h;
+  int i, j;
+  GdkPixbuf *with_alpha;
+  guchar *src;
+  guchar *dest;
+  int src_stride;
+  int dest_stride;
+  
+  w = MIN (gdk_pixbuf_get_width (mask), gdk_pixbuf_get_width (pixbuf));
+  h = MIN (gdk_pixbuf_get_height (mask), gdk_pixbuf_get_height (pixbuf));
+
+  with_alpha = gdk_pixbuf_add_alpha (pixbuf, FALSE, 0, 0, 0);
+
+  dest = gdk_pixbuf_get_pixels (with_alpha);
+  src = gdk_pixbuf_get_pixels (mask);
+
+  dest_stride = gdk_pixbuf_get_rowstride (with_alpha);
+  src_stride = gdk_pixbuf_get_rowstride (mask);
+  
+  i = 0;
+  while (i < h)
+    {
+      j = 0;
+      while (j < w)
+        {
+          guchar *s = src + i * src_stride + j * 3;
+          guchar *d = dest + i * dest_stride + j * 4;
+
+          /* I have no idea if this is reliable. */
+          if ((s[0] + s[1] + s[2]) == 0)
+            d[3] = 0;   /* transparent */
+          else
+            d[3] = 255; /* opaque */
+          
+          ++j;
+        }
+      
+      ++i;
+    }
+
+  return with_alpha;
+}
+
+static gboolean
+try_pixmap_and_mask (MetaWindow *window,
+                     Pixmap      src_pixmap,
+                     Pixmap      src_mask)
+{
+  GdkPixbuf *unscaled = NULL;
+  GdkPixbuf *mask = NULL;
+  int w, h;
+
+  if (src_pixmap == None)
+    return FALSE;
+      
+  meta_error_trap_push (window->display);
+
+  get_pixmap_geometry (window->display, src_pixmap,
+                       &w, &h, NULL);
+      
+  unscaled = meta_gdk_pixbuf_get_from_pixmap (NULL,
+                                              src_pixmap,
+                                              0, 0, 0, 0,
+                                              w, h);
+
+  if (unscaled && src_mask != None)
+    {
+      get_pixmap_geometry (window->display, src_mask,
+                           &w, &h, NULL);
+      mask = meta_gdk_pixbuf_get_from_pixmap (NULL,
+                                              src_mask,
+                                              0, 0, 0, 0,
+                                              w, h);
+    }
+  
+  meta_error_trap_pop (window->display);
+
+
+  if (mask)
+    {
+      GdkPixbuf *masked;
+
+      meta_verbose ("Applying mask to icon pixmap\n");
+      
+      masked = apply_mask (unscaled, mask);
+      g_object_unref (G_OBJECT (unscaled));
+      unscaled = masked;
+
+      g_object_unref (G_OBJECT (mask));
+      mask = NULL;
+    }
+  
+  if (unscaled)
+    {
+      replace_icon (window, unscaled);
+      g_object_unref (G_OBJECT (unscaled));
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
 static int
 update_icon (MetaWindow *window,
              gboolean    reload_rgb_icon)
 {
 
-  if (reload_rgb_icon)
+  if (FALSE && reload_rgb_icon)
     {
       guchar *pixdata;     
       int w, h;
@@ -3830,68 +3937,31 @@ update_icon (MetaWindow *window,
   
   /* Fallback to pixmap + mask */
 
-  if (window->icon_pixmap != None)
+  if (try_pixmap_and_mask (window,
+                           window->icon_pixmap,
+                           window->icon_mask))
     {
-      GdkPixbuf *unscaled;
-      int w, h;
-      
-      meta_error_trap_push (window->display);
-
-      get_pixmap_geometry (window->display, window->icon_pixmap,
-                           &w, &h, NULL);
-
-      /* FIXME get mask and copy it to alpha channel of pixmap */
-      
-      unscaled = meta_gdk_pixbuf_get_from_pixmap (NULL,
-                                                  window->icon_pixmap,
-                                                  0, 0, 0, 0,
-                                                  w, h);
-      
-      meta_error_trap_pop (window->display);
-
-      if (unscaled)
-        {
-          meta_verbose ("Used pixmap icon\n");
-          replace_icon (window, unscaled);
-          return Success;
-        }
-      else
-        {
-          meta_verbose ("Failed to get pixmap icon as pixbuf\n");
-        }
+      meta_verbose ("Using WM_NORMAL_HINTS icon for %s\n", window->desc);
+      return Success;
     }
-
-  if (window->kwm_pixmap != None)
+  else
     {
-      GdkPixbuf *unscaled;
-      int w, h;
-      
-      meta_error_trap_push (window->display);
-
-      get_pixmap_geometry (window->display, window->kwm_pixmap,
-                           &w, &h, NULL);
-
-      /* FIXME get mask and copy it to alpha channel of pixmap */
-      
-      unscaled = meta_gdk_pixbuf_get_from_pixmap (NULL,
-                                                  window->kwm_pixmap,
-                                                  0, 0, 0, 0,
-                                                  w, h);
-      
-      meta_error_trap_pop (window->display);
-
-      if (unscaled)
-        {
-          meta_verbose ("Used kwm icon\n");
-          replace_icon (window, unscaled);
-          return Success;
-        }
-      else
-        {
-          meta_verbose ("Failed to get kwm icon as pixbuf\n");
-        }
+      meta_verbose ("No WM_NORMAL_HINTS icon, or failed to retrieve it\n");
     }
+  
 
+  if (try_pixmap_and_mask (window,
+                           window->kwm_pixmap,
+                           window->kwm_mask))
+    {
+      meta_verbose ("Using KWM_WIN_ICON for %s\n", window->desc);
+      return Success;
+    }
+  else
+    {
+      meta_verbose ("No KWM_WIN_ICON, or failed to retrieve it\n");
+    }
+  
   /* Fallback to a default icon */
   if (window->icon == NULL)
     window->icon = meta_ui_get_default_window_icon (window->screen->ui);