--- fbpanel-4.3/plugins/pager.c 2005-05-31 08:42:43.000000000 -0400 +++ fbpanel-4.3-dirty/plugins/pager.c 2006-04-10 22:09:07.000000000 -0400 @@ -29,6 +29,7 @@ #include #include +#include #include "panel.h" #include "misc.h" @@ -37,6 +38,7 @@ //#define DEBUG #include "dbg.h" +#include "icon.xpm" extern panel *p; @@ -53,6 +55,7 @@ net_wm_state nws; net_wm_window_type nwwt; guint focused:1; + GdkPixbuf *pixbuf; } task; typedef struct _desk desk; @@ -79,6 +82,7 @@ int winnum, dirty; GHashTable* htable; task *focusedtask; + GdkPixbuf *gen_pixbuf; }; @@ -126,6 +130,9 @@ static gboolean task_remove_all(Window *win, task *t, pager *p) { + if ( t->pixbuf != NULL ) + gdk_pixbuf_unref(t->pixbuf); + g_free(t); return TRUE; } @@ -194,7 +201,50 @@ widget->style->fg_gc[GTK_STATE_NORMAL], FALSE, x, y, w, h); - RET(); + +if ( w>=10 && h>=10) { + + GdkPixbuf* source_buf = t->pixbuf; + if ( source_buf == NULL ) + source_buf = d->pg->gen_pixbuf; + + // determine how much to scale + GdkPixbuf* scaled = source_buf; + int scale = 16; + int noscale = 1; + int smallest = ( (wpix, + NULL, + scaled, + 0,0, + pixx,pixy, + -1,-1, + GDK_RGB_DITHER_NONE, + 0,0); + + // free it if its been scaled and its not the default + if ( !noscale && t->pixbuf != NULL ) + gdk_pixbuf_unref(scaled); + } + + + RET(); } @@ -415,6 +465,189 @@ /***************************************************************** + * Stuff to grab icons from windows - ripped from taskbar.c * + *****************************************************************/ + +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) + { + /* try null cmap */ + cmap = NULL; + } + else + { + /* Try system cmap */ + GdkScreen *screen = gdk_drawable_get_screen (GDK_DRAWABLE (pixmap)); + cmap = gdk_screen_get_system_colormap (screen); + g_object_ref (G_OBJECT (cmap)); + } + } + + /* Be sure we aren't going to blow up due to visual mismatch */ + if (cmap && + (gdk_colormap_get_visual (cmap)->depth != + gdk_drawable_get_depth (pixmap))) + cmap = NULL; + + return cmap; +} + +static GdkPixbuf* +_wnck_gdk_pixbuf_get_from_pixmap (GdkPixbuf *dest, + Pixmap xpixmap, + int src_x, + int src_y, + int dest_x, + int dest_y, + int width, + int height) +{ + GdkDrawable *drawable; + GdkPixbuf *retval; + GdkColormap *cmap; + + retval = NULL; + + drawable = gdk_xid_table_lookup (xpixmap); + + if (drawable) + g_object_ref (G_OBJECT (drawable)); + else + drawable = gdk_pixmap_foreign_new (xpixmap); + + cmap = get_cmap (drawable); + + /* GDK is supposed to do this but doesn't in GTK 2.0.2, + * fixed in 2.0.3 + */ + if (width < 0) + gdk_drawable_get_size (drawable, &width, NULL); + if (height < 0) + gdk_drawable_get_size (drawable, NULL, &height); + + retval = gdk_pixbuf_get_from_drawable (dest, + drawable, + cmap, + src_x, src_y, + dest_x, dest_y, + width, height); + + if (cmap) + g_object_unref (G_OBJECT (cmap)); + g_object_unref (G_OBJECT (drawable)); + + return retval; +} + +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; + + /* s[0] == s[1] == s[2], they are 255 if the bit was set, 0 + * otherwise + */ + if (s[0] == 0) + d[3] = 0; /* transparent */ + else + d[3] = 255; /* opaque */ + + ++j; + } + + ++i; + } + + return with_alpha; +} + +static GdkPixbuf * +get_wm_icon(Window tkwin, int iw, int ih) +{ + XWMHints *hints; + Pixmap xpixmap = None, xmask = None; + Window win; + unsigned int w, h, d; + GdkPixbuf *ret, *masked, *pixmap, *mask = NULL; + + ENTER; + hints = (XWMHints *) get_xaproperty (tkwin, XA_WM_HINTS, XA_WM_HINTS, 0); + if (!hints) + RET(NULL); + + if ((hints->flags & IconPixmapHint)) + xpixmap = hints->icon_pixmap; + if ((hints->flags & IconMaskHint)) + xmask = hints->icon_mask; + + XFree (hints); + if (xpixmap == None) + RET(NULL); + + XGetGeometry (GDK_DISPLAY(), xpixmap, &win, &d, &d, &w, &h, &d, &d); + DBG("tkwin=%x icon pixmap w=%d h=%d\n", tkwin, w, h); + pixmap = _wnck_gdk_pixbuf_get_from_pixmap (NULL, xpixmap, 0, 0, 0, 0, w, h); + + if (!pixmap) + RET(NULL); + if (xmask != None) { + XGetGeometry (GDK_DISPLAY(), xmask, &win, &d, &d, &w, &h, &d, &d); + mask = _wnck_gdk_pixbuf_get_from_pixmap (NULL, xmask, 0, 0, 0, 0, w, h); + + if (mask) { + masked = apply_mask (pixmap, mask); + g_object_unref (G_OBJECT (pixmap)); + g_object_unref (G_OBJECT (mask)); + pixmap = masked; + } + } + if (!pixmap) + RET(NULL); + ret = gdk_pixbuf_scale_simple (pixmap, iw, ih, GDK_INTERP_TILES); + g_object_unref(pixmap); + + RET(ret); +} + + +/***************************************************************** * Netwm/WM Interclient Communication * *****************************************************************/ @@ -492,6 +725,7 @@ task_get_sizepos(t); if (!FBPANEL_WIN(t->win)) XSelectInput (GDK_DISPLAY(), t->win, PropertyChangeMask | StructureNotifyMask); + t->pixbuf = get_wm_icon(t->win, 16, 16); g_hash_table_insert(p->htable, &t->win, t); DBG("add %x\n", t->win); desk_set_dirty_by_win(p, t); @@ -646,6 +880,7 @@ pg->scaley = (gfloat)pg->dh / (gfloat)gdk_screen_height(); pg->scalex = (gfloat)pg->dw / (gfloat)gdk_screen_width(); + pg->gen_pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)icon_xpm); pager_rebuild_all(fbev, pg); //do_net_current_desktop(fbev, pg);