Alter x11_queue_render interface to better match usage.

[rrace.git] / src / x11.c

diff --git a/src/x11.c b/src/x11.c
index 6954f06a15a5a30345ce43be670b5227d411bc0f..f827965b8d8a4dc353df510a7bac1fdd44095dad 100644 (file)
--- 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);
        }
 }
@@ -399,14 +392,15 @@ static void start_render(void *data, XtIntervalId *id)
        state->render_proc = XtAppAddWorkProc(app, do_render, state);
 }
 
-void x11_queue_render(struct app_state *state, uint_fast32_t game_mask,
-                                               uint_fast16_t goal_mask)
+void x11_queue_render(struct app_state *state, uint_fast32_t mask, int mode)
 {
        uint_fast32_t changed = 0;
        XtAppContext app;
 
-       changed |= state->render_game_mask |= game_mask;
-       changed |= state->render_goal_mask |= goal_mask;
+       if (mode & RENDER_MODE_GOAL)
+               changed |= state->render_goal_mask |= mask;
+       if (mode & RENDER_MODE_GAME)
+               changed |= state->render_game_mask |= mask;
 
        if (state->render_tick || !changed)
                return;