Wuss picklepuss

CHANGELOG.md

@@ -100,7 +100,7 @@ _Unreleased_ until one is cut.
   a live icon per element.
 - `wuss_window_invalidate_extent()` — marks a window's whole virtual
   document extent dirty (`window->doc`), not just the visible content
-  rectangle `wuss_window_invalidate_all()` covers, so a change touching the
+  rectangle `wuss_window_invalidate_visible()` covers, so a change touching the
   whole document repaints correctly at any scroll position.
 - Clicking in a scrollbar well (not on the sausage) now pages the content
   one visible extent towards the click, keeping one `WUSS_SCROLL_STEP` of
@@ -232,9 +232,42 @@ _Unreleased_ until one is cut.
   pool. Released areas are not coalesced.
 - `POINT(x, y)` and `SIZE2D(w, h)` compound-literal macros in `geom/point.h`
   and `geom/size.h`.
+- 1bpp and 2bpp paletted pixel formats (`pixelfmt_p1`, `pixelfmt_p2`),
+  packed MSB-first (bit 7 / bits 7..6 are the leftmost pixel) to match PNG
+  and the existing pattern bit order. `span_p1` / `span_p2` (`fill` +
+  `blendconst`) are registered so `bitmap_init()` hands out a valid span;
+  `screen_set_pixel` / `screen_blend_pixel` / `screen_fill_pattern` /
+  `screen_copy_bitmap` gain p1 and p2 cases; `bitmap_convert()` grows
+  `p1 -> bgrx8888` and `p2 -> bgrx8888` paths for the SDL frontend's
+  per-frame display conversion. `pixelmap` already handled both generically.
+- `bmfont_draw()` renders to a `pixelfmt_p1` or `pixelfmt_p2` screen. A
+  single `bmfont_p1_plot_row` / `bmfont_p2_plot_row` does the per-pixel
+  MSB-first bit write for both 1- and 2-byte glyph rows and both opaque
+  and transparent backgrounds.
+- `pixelfmt_paletted_nentries()` — palette entry count for any paletted
+  format, replacing the `(scr->format == pixelfmt_p4) ? 16 : 0` hack at
+  every `colour_to_pixel()` call site (which passed a broken `nentries=0`
+  for any non-p4 paletted screen).
+- The `wuss` SDL demo accepts `-d`/`--depth 1` and `--depth 2`, selecting a
+  `pixelfmt_p1` (stride `(width + 7) / 8`) or `pixelfmt_p2` (stride
+  `(width + 3) / 4`) framebuffer alongside the existing 4 and 32.
+- The `wuss` curve task draws the active control points' convex hull
+  (Andrew's monotone chain) as a closed light-grey polyline before the
+  curve and blobs.
+- The `wuss` gradient task cycles its ordered-dither matrix through 2x2,
+  4x4 and 8x8 on SELECT / ADJUST clicks; each matrix cell maps to a fixed
+  -8..+8 offset so a larger matrix gives a finer pattern, not a noisier
+  one (4x4 output unchanged). The current size is drawn top-left.
+- `tools/ttf2bmfont.py` — renders a TTF into the bmfont PNG format the
+  loader expects. Three small paletted bitmap faces (`04b_03`, `04b_25`,
+  `Nokia`) added under `resources/bmfonts/`.
 
 ### Changed
 
+- **Breaking:** `wuss_window_invalidate_all()` is renamed
+  `wuss_window_invalidate_visible()` -- "all" misread as the whole document
+  when it only ever covered the visible content rectangle. Same behaviour;
+  use `wuss_window_invalidate_extent()` for the full document.
 - The `wuss` demo task launcher is split out of `apps/wuss/main.c` into
   `apps/wuss/tasks.c` behind `tasks.h`: the 19 `spawn_*` callbacks, every
   menu table and `task_handle_event` move over, and the shared file-scope
@@ -368,6 +401,14 @@ _Unreleased_ until one is cut.
     leaf now delivers `wuss_EVENT_MENU_SELECT` (with `window == NULL`) to that
     task — `data.menu_select` carries `{ const struct wuss_menu *menu; int
     index; wuss_button_t button; }`. `wuss_menu_select_fn_t` is removed.
+- `screen_set_pixel_8()` is renamed `screen_set_pixel_p8()`, matching the
+  `_p1` / `_p2` / `_p4` naming of the other paletted set-pixel helpers.
+- The greeble prefab tables (`greeble_prefab_cells` / `greeble_prefab`) are
+  regenerated from the current sheet; `GREEBLE_NPREFAB` 103 -> 137.
+- The `wuss` image task resizes the window frame on load (via
+  `wuss_window_resize()` before `wuss_window_set_doc()`, which alone only
+  moved the scroll extent) and insets an 8px solid border inside the
+  ninepatch frame.
 
 ### Fixed
 
@@ -445,9 +486,9 @@ _Unreleased_ until one is cut.
   `NDEBUG`).
 - `screen_fill_hline()` (and so `screen_fill_rect()`, which calls it per
   row) is a no-op in release builds for a `screen_t` whose pixel format has
