Wuss octopus

CHANGELOG.md

@@ -10,14 +10,74 @@ _Unreleased_ until one is cut.
 
 ### Added
 
-- `wuss/icon.h` — work-area icons: static labels and clickable bevelled
-  buttons drawn inside a window's content area. Icon boxes are in virtual
-  document space, so they scroll with the content. Wuss hit-tests buttons
-  before the content task sees a click and delivers them as `wuss_EVENT_ICON`;
-  labels and hidden or disabled icons fall through as `wuss_EVENT_MOUSE`.
+- `wuss/menu.h` (new `WUSS_MENUS` option, implies `WUSS_ICONS`) — RISC OS-style
+  pop-up menus. `wuss_menu_open()` shows a caller-owned, immutable
+  `wuss_menu_t` (title plus an array of `wuss_menu_item_t`) as a borderless
+  window, nudged to stay on screen and opened under the pointer; wuss owns
+  layout, submenu chaining on hover and whole-chain dismissal. Per-item flags
+  cover ticks, disabled rows, dashed separators and submenus.
+  `wuss_menu_select_fn_t` reports a leaf pick — SELECT closes the chain, ADJUST
+  keeps it open. `wuss_menu_close()` / `wuss_menu_is_open()` manage a chain by
+  handle. An over-tall menu gets a real vertical scrollbar instead of being
+  cropped.
+- `wuss_menu_create_from_desc()` / `wuss_menu_destroy()` — build a heap
+  `wuss_menu_t` tree from a compact descriptor string (PrivateEye's
+  `menu_create_from_desc` syntax: `,` between items, leading `|` for a dashed
+  separator, `{ ... }` submenus, `!` tick, `~` shade, `>` and `%s` varargs).
+  The whole tree is one owned allocation graph freed by `wuss_menu_destroy()`.
+- `wuss_menu_item_t::window` — a menu row may carry a caller-owned
+  `wuss_window_t` instead of a `submenu` (the two are mutually exclusive).
+  Hovering the row shows that window where a submenu would open, using the same
+  anchor maths; leaving the row, a click outside, a leaf SELECT elsewhere or
+  `wuss_destroy()` hide it again rather than close it, so the same handle is
+  reused on the next hover. Create the window with `wuss_WINDOW_HIDDEN`.
+- `wuss_window_set_hidden()` and the `wuss_WINDOW_HIDDEN` create flag — a hidden
+  window keeps its z-order slot but is not drawn, not hit-tested and occludes
+  nothing. `wuss_window_move()` still works on it (translate only, no blit) so
+  it can be parked and re-shown in position.
+- `wuss_set_palette()` — swap the system palette mid-session. Copies the new
+  palette in, refreshes the cached nearest-black/white indices, broadcasts a
+  new `wuss_EVENT_PALETTE` to every window's task so it can recache
+  `wuss_nearest_colour()` selections, then invalidates the whole screen.
+  Length must match `wuss_create()`'s; a now-out-of-range furniture/bevel/
+  backdrop index is rejected with the palette left unchanged.
+- `wuss_nearest_colour()` — the system-palette index closest to an RGB value by
+  squared Euclidean distance, ties to the lower index.
+- `wuss_alloc_t` and the `wuss_alloc` stdlib default — pluggable malloc/realloc/
+  free hooks. `wuss_create()` takes a new `const wuss_alloc_t *` argument
+  (NULL selects `wuss_alloc`); every heap block a `wuss_t` owns goes through
+  the hooks.
+- `wuss/icon.h` — work-area icons drawn inside a window's content area, in
+  virtual document space so they scroll with the content. Wuss hit-tests
+  interactive icons before the content task sees a click and delivers them as
+  `wuss_EVENT_ICON`; labels and hidden or disabled icons fall through as
+  `wuss_EVENT_MOUSE`. Icon types: `LABEL` (with `JUSTIFY_RIGHT` / `_CENTRE`
+  flags), bevelled `BUTTON` (`DEFAULT` flag draws it as the default action
+  button), `RADIO` and `OPTION` latching buttons (radios with a non-zero
+  `group` are mutually exclusive), `FRAME` grouping box, `BITMAP` (a
+  caller-owned image, hit-tested only with the `INTERACTIVE` flag), `PATTERN`
+  swatch, `MENU_ENTRY` and inert `RULE` rows.
+- `wuss_icon_get_selected()` / `wuss_icon_set_selected()` — query and set a
+  radio or option icon's latched state; setting a grouped radio clears the
+  others in its group. No task event — the programmatic path.
 - `wuss_icon_create_array()` — creates a batch of icons from a spec array with
   all-or-nothing rollback: on the first failure any icons already created by
   the call are destroyed and no handles are written.
