- if (!data) return;
-
- int w, h;
- long *tmp_data;
- tmp_data = get_best_icon (data, get_icon_count (data, num), num, &w, &h, g_task.icon_size1);
-
- tsk->icon_width = w;
- tsk->icon_height = h;
- tsk->icon_data = malloc (w * h * sizeof (long));
- memcpy (tsk->icon_data, tmp_data, w * h * sizeof (long));
-
- XFree (data);
+ if (data) {
+ // get ARGB icon
+ int w, h;
+ long *tmp_data;
+ tmp_data = get_best_icon (data, get_icon_count (data, num), num, &w, &h, panel->g_task.icon_size1);
+
+ tsk->icon_width = w;
+ tsk->icon_height = h;
+ tsk->icon_data = malloc (w * h * sizeof (long));
+ memcpy (tsk->icon_data, tmp_data, w * h * sizeof (long));
+
+ XFree (data);
+ }
+ else {
+ // get Pixmap icon
+ XWMHints *hints = XGetWMHints(server.dsp, tsk->win);
+ if (hints) {
+ if (hints->flags & IconPixmapHint && hints->icon_pixmap != 0) {
+ // get width, height and depth for the pixmap
+ Window root;
+ int icon_x, icon_y;
+ uint border_width, bpp;
+ uint icon_width, icon_height;
+
+ XGetGeometry(server.dsp, hints->icon_pixmap, &root, &icon_x, &icon_y, &icon_width, &icon_height, &border_width, &bpp);
+
+ //printf(" get_pixmap\n");
+ Imlib_Image img;
+ imlib_context_set_drawable(hints->icon_pixmap);
+ img = imlib_create_image_from_drawable(hints->icon_mask, 0, 0, icon_width, icon_height, 0);
+ imlib_context_set_image(img);
+ unsigned int *data = imlib_image_get_data();
+ if (!data) {
+ return;
+ }
+ tsk->icon_width = imlib_image_get_width();
+ tsk->icon_height = imlib_image_get_height();
+ tsk->icon_data = malloc (tsk->icon_width * tsk->icon_height * sizeof (long));
+ memcpy (tsk->icon_data, data, tsk->icon_width * tsk->icon_height * sizeof (long));
+ imlib_free_image();
+ }
+ XFree(hints);
+ }
+ }