-  no span-registry entry, instead of dereferencing the NULL `scr->span` —
-  the guarding `assert` was compiled out under `NDEBUG` so this previously
-  crashed.
+  no span-registry entry — or a span with no `fill` — instead of
+  dereferencing the NULL `scr->span` / `scr->span->fill`; the guarding
+  `assert` was compiled out under `NDEBUG` so this previously crashed.
 - `wuss_create()`'s font-slot arrays and loop bound in the interactive demo
   are now sized from one named, compile-time-checked constant
   (`WUSS_MAIN_NFONTS`, checked against `wuss_MAX_FONTS`) instead of three
@@ -484,3 +525,71 @@ _Unreleased_ until one is cut.
   endpoints.
 - `screen_draw_ninepatch()` clamps its corner cells so they no longer overlap
   and double-draw when the destination box is smaller than the source corners.
+- `spanregistry_get()`'s one-slot cache seeded `lastformat` to zero, which
+  equals `pixelfmt_p1` (the first enum member), so the first p1 lookup
+  short-circuited to a NULL span and tripped the `screen_fill_hline()`
+  assert. Seeded with `pixelfmt_unknown` and the fast path guarded on a
+  non-NULL span.
+- The `NO_RESIZE_BLIT` branch of `wuss_window_resize()` invalidated the
+  dirty region but never dropped the cached furniture layout, so
+  `wuss__furniture_draw` kept painting titlebar/carve/outline rects at the
+  previous frame's width. It now calls `wuss__chrome_invalidate_layout`,
+  matching the blit branch's `wuss__chrome_repaint`.
+- `bitmap_fill_pattern()` negated the `box_intersection()` result (which is
+  non-zero when the intersection is *empty*), so any non-NULL `area` that
+  overlapped the bitmap returned early and painted nothing — only
+  `area == NULL` worked. Drop the negation to match `screen_fill_pattern()`.
+- `bitmap__rle_decode_row()` ran a bare `for (;;)` that only stopped on an
+  EOL opcode, so a truncated or corrupt RLE blob read opcodes past the
+  allocation. It now takes an `end` limit (like every other row walker),
+  stops at it, and has a reserved opcode bail to `end` (release builds
+  previously did a bare `break`, desynchronising the caller's row cursor).
+  `bitmap_decompress()` reads `data_len` from the blob header to form
+  `end`.
+- `bmfont_draw()` formed `gid = c - ' '` from a raw signed `char` and
+  indexed `adw[]` and the glyph bitmaps with no bounds check, so a tab, a
+  DEL or any byte `>= 0x80` produced a negative or oversized index and an
+  out-of-bounds read/write. Both draw loops now filter `c < ' '` and
+  `gid >= totalchars`, matching `bmfont_measure()`. The
+  fully-vertically-clipped case (`clippedcharheight <= 0`) also gets a
+  release-build bail rather than entering `drawfn` with a negative height
+  and looping ~`INT_MAX` times.
+- `wuss_destroy()`'s task sweep delivered `wuss_EVENT_QUIT` and freed each
+  task node without first setting `wuss_TASK__REAPING`. A QUIT handler that
+  closed its last autoclose window hit `wuss_window_close`'s self-destruct
+  path, which delivered a second QUIT and freed the node — which the sweep
+  then freed again. `wuss_TASK__REAPING` is now set before QUIT in the
+  sweep, and `wuss_task_destroy()` is a no-op when the task is already
+  being reaped.
+- `bitmap_compress()`'s worst-case row estimate assumed one control byte
+  per 128 pixels, but the encoder emits a 1-byte literal control for every
+  isolated non-repeatable pixel. A legal y8 image of the form singleton,
+  pair, singleton, pair, ... needs ~1.33*w bytes/row, overflowing the
+  allocation and returning `result_BUFFER_OVERFLOW` on valid input. The
+  budget is now `w * (bpp + 1)` plus the literal-long split control and an
+  EOL.
+- `bmconv_p4_to_bgrx8888()` ran `x < src->size.w / 8` and expanded 8 pixels
+  per iteration, so the final `w % 8` pixels of each row were never written
+  — the output had uninitialised garbage columns for any width not a
+  multiple of 8 — and it ignored row padding in `src->rowbytes`. Switched
+  to a per-pixel loop honouring both, matching the p1 and p2 converters.
+- `wuss_window_set_hidden()` marked a window hidden but left
+  `wuss->furniture.dragging`, `wuss->pressed_icon` and `wuss->hover_icon`
+  pointing into it, so hiding a window mid-drag from an event handler meant
+  the next `wuss_mouse_move()` still drove `wuss_window_move()` on an
+  off-screen window every pointer report. It now clears the same pointer
+  state `wuss_window_close()` does.
+- `scroll_strip()` always reserved `size + WUSS_DIVIDER_PX` at the far end
+  for the resize corner, but `scroll_strip_hit()` only reserves it when
+  something owns that corner. With a horizontal scrollbar and `NO_VSCROLL`
+  and `NO_RESIZE` the drawn strip stopped short while the hit box ran to
+  the visible edge: the rightmost band showed stale pixels yet hit-tested
+  as `HSCROLL_WELL` and started a scrollbar drag over empty chrome.
+  `scroll_strip()` gets the same far-end rule.
+- `wuss__furniture_hit_test()`'s `nearest_edge_region()` fallback claimed
+  `wuss_FURNITURE_RESIZE` for a whole bottom or right carve band whenever a
+  resize icon was present, and a scroll well for an edge with no scrollbar
+  strip. A click on the bare carve band left of the corner icon then
+  started a resize far from the visible handle. It now hands off to a
+  scroll well only when that scrollbar's strip runs the full edge;
+  every other edge pixel resolves to `TITLE` or `CONTENT`.

CLAUDE.md

@@ -82,14 +82,14 @@ New source/header files must be added by hand to the relevant `set(..._SOURCES .
 
 **Test structure.** There is a single test binary (`DPTLibTest`, from `apps/test/main.c`) that dispatches to per-module `<module>_test(resources)` functions declared centrally in `include/test/all-tests.h`. Tests return `result_TEST_PASSED`/`result_TEST_FAILED` (`result_BASE_TEST`).
 
-**Notable sub-libraries with their own docs** (`docs/*.md`): `io/stream` (chainable byte-stream sources/transforms, PackBits and move-to-front compression), `framebuf/bmfont` (proportional bitmap fonts loaded from specially-formatted PNGs), `framebuf/composite` (Porter-Duff compositing on RGBA/BGRA bitmaps), `wuss` (minimal window manager: creation, z-ordering, mouse routing, dirty-region redraw, client-delegated content).
+**Notable sub-libraries with their own docs** (`docs/*.md`): `io/stream` (chainable byte-stream sources/transforms, PackBits and move-to-front compression), `framebuf/bmfont` (proportional bitmap fonts loaded from specially-formatted PNGs), `framebuf/composite` (Porter-Duff compositing on RGBA/BGRA bitmaps), `framebuf/pixelmap` (cached deep-to-paletted colour conversion tables for blit inner loops), `wuss` (minimal window manager: creation, z-ordering, mouse routing, dirty-region redraw, client-delegated content).
 
 **RISC OS.** `TARGET_RISCOS` (set by an external toolchain file) switches CMake to fetch/build zlib+libpng from source, link OSLib from `$GCCSDK_INSTALL_ENV`, and applies `riscos_set_flags()`. `pngusr-ro.dfa`/`pngusr-rw.dfa` select libpng's build config depending on `DPTLIB_IMAGES_READ_ONLY`.
 
 ## Code style
 
 - C99, `-Wall -Wextra -pedantic`. Allman brace style, 2-space indentation, tabs converted to spaces (see `.astylerc`/`.editorconfig` — astyle is the formatter of record).
-- Declare variables at the top of each scope (pre-C99 style is followed throughout, even though the standard is C99), ordered by first use.
+- Declare variables at the top of each scope (pre-C99 style is followed throughout, even though the standard is C99), ordered by first use. Exception: a `result_t` status local (`rc`, `err`, `crc`, ...) is always declared first in its block, ahead of the use-ordered locals.
 - File header comment format: `/* filename.c -- one-line description */`.
 - Section breaks within files use `/* ----- ... ----- */` rule comments.
 - Public API docs use Doxygen (`\file`, `\param`, `\return`); a `Doxyfile` exists for generating them.

CMakeLists.txt

@@ -86,8 +86,11 @@ set(PUBLIC_HEADERS
     include/framebuf/palettes.h
     include/framebuf/pattern.h
     include/framebuf/pixelfmt.h
+    include/framebuf/pixelmap.h
     include/framebuf/screen.h
     include/framebuf/span-bgrx8888.h
+    include/framebuf/span-p1.h
+    include/framebuf/span-p2.h
     include/framebuf/span-p4.h
     include/framebuf/span-registry.h
     include/framebuf/span-rgba8888.h
@@ -101,6 +104,7 @@ set(PUBLIC_HEADERS
     include/geom/point.h
     include/geom/size.h
     include/io/dirscan.h
+    include/io/namelist.h
     include/io/path.h
     include/io/stream-mem.h
     include/io/stream-mtfcomp.h
@@ -119,6 +123,7 @@ set(PUBLIC_HEADERS
     include/utils/maths.h
     include/utils/pack.h
     include/utils/primes.h
+    include/utils/rng.h
     include/wuss/task.h
     include/wuss/window.h
     include/wuss/wuss.h)
@@ -133,6 +138,8 @@ endif()
 if(WUSS_COMPONENTS)
     list(APPEND PUBLIC_HEADERS include/wuss/component/fontmenu.h)
     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)
 endif()
 
 # The public headers must be set as properties of the library, not as
@@ -245,8 +252,10 @@ set(DATASTRUCT_SOURCES
 
 set(FRAMEBUF_SOURCES
     libraries/framebuf/bitmap/bitmap.c
+    libraries/framebuf/bitmap/compress.c
     libraries/framebuf/bitmap/fill-pattern.c
     libraries/framebuf/bitmap/load.c
+    libraries/framebuf/bitmap/rle.h
     libraries/framebuf/bitmap/save.c
     libraries/framebuf/bmfont/bmfont.c
     libraries/framebuf/bmfont/enumerate.c
@@ -256,7 +265,13 @@ set(FRAMEBUF_SOURCES
     libraries/framebuf/palettes/palettes.c
     libraries/framebuf/pattern/pattern.c
     libraries/framebuf/pixelfmt/log2bpp.c
+    libraries/framebuf/pixelfmt/paletted-nentries.c
+    libraries/framebuf/pixelmap/build.c
+    libraries/framebuf/pixelmap/get.c
+    libraries/framebuf/pixelmap/impl.h
     libraries/framebuf/screen/screen.c
+    libraries/framebuf/screen/screen-copy-bitmap-rle.c
+    libraries/framebuf/screen/screen-copy-bitmap-rle.h
     libraries/framebuf/screen/screen-copy-ninepatch.c
     libraries/framebuf/screen/screen-copy-rect.c
     libraries/framebuf/screen/screen-draw.c
@@ -268,6 +283,8 @@ set(FRAMEBUF_SOURCES
     libraries/framebuf/span/all8888.c
     libraries/framebuf/span/all8888.h
     libraries/framebuf/span/bgrx8888.c
+    libraries/framebuf/span/p1.c
+    libraries/framebuf/span/p2.c
     libraries/framebuf/span/p4.c
     libraries/framebuf/span/rgbx8888.c
     libraries/framebuf/span/xbgr8888.c)
@@ -295,6 +312,7 @@ set(GEOM_SOURCES
 
 set(IO_SOURCES
     libraries/io/dirscan/dirscan.c
+    libraries/io/namelist/namelist.c
     libraries/io/path/path.c
     libraries/io/stream/stream-mem.c
     libraries/io/stream/stream-mtfcomp.c
@@ -368,6 +386,7 @@ 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/core/task/create.c
     libraries/wuss/core/task/destroy.c
     libraries/wuss/core/task/set-autoclose.c
@@ -397,6 +416,7 @@ set(WUSS_FURNITURE_SOURCES
     libraries/wuss/furniture/draw.c
     libraries/wuss/furniture/hit-test.c
     libraries/wuss/furniture/invalidate.c
+    libraries/wuss/furniture/layout.c
     libraries/wuss/furniture/ops.c
     libraries/wuss/furniture/resize-box.c
     libraries/wuss/furniture/scroll-action.c
@@ -421,6 +441,7 @@ set(WUSS_ICON_SOURCES
     libraries/wuss/icon/hit-test.c
     libraries/wuss/icon/invalidate.c
     libraries/wuss/icon/plot.c
+    libraries/wuss/icon/registry.c
     libraries/wuss/icon/screen-box.c
     libraries/wuss/icon/set-hidden.c
     libraries/wuss/icon/set-hover.c
@@ -435,7 +456,9 @@ set(WUSS_MENU_SOURCES
 
 set(WUSS_COMPONENT_SOURCES
     libraries/wuss/component/fontmenu.c
-    libraries/wuss/component/colourmenu.c)
+    libraries/wuss/component/colourmenu.c
+    libraries/wuss/component/info.c
+    libraries/wuss/component/proginfo.c)
 
 set(WUSS_SOURCES ${WUSS_CORE_SOURCES})
 if(WUSS_FURNITURE)
@@ -650,9 +673,11 @@ if(BUILD_TESTS)
         libraries/datastruct/hash/test/hash-test.c
         libraries/datastruct/list/test/list-test.c
         libraries/datastruct/ntree/test/ntree-test.c
+        libraries/framebuf/bitmap/test/rle-test.c
         libraries/framebuf/bmfont/test/bmfont-test.c
         libraries/framebuf/composite/test/composite-test.c
         libraries/framebuf/curve/test/curve-test.c
+        libraries/framebuf/pixelmap/test/pixelmap-test.c
         libraries/framebuf/screen/test/screen-test.c
         libraries/geom/box/test/box-test.c
         libraries/geom/layout/test/layout-test.c
@@ -731,6 +756,7 @@ if(BUILD_APPS)
         libraries/wuss/test/tasks/minesweeper.c
         libraries/wuss/test/tasks/palette.c
         libraries/wuss/test/tasks/porter-duff.c
+        libraries/wuss/test/tasks/saturn.c
         libraries/wuss/test/tasks/sofa.c
         libraries/wuss/test/tasks/swatches.c
         libraries/wuss/test/tasks/text.c)

apps/test/main.c

@@ -53,7 +53,9 @@ static const test_t tests[] =
 
   { "bmfont",     bmfont_test     },
   { "composite",  composite_test  },
+  { "rle",        bitmap_rle_test },
   { "curve",      curve_test      },
+  { "pixelmap",   pixelmap_test   },
   { "screen",     screen_test     },
 
   { "box",        box_test        },

apps/wuss/frontend-riscos.c

@@ -88,6 +88,8 @@ result_t wuss_frontend_open(int               width,
                             int               height,
                             const colour_t   *palette,
                             int               npalette,
+                            int               depth,
+                            int               scale,
                             void            **pixels,
                             int              *rowbytes,
                             pixelfmt_t       *fmt,
@@ -99,6 +101,11 @@ result_t wuss_frontend_open(int               width,
   _kernel_oserror *err;
   char             msg[160]; /* deferred so it prints after the mode restore */
 
+  /* this backend is locked to the 16-colour Wimp mode with a fixed 1:1
+   * window; -depth and -scale only make sense for the SDL backend */
+  NOT_USED(depth);
+  NOT_USED(scale);
+
   msg[0] = '\0';
 
   fe = calloc(1, sizeof(*fe));