From 7aac229d09956b35cf96a3d76900c1adb7b1f42e Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Tue, 3 Jan 2023 21:26:31 -0500
Subject: [PATCH] x11: Shrink colour initialization code.

Remove the large global XtResource array which is only used once at
program startup and replace it with a much more compact encoding,
(basically just the strings) which is sufficient to generate the
rest at runtime.  This appears to reduce the overall program size
quite a lot.

A further (very small) improvement is also realized by adjusting the
order of the resources to match the order in the state structure.
---
 src/x11.c | 78 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 37 insertions(+), 41 deletions(-)

diff --git a/src/x11.c b/src/x11.c
index 44bb867..0326db9 100644
--- a/src/x11.c
+++ b/src/x11.c
@@ -48,54 +48,50 @@ enum {
 	COLOUR_UI_GAMEBG = NUM_TILE_COLOURS,
 	COLOUR_UI_MAX
 };
-typedef Pixel colour_tab[COLOUR_UI_MAX];
-
-#define COLOURRES(name, index, def) { \
-	(name), (NULL), XtRPixel, sizeof (String), \
-	offsetof(struct { colour_tab t; }, t[index]), \
-	XtRString, (def) }
-
-static XtResource colour_resources[] = {
-	COLOURRES("colour0", 0, COLOUR0_PRIMARY),
-	COLOURRES("colour1", 1, COLOUR1_PRIMARY),
-	COLOURRES("colour2", 2, COLOUR2_PRIMARY),
-	COLOURRES("colour3", 3, COLOUR3_PRIMARY),
-	COLOURRES("colour4", 4, COLOUR4_PRIMARY),
-	COLOURRES("colour5", 5, COLOUR5_PRIMARY),
-
-	COLOURRES("colourDark0",  6, COLOUR0_DARK),
-	COLOURRES("colourDark1",  7, COLOUR1_DARK),
-	COLOURRES("colourDark2",  8, COLOUR2_DARK),
-	COLOURRES("colourDark3",  9, COLOUR3_DARK),
-	COLOURRES("colourDark4", 10, COLOUR4_DARK),
-	COLOURRES("colourDark5", 11, COLOUR5_DARK),
-
-	COLOURRES("colourLight0", 12, COLOUR0_LIGHT),
-	COLOURRES("colourLight1", 13, COLOUR1_LIGHT),
-	COLOURRES("colourLight2", 14, COLOUR2_LIGHT),
-	COLOURRES("colourLight3", 15, COLOUR3_LIGHT),
-	COLOURRES("colourLight4", 16, COLOUR4_LIGHT),
-	COLOURRES("colourLight5", 17, COLOUR5_LIGHT),
-
-	COLOURRES("gameBackground", COLOUR_UI_GAMEBG, "#181818")
-};
 
 static void init_colours(struct app_state *state, Widget shell)
 {
+	static const char cdefs[] =
+		     "colour0"        "\0" COLOUR0_PRIMARY
+		"\0" "colourDark0"    "\0" COLOUR0_DARK
+		"\0" "colourLight0"   "\0" COLOUR0_LIGHT
+		"\0" "colour1"        "\0" COLOUR1_PRIMARY
+		"\0" "colourDark1"    "\0" COLOUR1_DARK
+		"\0" "colourLight1"   "\0" COLOUR1_LIGHT
+		"\0" "colour2"        "\0" COLOUR2_PRIMARY
+		"\0" "colourDark2"    "\0" COLOUR2_DARK
+		"\0" "colourLight2"   "\0" COLOUR2_LIGHT
+		"\0" "colour3"        "\0" COLOUR3_PRIMARY
+		"\0" "colourDark3"    "\0" COLOUR3_DARK
+		"\0" "colourLight3"   "\0" COLOUR3_LIGHT
+		"\0" "colour4"        "\0" COLOUR4_PRIMARY
+		"\0" "colourDark4"    "\0" COLOUR4_DARK
+		"\0" "colourLight4"   "\0" COLOUR4_LIGHT
+		"\0" "colour5"        "\0" COLOUR5_PRIMARY
+		"\0" "colourDark5"    "\0" COLOUR5_DARK
+		"\0" "colourLight5"   "\0" COLOUR5_LIGHT
+		"\0" "gameBackground" "\0" "#181818";
+
+	XtResource res[COLOUR_UI_MAX], t = {
+		(char *)cdefs, 0, XtRPixel, sizeof (Pixel), 0, XtRString
+	};
+	Pixel colours[XtNumber(res)];
 	unsigned i;
 
-	colour_tab colours;
-	XtGetApplicationResources(shell, &colours, colour_resources,
-	                          XtNumber(colour_resources), NULL, 0);
-
-	for (i = 0; i < NUM_TILE_COLOURS; i++) {
-		unsigned tile = i % (TILE_MAX-1), shade = i / (TILE_MAX-1);
+	for (i = 0; i < XtNumber(res); i++) {
+		t.default_addr = strchr(t.resource_name, 0) + 1;
+		res[i] = t;
 
-		state->tile_colour[tile][shade] = colours[i];
+		t.resource_name = (char *)t.default_addr + 8;
+		t.resource_offset += sizeof colours[0];
 	}
 
-	XtVaSetValues(state->game, XtNbackground, colours[COLOUR_UI_GAMEBG],
-	                           (char *)NULL);
+	XtGetApplicationResources(shell, &colours, res, XtNumber(res), NULL, 0);
+	for (i = 0; i < NUM_TILE_COLOURS; i++) {
+		uint_least32_t *p = state->tile_colour[0];
+		p[i] = colours[i];
+	}
+	XtVaSetValues(state->game, XtNbackground, colours[i], (char *)NULL);
 }
 
 void x11_initialize(struct app_state *state, Widget shell)
@@ -217,7 +213,7 @@ static void set_icon(struct app_state *state, Display *display,
 	if (state->flags & FLAG_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];
+		XColor colours[NUM_TILE_COLOURS];
 		void *wm_icon;
 		int i;
 
-- 
2.43.2