X-Git-Url: https://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/372c088b3d4a74b3f2b9881c9a1eb36028bf44e9..f0704cba12e437bbe72744281af71ec19951db46:/src/ewmhicon.c

diff --git a/src/ewmhicon.c b/src/ewmhicon.c
index 6bdf8e9..e0ab8a5 100644
--- a/src/ewmhicon.c
+++ b/src/ewmhicon.c
@@ -25,130 +25,95 @@
 #  include <X11/Intrinsic.h>
 #  include <X11/Xatom.h>
 #endif
+
 #include "ewmhicon.h"
 #include "colour.h"
+#include "icon.h"
 
-static unsigned long scale16to8(unsigned x)
-{
-	return x*0xfful / 0xffff;
-}
-
-static unsigned long wm_pixel(const XColor *c)
-{
-	return 0xff000000
-	     | scale16to8(c->red) << 16
-	     | scale16to8(c->green) << 8
-	     | scale16to8(c->blue);
-}
-
-static void format_row(unsigned long *row, const XColor *c,
-                       unsigned s, unsigned y, unsigned w, unsigned h)
-{
-	unsigned x;
-
-	for (x = 0; x < w; x++) {
-		row[x] = wm_pixel(&c[COLOUR_PRIMARY]);
-		if (x < s || y < s)
-			row[x] = wm_pixel(&c[COLOUR_LIGHT]);
-		if ((x+s >= w && x+y >= w) || (y+s >= h && x+y >= h))
-			row[x] = wm_pixel(&c[COLOUR_DARK]);
-	}
-}
+enum { ICON_16x16, ICON_24x24, ICON_32x32, ICON_48x48, ICON_MAX };
 
 /*
- * The 16x16 icon is drawn with 1px shadow, 6x6 tiles, with 1 pixel cropped off
- * all the edge tiles
+ * Allocate storage for the EWMH _NET_WM_ICON array.  The sizes array is
+ * populated with pointers to the beginning of each icon's pixel data.  For
+ * example, sizes[ICON_24x24] points to the first pixel of the 24x24 image.
+ *
+ * The returned value can then be passed to XChangeProperty to set the icon,
+ * (use EWMH_ICON_NELEM for the number of elements) and must be freed by the
+ * caller.
  */
