X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/31d8eda9987703c64fc63f4ddb4088cf3be5b7cc..d99493cb685f80aa13b3135d461fcde554fe121f:/src/x11.c

diff --git a/src/x11.c b/src/x11.c
index 6954f06..0a34fee 100644
--- a/src/x11.c
+++ b/src/x11.c
@@ -26,7 +26,9 @@
 #include <X11/StringDefs.h>
 #include <X11/Xatom.h>
 #include <X11/Shell.h>
+
 #include "motif.h"
+#include "ewmhicon.h"
 
 /* Size of the traditional icon pixmap (multiple of 3) */
 #define ICON_SIZE 48
@@ -277,36 +279,16 @@ void x11_redraw_icon(struct app_state *state, Widget shell)
 {
 	Display *display = XtDisplay(shell);
 	Dimension tilesz = ICON_SIZE/3;
-	int i, j, tile;
-
-	XColor colours[(TILE_MAX-1)*COLOUR_MAX];
-	unsigned long *icons[ICON_MAX];
-	void *wm_icon = NULL;
-
-	if (state->use_ewmh_icons && (wm_icon = ewmh_icon_alloc(icons))) {
-		Colormap cmap = DefaultColormapOfScreen(XtScreen(shell));
-
-		for (i = 0; i < TILE_MAX-1; i++) {
-			for (j = 0; j < COLOUR_MAX; j++) {
-				XColor *c = &colours[i*COLOUR_MAX+j];
-				c->pixel = state->tile_colour[i][j];
-			}
-		}
-
-		XQueryColors(display, cmap, colours, i*j);
-	}
+	unsigned long ewmhseq[9];
+	unsigned i;
 
 	for (i = 0; i < 9; i++) {
+		int tile;
+
 		tile = redraw_goal_tile(state, display, state->icon_pixmap,
-		                        i%3, i/3, tilesz, tilesz);
+		                               i%3, i/3, tilesz, tilesz);
 
-		if (wm_icon) {
-			XColor *c = &colours[(tile-1)*COLOUR_MAX];
-			ewmh_tile16(icons[ICON_16x16], c, i%3, i/3);
-			ewmh_tile24(icons[ICON_24x24], c, i%3, i/3);
-			ewmh_tile32(icons[ICON_32x32], c, i%3, i/3);
-			ewmh_tile48(icons[ICON_48x48], c, i%3, i/3);
-		}
+		ewmhseq[i] = COLOUR_MAX*0x10101 * (tile-1) + 0x20100;
 	}
 
 	/*
@@ -316,13 +298,24 @@ void x11_redraw_icon(struct app_state *state, Widget shell)
 	XtVaSetValues(shell, XtNiconPixmap, None, (char *)NULL);
 	XtVaSetValues(shell, XtNiconPixmap, state->icon_pixmap, (char *)NULL);
 
-	if (wm_icon) {
+	if (state->use_ewmh_icons) {
 		Atom net_wm_icon = XInternAtom(display, "_NET_WM_ICON", FALSE);
+		Colormap cmap = DefaultColormapOfScreen(XtScreen(shell));
+		XColor colours[(TILE_MAX-1)*COLOUR_MAX];
+		void *wm_icon;
 
-		XChangeProperty(display, XtWindow(shell), net_wm_icon,
-		                XA_CARDINAL, 32, PropModeReplace,
-		                wm_icon, EWMH_ICON_NELEM);
+		for (i = 0; i < XtNumber(colours); i++) {
+			uint_least32_t *p = state->tile_colour[0];
+			colours[i].pixel = p[i];
+		}
 
+		XQueryColors(display, cmap, colours, XtNumber(colours));
+		wm_icon = ewmh_icon_generate(ewmhseq, colours);
+		if (wm_icon) {
+			XChangeProperty(display, XtWindow(shell), net_wm_icon,
+			                XA_CARDINAL, 32, PropModeReplace,
+			                wm_icon, EWMH_ICON_NELEM);
+		}
 		free(wm_icon);
 	}
 }