+- `text/bmtext.h` — `bmtext_layout()` word-wraps a string to a pixel width in a
+  `bmfont_t` (measuring each candidate line, so proportional fonts wrap
+  correctly); `bmtext_draw()` draws the laid-out lines stacked. Layout is pure.
+- `screen_draw_lines()` — connected polyline; a `screen_draw_line()` segment
+  between each adjacent pair.
+- `screen_draw_rect()` — one-pixel unfilled rectangle outline (falls back to a
+  fill for a degenerate size). See _Changed_ for the fill-primitive renames.
+- `screen_draw_dashed_line()` — Bresenham line with a dash-period counter.
+- `screen_PATTERN_BAYER0` .. `screen_PATTERN_BAYER0 + 64` — 8x8 ordered dither,
+  one fill pattern per coverage level 0 (empty) to 64 (solid), indexed as
+  `screen_PATTERN_BAYER0 + level`. `BAYER32` == `GREY50`, `BAYER64` == `SOLID`.
+- `define_wimp16_palette()` and the `palette_WIMP16_*` names — the RISC OS
+  desktop 16-colour palette in native Wimp index order.
+- `bitmap_set_palette()` — replace a bitmap's palette in place, reusing the
+  existing palette buffer when it is large enough; NULL drops the palette.
 - `wuss_window_create_placed()` — creates a window from a content size instead
   of a box, letting Wuss pack it (furniture included) into the first free
   screen region. Successive auto-placed windows tile; placement cascades when
@@ -57,6 +117,24 @@ _Unreleased_ until one is cut.
 
 ### Changed
 
+- **Breaking:** `wuss_create()` takes a `const wuss_alloc_t *alloc` argument
+  after `config`; pass NULL for the stdlib allocator.
+- **Breaking:** `wuss_config_t::palette` is renamed `furniture`, and its type
+  `wuss_palette_t` renamed `wuss_furniture_palette_t`. `wuss_colour_t` narrows
+  from `int` to `unsigned char`.
+- **Breaking:** the framebuf draw primitives split draw/fill in their names:
+  `screen_draw_pixel` → `screen_set_pixel`, `screen_draw_rect` →
+  `screen_fill_rect`, `screen_draw_square` → `screen_fill_square`. `screen_draw_rect`
+  now names a one-pixel outline.
+- **Breaking:** the window/desktop background is now a `wuss_backdrop_t`
+  (`{ colour, pattern, pattern_bg }`) instead of a bare `wuss_colour_t`:
+  `wuss_config_t::backdrop`, and the `bg` parameter of
+  `wuss_window_create()`, `wuss_window_create_placed()` and
+  `wuss_window_set_background()`. A non-`screen_PATTERN_SOLID` `pattern` fills
+  with `screen_fill_pattern()` — the desktop phased to the screen origin, a
+  window's content phased to its scroll origin so the pattern stays locked to
+  the content. `wuss_BACKDROP_COLOUR(c)` and `wuss_BACKDROP_PATTERN(c, p, b)`
+  build one; the flat-colour case is `wuss_BACKDROP_COLOUR(old_value)`.
 - **Breaking:** `wuss_button_t` values are now flags (`wuss_BUTTON_SELECT` 4,
   `wuss_BUTTON_MENU` 2, `wuss_BUTTON_ADJUST` 1, `wuss_BUTTON_NONE` 0) so
   chords such as Select+Adjust can be reported. Client code comparing a
@@ -68,14 +146,32 @@ _Unreleased_ until one is cut.
 - Adjust-clicking a scroll arrow now steps against the direction the arrow
   points, so one arrow can be worked both ways without moving the pointer.
   Toggle-size stays Select-only.
+- A window can no longer be resized larger than the screen.
 
 ### Fixed
 
