Wuss snagglepuss

CLAUDE.md

@@ -94,7 +94,8 @@ New source/header files must be added by hand to the relevant `set(..._SOURCES .
 - Section breaks within files use `/* ----- ... ----- */` rule comments.
 - Public API docs use Doxygen (`\file`, `\param`, `\return`); a `Doxyfile` exists for generating them.
 - Edit `.c`/`.h` files with the Edit tool, never `sed -i` line-range splices — they corrupt the Allman/2-space layout and can't be verified without re-reading. To inspect exact bytes or indentation, Read the file; don't shell out to `cat -A`/`cat -v`.
-- After editing any `.c`/`.h` function prototype or definition, run `python3 tools/wrap_protos.py <file>`; after editing a header's Doxygen, run `python3 tools/wrap_doxygen.py <file>` (skip vendored headers).
+- After editing any `.c`/`.h` function prototype or definition, run `python3 tools/fmt/wrap_protos.py <file>`; after editing a header's Doxygen, run `python3 tools/fmt/wrap_doxygen.py <file>` (skip vendored headers).
+- Before committing any `.c`/`.h` changes, run `python3 tools/fmt/realign_decls.py <file>` (declaration-block alignment) alongside `wrap_protos.py`/`wrap_doxygen.py` on the same files.
 
 ## Commit messages
 

CMakeLists.txt

@@ -92,6 +92,7 @@ set(PUBLIC_HEADERS
     include/framebuf/span-p1.h
     include/framebuf/span-p2.h
     include/framebuf/span-p4.h
+    include/framebuf/span-p8.h
     include/framebuf/span-registry.h
     include/framebuf/span-rgba8888.h
     include/framebuf/span-rgbx8888.h
@@ -103,6 +104,7 @@ set(PUBLIC_HEADERS
     include/geom/packer.h
     include/geom/point.h
     include/geom/size.h
+    include/geom/stack.h
     include/io/dirscan.h
     include/io/namelist.h
     include/io/path.h
@@ -130,6 +132,7 @@ set(PUBLIC_HEADERS
 
 if(WUSS_ICONS)
     list(APPEND PUBLIC_HEADERS include/wuss/icon.h)
+    list(APPEND PUBLIC_HEADERS include/wuss/icon-spec.h)
 endif()
 if(WUSS_MENUS)
     list(APPEND PUBLIC_HEADERS include/wuss/menu.h)
@@ -140,6 +143,7 @@ if(WUSS_COMPONENTS)
     list(APPEND PUBLIC_HEADERS include/wuss/component/colourmenu.h)
     list(APPEND PUBLIC_HEADERS include/wuss/component/info.h)
     list(APPEND PUBLIC_HEADERS include/wuss/component/proginfo.h)
+    list(APPEND PUBLIC_HEADERS include/wuss/component/dialogue.h)
 endif()
 
 # The public headers must be set as properties of the library, not as
@@ -286,6 +290,7 @@ set(FRAMEBUF_SOURCES
     libraries/framebuf/span/p1.c
     libraries/framebuf/span/p2.c
     libraries/framebuf/span/p4.c
+    libraries/framebuf/span/p8.c
     libraries/framebuf/span/rgbx8888.c
     libraries/framebuf/span/xbgr8888.c)
 
@@ -308,7 +313,11 @@ set(GEOM_SOURCES
     libraries/geom/layout/layout.c
     libraries/geom/line/line.c
     libraries/geom/packer/impl.h
-    libraries/geom/packer/packer.c)
+    libraries/geom/packer/packer.c
+    libraries/geom/stack/impl.h
+    libraries/geom/stack/measure-min.c
+    libraries/geom/stack/solve.c
+    libraries/geom/stack/valid-tree.c)
 
 set(IO_SOURCES
     libraries/io/dirscan/dirscan.c
@@ -371,9 +380,9 @@ set(WUSS_CORE_SOURCES
     libraries/wuss/core/backdrop.c
     libraries/wuss/core/create.c
     libraries/wuss/core/destroy.c
-    libraries/wuss/core/get-font.c
     libraries/wuss/core/get-palette.c
     libraries/wuss/core/get-pointer.c
+    libraries/wuss/core/get-resources.c
     libraries/wuss/core/idle.c
     libraries/wuss/core/impl.h
     libraries/wuss/core/invalidate.c
@@ -386,7 +395,9 @@ set(WUSS_CORE_SOURCES
     libraries/wuss/core/scroll-step.c
     libraries/wuss/core/set-backdrop.c
     libraries/wuss/core/set-palette.c
-    libraries/wuss/core/text.c
+    libraries/wuss/font/font.h
+    libraries/wuss/font/registry.c
+    libraries/wuss/font/text.c
     libraries/wuss/core/task/create.c
     libraries/wuss/core/task/destroy.c
     libraries/wuss/core/task/set-autoclose.c
@@ -433,11 +444,12 @@ set(WUSS_ICON_SOURCES
     libraries/wuss/icon/draw.c
     libraries/wuss/icon/free.c
     libraries/wuss/icon/from-spec.c
+    libraries/wuss/helpers/icon-spec.c
     libraries/wuss/icon/get-bbox.c
     libraries/wuss/icon/get-selected.c
     libraries/wuss/icon/get-text.c
     libraries/wuss/icon/get-type.c
-    libraries/wuss/icon/get-window.c
+    libraries/wuss/icon/get-value.c
     libraries/wuss/icon/hit-test.c
     libraries/wuss/icon/invalidate.c
     libraries/wuss/icon/plot.c
@@ -447,6 +459,8 @@ set(WUSS_ICON_SOURCES
     libraries/wuss/icon/set-hover.c
     libraries/wuss/icon/set-selected.c
     libraries/wuss/icon/set-text.c
+    libraries/wuss/icon/set-value.c
+    libraries/wuss/icon/slider-box.c
     libraries/wuss/icon.h)
 
 set(WUSS_MENU_SOURCES
@@ -458,7 +472,8 @@ set(WUSS_COMPONENT_SOURCES
     libraries/wuss/component/fontmenu.c
     libraries/wuss/component/colourmenu.c
     libraries/wuss/component/info.c
-    libraries/wuss/component/proginfo.c)
+    libraries/wuss/component/proginfo.c
+    libraries/wuss/component/dialogue.c)
 
 set(WUSS_SOURCES ${WUSS_CORE_SOURCES})
 if(WUSS_FURNITURE)
@@ -682,6 +697,7 @@ if(BUILD_TESTS)
         libraries/geom/box/test/box-test.c
         libraries/geom/layout/test/layout-test.c
         libraries/geom/packer/test/packer-test.c
+        libraries/geom/stack/test/stack-test.c
         libraries/io/stream/test/stream-test.c
         libraries/text/txtfmt/test/txtfmt-test.c
         libraries/utils/array/test/array-test.c

apps/test/main.c

@@ -61,6 +61,7 @@ static const test_t tests[] =
   { "box",        box_test        },
   { "layout",     layout_test     },
   { "packer",     packer_test     },
+  { "stack",      stack_test      },
 
   { "stream",     stream_test     },
 

apps/wuss/frontend-riscos.c

@@ -213,8 +213,14 @@ static wuss_button_t mouse_buttons_to_wuss(int buttons)
   return b;
 }
 
+/* INKEY scan codes for keys tested individually, outside g_keys[] below: F1
+ * (checked with Shift to pick REDRAW_ALL vs GARBAGE) and Shift itself. */
+#define KEY_SCAN_F1    (-114)
+#define KEY_SCAN_SHIFT (-1)
+
 /* Keys the demo reacts to: negative INKEY scan code -> input kind. F4 and
- * Escape both quit. */
+ * Escape both quit. F1 is handled separately in wuss_frontend_poll, not in
+ * this table, so it can vary its kind with Shift. */
 static const struct
 {
   int               scan;
@@ -223,7 +229,6 @@ static const struct
 g_keys[] =
 {
   { -113, wuss_INPUT_QUIT         }, /* Escape */
-  { -114, wuss_INPUT_REDRAW_ALL   }, /* F1 */
   { -116, wuss_INPUT_PIXEL_STRESS }, /* F3 */
   { -117, wuss_INPUT_QUIT         }  /* F4 */
 };
@@ -242,6 +247,7 @@ bool wuss_frontend_poll(wuss_frontend_t *fe, wuss_input_t *event)
   static unsigned int key_was; /* bit i = g_keys[i] was down last poll */
 
   unsigned int key_now = 0;
+  unsigned int f1_bit = 1u << NELEMS(g_keys); /* one bit past the table */
   int          mx, my, buttons, t;
   int          px, py;
   size_t       i;
@@ -251,6 +257,18 @@ bool wuss_frontend_poll(wuss_frontend_t *fe, wuss_input_t *event)
   for (i = 0; i < NELEMS(g_keys); i++)
     if (key_down(g_keys[i].scan))
       key_now |= 1u << i;
+  if (key_down(KEY_SCAN_F1))
+    key_now |= f1_bit;
+
+  /* F1 is handled here rather than in g_keys[]: its kind depends on Shift,
+   * which a static table entry can't express. */
+  if ((key_now & f1_bit) && !(key_was & f1_bit))
+  {
+    key_was = key_now;
+    event->kind = key_down(KEY_SCAN_SHIFT) ? wuss_INPUT_GARBAGE
+                                            : wuss_INPUT_REDRAW_ALL;
+    return true;
+  }
 
   for (i = 0; i < NELEMS(g_keys); i++)
   {
@@ -313,10 +331,13 @@ bool wuss_frontend_poll(wuss_frontend_t *fe, wuss_input_t *event)
   return false;
 }
 
-void wuss_frontend_present(wuss_frontend_t *fe, const bitmap_t *bm)
+void wuss_frontend_present(wuss_frontend_t *fe,
+                           const bitmap_t  *bm,
+                           const box_t     *dirty)
 {
   NOT_USED(fe);
   NOT_USED(bm);
+  NOT_USED(dirty);
 
   /* wuss drew straight into screen memory; just pace to the frame rate */
   _swix(OS_Byte, _IN(0), 19);

apps/wuss/frontend-sdl.c

@@ -23,11 +23,12 @@
 #include "frontend.h"
 
 /* Screen pixel format for the demo, chosen at run time via --depth: 32 =
- * pixelfmt_bgrx8888 (feeds SDL directly, no per-frame conversion); 4 (the
- * default) = pixelfmt_p4 paletted (exercises screen_copy_rect's nibble-packed
- * blit path instead); 2 = pixelfmt_p2; 1 = pixelfmt_p1 monochrome. Paletted
- * depths are converted to bgrx8888 per frame via bitmap_convert. Stashed in
- * struct wuss_frontend so present() can branch on it. */
+ * pixelfmt_bgrx8888 (feeds SDL directly, no per-frame conversion); 8 =
+ * pixelfmt_p8; 4 (the default) = pixelfmt_p4 paletted (exercises
+ * screen_copy_rect's nibble-packed blit path instead); 2 = pixelfmt_p2; 1 =
+ * pixelfmt_p1 monochrome. Paletted depths are converted to bgrx8888 per
+ * frame via bitmap_convert. Stashed in struct wuss_frontend so present() can
+ * branch on it. */
 
 /* Integer window zoom: the fixed Wuss screen is drawn at this many device
  * pixels per screen pixel. The initial value comes from -scale (0 => use the
@@ -47,7 +48,7 @@ struct wuss_frontend
   int           scr_width;
   int           scr_height;
   int           scale; /* device pixels per screen pixel; see WUSS_SDL_*_SCALE */
-  int           depth; /* framebuffer bits per pixel: 32 (bgrx8888), 4 (p4), 2 (p2) or 1 (p1) */
+  int           depth; /* framebuffer bits per pixel: 32 (bgrx8888), 8 (p8), 4 (p4), 2 (p2) or 1 (p1) */
   void         *pixels; /* the private framebuffer handed to the caller */
 };
 
@@ -100,20 +101,18 @@ result_t wuss_frontend_open(int               width,
   NOT_USED(palette);
   NOT_USED(npalette);
 
-  if (depth != 1 && depth != 2 && depth != 4 && depth != 32)
+  if (depth != 1 && depth != 2 && depth != 4 && depth != 8 && depth != 32)
   {
-    fprintf(stderr, "Error: unsupported depth %d (want 1, 2, 4 or 32)\n", depth);
+    fprintf(stderr,
+            "Error: unsupported depth %d (want 1, 2, 4, 8 or 32)\n", depth);
     return result_BAD_ARG;
   }
 
   if (scale <= 0)
     scale = WUSS_SDL_DEFAULT_SCALE;
   scale = CLAMP(scale, WUSS_SDL_MIN_SCALE, WUSS_SDL_MAX_SCALE);
 
-  stride = (depth == 32) ? width * 4  /* pixelfmt_bgrx8888: 4 bytes/pixel */
-         : (depth == 4)  ? width / 2  /* pixelfmt_p4: 2 pixels/byte */
-         : (depth == 2)  ? (width + 3) / 4 /* pixelfmt_p2: 4 pixels/byte */
-                         : (width + 7) / 8; /* pixelfmt_p1: 8 pixels/byte */
+  stride = (width * depth + 7) >> 3;
 
   fe = calloc(1, sizeof(*fe));
   if (fe == NULL)
@@ -165,6 +164,7 @@ result_t wuss_frontend_open(int               width,
   SDL_SetTextureScaleMode(fe->texture, SDL_SCALEMODE_NEAREST);
 
   *fmt = (depth == 32) ? pixelfmt_bgrx8888
+       : (depth == 8)  ? pixelfmt_p8
        : (depth == 4)  ? pixelfmt_p4
        : (depth == 2)  ? pixelfmt_p2
                        : pixelfmt_p1;
@@ -202,36 +202,42 @@ bool wuss_frontend_poll(wuss_frontend_t *fe, wuss_input_t *event)
       return true;
 
     case SDL_EVENT_KEY_UP:
-      if (ev.key.key == SDLK_F4)
-        event->kind = wuss_INPUT_QUIT;
-      else if (ev.key.key == SDLK_F1 && (ev.key.mod & SDL_KMOD_SHIFT))
-        event->kind = wuss_INPUT_GARBAGE;
-      else if (ev.key.key == SDLK_F1)
-        event->kind = wuss_INPUT_REDRAW_ALL;
-      else if (ev.key.key == SDLK_F3)
-        event->kind = wuss_INPUT_PIXEL_STRESS;
-      else if (ev.key.key == SDLK_F2)
+      switch (ev.key.key)
       {
-        int scale;
-
-        /* F2 steps the SDL window zoom up, Shift-F2 down, clamped to
-         * [WUSS_SDL_MIN_SCALE, WUSS_SDL_MAX_SCALE]: a backend-local zoom the
-         * demo loop never sees. */
-        scale = fe->scale + ((ev.key.mod & SDL_KMOD_SHIFT) ? -1 : 1);
-        if (scale < WUSS_SDL_MIN_SCALE)
-          scale = WUSS_SDL_MIN_SCALE;
-        else if (scale > WUSS_SDL_MAX_SCALE)
-          scale = WUSS_SDL_MAX_SCALE;
-        if (scale != fe->scale)
+      case SDLK_F1:
+        event->kind = (ev.key.mod & SDL_KMOD_SHIFT)
+          ? wuss_INPUT_GARBAGE
+          : wuss_INPUT_REDRAW_ALL;
+        break;
+      case SDLK_F2:
         {
-          fe->scale = scale;
-          SDL_SetWindowSize(fe->window, fe->scr_width * scale,
-                            fe->scr_height * scale);
+          int scale;
+
+          /* F2 steps the SDL window zoom up, Shift-F2 down, clamped to
+           * [WUSS_SDL_MIN_SCALE, WUSS_SDL_MAX_SCALE]: a backend-local zoom the
+           * demo loop never sees. */
+          scale = fe->scale + ((ev.key.mod & SDL_KMOD_SHIFT) ? -1 : 1);
+          if (scale < WUSS_SDL_MIN_SCALE)
+            scale = WUSS_SDL_MIN_SCALE;
+          else if (scale > WUSS_SDL_MAX_SCALE)
+            scale = WUSS_SDL_MAX_SCALE;
+          if (scale != fe->scale)
+          {
+            fe->scale = scale;
+            SDL_SetWindowSize(fe->window, fe->scr_width * scale,
+                              fe->scr_height * scale);
+          }
+          continue;
         }
+      case SDLK_F3:
+        event->kind = wuss_INPUT_PIXEL_STRESS;
+        break;
+      case SDLK_F4:
+        event->kind = wuss_INPUT_QUIT;
+        break;
+      default:
         continue;
       }
-      else
-        continue;
       return true;
 
     case SDL_EVENT_MOUSE_BUTTON_DOWN:
@@ -287,28 +293,56 @@ bool wuss_frontend_poll(wuss_frontend_t *fe, wuss_input_t *event)
   }
 }
 
-void wuss_frontend_present(wuss_frontend_t *fe, const bitmap_t *bm)
+void wuss_frontend_present(wuss_frontend_t *fe,
+                           const bitmap_t  *bm,
+                           const box_t     *dirty)
 {
   if (fe->depth == 32)
   {
     SDL_UpdateTexture(fe->texture, NULL, bm->base, bm->rowbytes);
   }
   else
   {
-    bitmap_t *disp;
+    result_t    rc;
+    bitmap_t    rows, *disp;
+    int         y0, y1;
+    SDL_Rect    rect;
+
+    /* Sub-byte formats (p1/p2/p4) pack several pixels per byte, so only a
+     * whole-row crop is safe without redoing their bit-unpacking maths for an
+     * arbitrary x0; a dirty rect just narrows which rows get converted. */
+    y0 = (dirty != NULL) ? CLAMP(dirty->y0, 0, bm->size.h) : 0;
+    y1 = (dirty != NULL) ? CLAMP(dirty->y1, 0, bm->size.h) : bm->size.h;
+    if (y1 <= y0)
+      goto present;
+
+    rc = bitmap_init(&rows,
+                     SIZE2D(bm->size.w, y1 - y0),
+                     bm->format,
+                     bm->rowbytes,
+                     bm->palette,
+                     (unsigned char *) bm->base + y0 * bm->rowbytes);
+    if (rc != result_OK)
+      goto present;
 
     /* wuss draws into a paletted bitmap; SDL wants bgrx. bitmap_convert reads
      * the palette straight off `bm`, which the caller updates when the palette
      * task's picker menu changes it, so a live palette change just shows up in
      * the next converted frame. */
-    if (bitmap_convert(bm, pixelfmt_bgrx8888, &disp) == result_OK)
+    if (bitmap_convert(&rows, pixelfmt_bgrx8888, &disp) == result_OK)
     {
-      SDL_UpdateTexture(fe->texture, NULL, disp->base, disp->rowbytes);
+      rect.x = 0;
+      rect.y = y0;
+      rect.w = bm->size.w;
+      rect.h = y1 - y0;
+
+      SDL_UpdateTexture(fe->texture, &rect, disp->base, disp->rowbytes);
       free(disp->base);
       free(disp);
     }
   }
 
+present:
   SDL_RenderTexture(fe->renderer, fe->texture, NULL, NULL);
   SDL_RenderPresent(fe->renderer);