/*
* _NET_WM_ICON helpers for slide puzzle game
- * Copyright © 2022 Nick Bowler
+ * Copyright © 2023 Nick Bowler
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#ifndef EWMHICON_H_
-#define EWMHICON_H_
+#ifndef RRACE_EWMHICON_H_
+#define RRACE_EWMHICON_H_
/*
* Define X_DISPLAY_MISSING to allow building without X11 (for test purposes)
/* Stub types to allow compilation */
typedef struct {
+ unsigned long pixel;
unsigned short red, green, blue;
} XColor;
-typedef struct stub_widget *Widget;
-
#endif
-enum { COLOUR_PRIMARY, COLOUR_DARK, COLOUR_LIGHT, COLOUR_MAX };
-
/*
- * Helpers for drawing window icons in various sizes. The tileXX functions
- * draw one (out of 9) tiles at a particular size using a particular colour
- * set. Call for each tile position to draw a complete icon.
+ * Size of generated EWMH icon data (nelements argument to XChangeProperty).
*/
-enum { ICON_16x16, ICON_24x24, ICON_32x32, ICON_48x48, ICON_MAX };
#define EWMH_ICON_NELEM (2+16*16 + 2+24*24 + 2+32*32 + 2+48*48)
-void ewmh_tile16(unsigned long *icon, const XColor *c, int tile_x, int tile_y);
-void ewmh_tile24(unsigned long *icon, const XColor *c, int tile_x, int tile_y);
-void ewmh_tile32(unsigned long *icon, const XColor *c, int tile_x, int tile_y);
-void ewmh_tile48(unsigned long *icon, const XColor *c, int tile_x, int tile_y);
+/*
+ * For each of the n elements of the array pointed to by map, set the
+ * 'pixel' member according to its separated red/green/blue components,
+ * with an alpha value of 255 (opaque).
+ *
+ * The resulting colourmap is suitable for use with ewmh_icon_generate.
+ */
+void ewmh_icon_prepare_cmap(XColor *map, unsigned n);
/*
- * 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.
+ * Generate EWMH icon data based on a sequence of tile colours. Internally,
+ * this calls icon_tile16 and friends to draw each of the icon patterns.
*
- * 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.
+ * The sequence specifies the colour of all 9 icon tiles, beginning from the
+ * top left in row-major order. Each value specifies three offsets into
+ * the provided colour map, using the 'pixel' members directly as 32-bit
+ * ARGB colour values.
+ *
+ * Returns a newly-allocated buffer which is suitable for use directly with
+ * XChangeProperty, and should be freed by the caller.
+ *
+ * If allocation fails, a null pointer is returned.
*/
-void *ewmh_icon_alloc(unsigned long **sizes);
+void *ewmh_icon_generate(const unsigned long *seq, const XColor *map);
+#if !X_DISPLAY_MISSING
/*
* Check if the root window indicates support for EWMH icons. Returns 1 if
* supported, or 0 otherwise.
*/
int ewmh_probe_wm_icon(Widget shell);
+#endif
#endif