+- Opening a menu from a task's mouse-down handler no longer picks the menu's
+  first row on the matching mouse-up: that release is now swallowed.
+- A menu chain is now closed before its `on_select` callback runs, so a
+  callback that opens another menu no longer fights the one being torn down.
+- Menu text is drawn in the nearest-black palette entry rather than assuming
+  a fixed index, so menus stay legible under any system palette.
+- The mouse wheel no longer scrolls a window on an axis it declared
+  non-scrollable.
+- A MENU-button click on window furniture now has no effect, instead of being
+  routed to the content task.
+- A window's scroll offset is re-clamped after a resize reveals content past
+  the document extent.
+- The scrollbar well keeps a 2px gap at each end.
 - Dragging a scrollbar well with Select no longer raises the window; only a
   resize-icon grab restacks it.
 - `wuss_window_move()` no longer repaints already-blitted pixels when a drag
   past an occluded corner slides one clean piece of the window onto ground
   another clean piece just vacated.
+- Several scroll-redraw glitches fixed: stale pixels when scroll events arrive
+  faster than redraws, content blitted over a mid-content occluder, blit
+  sub-pieces clobbering each other's source region, and repaint sets not
+  clipped to the visible area. The hovered icon is re-resolved after a scroll.
 - A work-area button held on mouse-down is now released if the click opens a
   window that covers the button's owner, instead of staying stuck pressed.
 - Resize-corner drag preserves where within the resize icon the mouse-down

CMakeLists.txt

@@ -30,8 +30,9 @@ endif(CCACHE_FOUND)
 option(USE_FORTIFY "Use Fortify" OFF)
 option(USE_ASAN "Build with AddressSanitizer and UndefinedBehaviorSanitizer" OFF)
 option(DPTLIB_IMAGES_READ_ONLY "Remove libpng write support" OFF)
-option(WUSS_FURNITURE "Build the wuss window-furniture subsystem" ON)
-option(WUSS_ICONS "Build the wuss in-content icon subsystem" ON)
+option(WUSS_FURNITURE "Build the Wuss window-furniture subsystem" ON)
+option(WUSS_ICONS "Build the Wuss in-content icon subsystem" ON)
+option(WUSS_MENUS "Build the Wuss pop-up menu helper (implies WUSS_ICONS)" ON)
 
 # Referencing CMAKE_TOOLCHAIN_FILE avoids a warning on rebuilds.
 if(NOT ${CMAKE_TOOLCHAIN_FILE} STREQUAL "")