-void ewmh_tile16(unsigned long *icon, const XColor *c, int tile_x, int tile_y)
+static void *ewmh_icon_alloc(unsigned long **sizes)
 {
-	int out_x, out_y, out_w, y;
-	unsigned long row[6];
-
-	out_x = tile_x * 11 / 2;
-	out_y = tile_y * 11 / 2;
-	out_w = (5 + (tile_x == 1)) * sizeof row[0];
+	unsigned long *buf;
 
-	for (y = 0+(tile_y == 0); y < 6-(tile_y == 2); y++) {
-		format_row(row, c, 1, y, 6, 6);
-		memcpy(&icon[16 * out_y++ + out_x], &row[tile_x == 0], out_w);
-	}
-}
+	buf = calloc(sizeof *buf, EWMH_ICON_NELEM);
+	if (buf) {
+		sizes[ICON_16x16] = buf;
+		*sizes[ICON_16x16]++ = 16;
+		*sizes[ICON_16x16]++ = 16;
 
-/*
- * The 24x24 icon is drawn with 1px shadow and 8x8 tiles.
- */
-void ewmh_tile24(unsigned long *icon, const XColor *c, int tile_x, int tile_y)
-{
-	int out_x, out_y, y;
-	unsigned long row[8];
+		sizes[ICON_24x24] = sizes[ICON_16x16] + 16*16;
+		*sizes[ICON_24x24]++ = 24;
+		*sizes[ICON_24x24]++ = 24;
 
-	out_x = tile_x * 8;
-	out_y = tile_y * 8;
+		sizes[ICON_32x32] = sizes[ICON_24x24] + 24*24;
+		*sizes[ICON_32x32]++ = 32;
+		*sizes[ICON_32x32]++ = 32;
 
-	for (y = 0; y < 8; y++) {
-		format_row(row, c, 1, y, 8, 8);
-		memcpy(&icon[24 * out_y++ + out_x], row, sizeof row);
+		sizes[ICON_48x48] = sizes[ICON_32x32] + 32*32;
+		*sizes[ICON_48x48]++ = 48;
+		*sizes[ICON_48x48]++ = 48;
 	}
+
+	return buf;
 }
 
-/*
- * The 32x32 icon is drawn with 1px shadow with slightly uneven tiles on
- * an 11-10-11 pixel grid.
- */
-void ewmh_tile32(unsigned long *icon, const XColor *c, int tile_x, int tile_y)
+static unsigned long scale16to8(unsigned x)
 {
-	int out_x, out_y, out_w, out_h, y;
-	unsigned long row[11];
-
-	out_x = 10*tile_x + (tile_x > 0);
-	out_y = 10*tile_y + (tile_y > 0);
-	out_w = 10 + (tile_x != 1);
-	out_h = 10 + (tile_y != 1);
-
-	for (y = 0; y < out_h; y++) {
-		format_row(row, c, 1, y, out_w, out_h);
-		memcpy(&icon[32 * out_y++ + out_x], row, out_w * sizeof row[0]);
-	}
+	return x*0xfful / 0xffff;
 }
 
-/*
- * The 48x48 icon is drawn with 2px shadow and 16x16 tiles.
- */
-void ewmh_tile48(unsigned long *icon, const XColor *c, int tile_x, int tile_y)
+static unsigned long wm_pixel(const XColor *c)
 {
-	int out_x, out_y, y;
-	unsigned long row[16];
+	return 0xff000000
+	     | scale16to8(c->red) << 16
+	     | scale16to8(c->green) << 8
+	     | scale16to8(c->blue);
+}
 
-	out_x = tile_x * 16;
-	out_y = tile_y * 16;
+static void do_remap(void *icon, unsigned size, const XColor *map)
+{
+	unsigned char *index = icon;
+	unsigned long *argb = icon;
+	unsigned i, count = size*size;
 
-	for (y = 0; y < 16; y++) {
-		format_row(row, c, 2, y, 16, 16);
-		memcpy(&icon[48 * out_y++ + out_x], row, sizeof row);
+	for (i = 0; i < count; i++) {
+		argb[count-i-1] = wm_pixel(map + index[count-i-1]);
 	}
 }
 
-void *ewmh_icon_alloc(unsigned long **sizes)
+void *ewmh_icon_generate(const unsigned long *seq, const XColor *map)
 {
-	unsigned long *buf;
+	unsigned long *buf, *sizes[ICON_MAX];
+	unsigned i, j;
 
-	buf = calloc(sizeof *buf, EWMH_ICON_NELEM);
-	if (buf) {
-		sizes[ICON_16x16] = buf;
-		*sizes[ICON_16x16]++ = 16;
-		*sizes[ICON_16x16]++ = 16;
+	buf = ewmh_icon_alloc(sizes);
+	if (!buf)
+		return NULL;
 
-		sizes[ICON_24x24] = sizes[ICON_16x16] + 16*16;
-		*sizes[ICON_24x24]++ = 24;
-		*sizes[ICON_24x24]++ = 24;
+	for (i = 0; i < 9; i++) {
+		unsigned x = i%3, y = i/3;
 
-		sizes[ICON_32x32] = sizes[ICON_24x24] + 24*24;
-		*sizes[ICON_32x32]++ = 32;
-		*sizes[ICON_32x32]++ = 32;
+		icon_tile16((void *)sizes[ICON_16x16], seq[i], x, y);
+		icon_tile24((void *)sizes[ICON_24x24], seq[i], x, y);
+		icon_tile32((void *)sizes[ICON_32x32], seq[i], x, y);
+		icon_tile48((void *)sizes[ICON_48x48], seq[i], x, y);
+	}
 
-		sizes[ICON_48x48] = sizes[ICON_32x32] + 32*32;
-		*sizes[ICON_48x48]++ = 48;
-		*sizes[ICON_48x48]++ = 48;
+	for (i = 0; i < ICON_MAX; i++) {
+		/* Produces the sequence 16, 24, 32, 48 */
+		unsigned size = 16 + (1u<<i)/2 * 8;
+
+		do_remap(sizes[i], size, map);
 	}
 
 	return buf;