@@ -105,6 +106,7 @@ set(PUBLIC_HEADERS
     include/io/stream.h
     include/test/all-tests.h
     include/test/txtscr.h
+    include/text/bmtext.h
     include/text/txtfmt.h
     include/utils/array.h
     include/utils/barith.h
@@ -121,6 +123,9 @@ set(PUBLIC_HEADERS
 if(WUSS_ICONS)
     list(APPEND PUBLIC_HEADERS include/wuss/icon.h)
 endif()
+if(WUSS_MENUS)
+    list(APPEND PUBLIC_HEADERS include/wuss/menu.h)
+endif()
 
 # The public headers must be set as properties of the library, not as
 # target_sources. The quoting is essential.
@@ -285,6 +290,8 @@ set(TESTLIB_SOURCES
     libraries/test/txtscr/txtscr.c)
 
 set(TEXT_SOURCES
+    libraries/text/bmtext/draw.c
+    libraries/text/bmtext/layout.c
     libraries/text/txtfmt/create.c
     libraries/text/txtfmt/destroy.c
     libraries/text/txtfmt/get-length.c
@@ -326,17 +333,21 @@ set(UTILS_SOURCES
     libraries/utils/primes/primes.c)
 
 set(WUSS_CORE_SOURCES
+    libraries/wuss/backdrop.c
     libraries/wuss/create.c
     libraries/wuss/destroy.c
     libraries/wuss/get-font.c
+    libraries/wuss/get-pointer.c
     libraries/wuss/idle.c
     libraries/wuss/impl.h
     libraries/wuss/invalidate.c
     libraries/wuss/mouse-click.c
     libraries/wuss/mouse-move.c
+    libraries/wuss/nearest-colour.c
     libraries/wuss/redraw.c
     libraries/wuss/scroll.c
     libraries/wuss/scroll-step.c
+    libraries/wuss/set-palette.c
     libraries/wuss/task/start.c
     libraries/wuss/task/stop.c
     libraries/wuss/window/at.c
@@ -351,6 +362,7 @@ set(WUSS_CORE_SOURCES
     libraries/wuss/window/resize.c
     libraries/wuss/window/restack.c
     libraries/wuss/window/set-background.c
+    libraries/wuss/window/set-hidden.c
     libraries/wuss/window/set-scroll.c)
 
 set(WUSS_FURNITURE_SOURCES
@@ -362,6 +374,7 @@ set(WUSS_FURNITURE_SOURCES
     libraries/wuss/furniture/hit-test.c
     libraries/wuss/furniture/hscroll-box.c
     libraries/wuss/furniture/invalidate.c
+    libraries/wuss/furniture/ops.c
     libraries/wuss/furniture/resize-box.c
     libraries/wuss/furniture/scroll-action.c
     libraries/wuss/furniture/titlebar-box.c
@@ -377,23 +390,37 @@ set(WUSS_ICON_SOURCES
     libraries/wuss/icon/draw.c
     libraries/wuss/icon/free.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/hit-test.c
     libraries/wuss/icon/invalidate.c
     libraries/wuss/icon/screen-box.c
     libraries/wuss/icon/set-hidden.c
+    libraries/wuss/icon/set-hover.c
+    libraries/wuss/icon/set-selected.c
     libraries/wuss/icon/set-text.c
     libraries/wuss/icon.h)
 
+set(WUSS_MENU_SOURCES
+    libraries/wuss/menu/menu.c
+    libraries/wuss/menu/create-from-desc.c
+    libraries/wuss/menu.h)
+
 set(WUSS_SOURCES ${WUSS_CORE_SOURCES})
 if(WUSS_FURNITURE)
     list(APPEND WUSS_SOURCES ${WUSS_FURNITURE_SOURCES})
 endif()
+if(WUSS_MENUS)
+    set(WUSS_ICONS ON) # the menu helper needs the icon subsystem
+endif()
 if(WUSS_ICONS)
     list(APPEND WUSS_SOURCES ${WUSS_ICON_SOURCES})
 endif()
+if(WUSS_MENUS)
+    list(APPEND WUSS_SOURCES ${WUSS_MENU_SOURCES})
+endif()
 
 set(ALL_SOURCES
     ${PUBLIC_HEADERS}
@@ -451,6 +478,9 @@ endif()
 if(WUSS_ICONS)
     target_compile_definitions(DPTLib PUBLIC WUSS_ICONS)
 endif()
+if(WUSS_MENUS)
+    target_compile_definitions(DPTLib PUBLIC WUSS_MENUS)
+endif()
 
 if(NOT TARGET_RISCOS)
     set(CMAKE_FIND_FRAMEWORK NEVER)
@@ -560,6 +590,7 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include
 
 option(BUILD_TESTS "Build test program" OFF)
 option(BUILD_SDL_TESTS "Build tests that use SDL" OFF)
+option(BUILD_APPS "Build standalone apps (Wuss interactive demo)" OFF)
 
 if(BUILD_TESTS)
     set(TEST_SOURCES
@@ -587,27 +618,8 @@ if(BUILD_TESTS)
         libraries/utils/bsearch/test/bsearch-test.c
         libraries/utils/pack/test/pack-test.c
         libraries/datastruct/vector/test/vector-test.c
-        libraries/wuss/test/tasks/ball.c
-        libraries/wuss/test/tasks/blank.c
-        libraries/wuss/test/tasks/chars.c
-        libraries/wuss/test/tasks/checker.c
-        libraries/wuss/test/tasks/curve.c
-        libraries/wuss/test/tasks/gradient.c
-        libraries/wuss/test/tasks/image.c
-        libraries/wuss/test/tasks/palette.c
-        libraries/wuss/test/tasks/porter-duff.c
-        libraries/wuss/test/tasks/sofa.c
-        libraries/wuss/test/tasks/text.c
         libraries/wuss/test/wuss-test.c)
 
-    # The icon-driven launcher and the icons task only build when both wuss
-    # subsystems are present; the SDL interactive driver needs them too.
-    if(WUSS_FURNITURE AND WUSS_ICONS)
-        list(APPEND TEST_SOURCES
-            libraries/wuss/test/tasks/icons.c
-            libraries/wuss/test/tasks/launcher.c)
-    endif()
-
     source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${TEST_SOURCES})
 
     # Avoid a warning from CMake
@@ -630,19 +642,70 @@ if(BUILD_TESTS)
         target_link_libraries(DPTLibTest m)
     endif()
 
+    # Some unit tests (e.g. bmfont-test) gate an interactive SDL mode on
+    # USE_SDL; BUILD_SDL_TESTS links SDL3 and defines it for the test binary.
     if(BUILD_SDL_TESTS)
-        if(NOT (WUSS_FURNITURE AND WUSS_ICONS))
-            message(FATAL_ERROR "BUILD_SDL_TESTS requires WUSS_FURNITURE and WUSS_ICONS")
-        endif()
-
         find_package(SDL3 REQUIRED)
         find_package(SDL3_image REQUIRED)
 
         target_link_libraries(DPTLibTest SDL3::SDL3 SDL3_image::SDL3_image)
-
-        target_compile_definitions(DPTLibTest PUBLIC USE_SDL)
+        target_compile_definitions(DPTLibTest PRIVATE USE_SDL)
     endif()
 
     install(TARGETS DPTLibTest RUNTIME
         DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif()
+
+
+# Standalone apps
+#
+
+if(BUILD_APPS)
+    # The Wuss interactive demo: its own executable, built from the SDL task
+    # modules plus apps/wuss/main.c (which was the old in-test SDL driver).
+    if(NOT (WUSS_FURNITURE AND WUSS_ICONS))
+        message(FATAL_ERROR "BUILD_APPS requires WUSS_FURNITURE and WUSS_ICONS")
+    endif()
+
+    find_package(SDL3 REQUIRED)
+    find_package(SDL3_image REQUIRED)
+
+    set(WUSS_APP_SOURCES
+        apps/wuss/main.c
+        libraries/wuss/test/tasks/ball.c
+        libraries/wuss/test/tasks/blank.c
+        libraries/wuss/test/tasks/chars.c
+        libraries/wuss/test/tasks/checker.c
+        libraries/wuss/test/tasks/curve.c
+        libraries/wuss/test/tasks/gradient.c
+        libraries/wuss/test/tasks/icons.c
+        libraries/wuss/test/tasks/image.c
+        libraries/wuss/test/tasks/lissajous.c
+        libraries/wuss/test/tasks/palette.c
+        libraries/wuss/test/tasks/porter-duff.c
+        libraries/wuss/test/tasks/sofa.c
+        libraries/wuss/test/tasks/swatches.c
+        libraries/wuss/test/tasks/text.c)
+
+    source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${WUSS_APP_SOURCES})
+
+    add_executable(wuss ${WUSS_APP_SOURCES})
+
+    set_target_properties(wuss PROPERTIES
+        DESCRIPTION "DPTLib Wuss interactive demo"
+        C_STANDARD 99
+        OUTPUT_NAME_DEBUG wuss-debug
+        OUTPUT_NAME_RELEASE wuss
+        OUTPUT_NAME_RELWITHDEBINFO wuss-relwithdebinfo
+        OUTPUT_NAME_MINSIZEREL wuss-minsizerel)
+
+    target_include_directories(wuss PRIVATE libraries/wuss/test)
+    target_compile_definitions(wuss PRIVATE USE_SDL)
+    target_link_libraries(wuss DPTLib SDL3::SDL3 SDL3_image::SDL3_image)
+    if(NOT MSVC)
+        target_link_libraries(wuss m)
+    endif()
+
+    install(TARGETS wuss RUNTIME
+        DESTINATION ${CMAKE_INSTALL_PREFIX})
+endif()

README.md

@@ -80,6 +80,11 @@ DPTLib is my platform independent C library. It contains a wide variety of funct
 
 - [`test/txtscr.h`](https://github.com/dpt/DPTLib/blob/master/include/test/txtscr.h) — text format 'screen'
 
+### Text
+
+- [`text/txtfmt.h`](https://github.com/dpt/DPTLib/blob/master/include/text/txtfmt.h) — word-wrap a string to a character width (for monospaced text)
+- [`text/bmtext.h`](https://github.com/dpt/DPTLib/blob/master/include/text/bmtext.h) — word-wrap and draw a paragraph to a pixel width in a `bmfont`
+
 ### Utilities
 
 - [`utils/array.h`](https://github.com/dpt/DPTLib/blob/master/include/utils/array.h) — array utilities

apps/test/main.c

@@ -1,4 +1,4 @@
-//
+/* test/main.c */
 //  main.c
 //  DPTLibTest
 //