Redesign the titlebar right-click menu: real separators/headers, live customization

Reported live: "looks very ugly currently and some of it doesn't make
sense." Both were real. Every row, including a bare divider, took one
full TITLEBAR_HEIGHT slot, so a separator was a 1px hairline in the
middle of 32px of empty space; "Move to Workspace" faked a section
caption by embedding box-drawing characters directly in an ordinary
item's label, which rendered - and behaved, until the click-dispatch
site's own special case - exactly like a clickable row that did
nothing. Separately, "Floating" was always offered even though
Window::floating only affects the "tiling" layout: toggling it under
this project's own default "dynamic" layout visibly changes nothing,
reading as a broken control rather than an inapplicable one.

ContextMenu (crates/core/src/context_menu.rs) gained real Separator
(9px) and Header (22px, non-interactive, dimmed) row kinds with their
own small heights, replacing the label-hack outright. Both backends'
rendering now sum each row's own real height instead of assuming one
uniform value, so hit-testing and pixels can't disagree about where a
row is. Floating is omitted entirely outside the tiling layout.

New, in direct response to "allow customizing from there as well": a
Customize section with live Button Style / Button Side toggles. Each
flips the matching ThemeConfig field and immediately redraws every open
window's titlebar - not routed through srd set's own path, which is
scoped to windows created after the call for lack of a redraw hook it
can reach; a menu action that didn't visibly change the titlebar you
clicked would be its own "doesn't make sense" bug.

Full workspace build/test/clippy clean (242 core tests, +8; 152
wayland, net-even after rewriting the old label-hack tests).

2 files changed, 72 insertions, 9 deletions

diff --git a/crates/wayland/src/state/desktop_icons.rs b/crates/wayland/src/state/desktop_icons.rs
index 8ed22a5..9d2dd91 100644
--- a/crates/wayland/src/state/desktop_icons.rs
+++ b/crates/wayland/src/state/desktop_icons.rs
@@ -593,8 +593,22 @@ impl CompState {
 
     fn build_desktop_menu_buffer(&mut self, menu: DesktopMenu) {
         let theme = self.wm.borrow().theme;
-        let items: Vec<(&str, bool)> = menu.items.iter().map(|&(label, _)| (label, false)).collect();
-        let data = decoration::render_context_menu(menu.width, menu.row_height, &items, theme.titlebar_bg, theme.titlebar_fg_focused, theme.titlebar_fg_unfocused, theme.default_border_color);
+        // Not redesigned the way the titlebar menu was (`srdwm_core::
+        // context_menu`'s own module doc comment) - this menu's rows are
+        // still all one uniform height, `Separator` included, matching
+        // its behaviour before `render_context_menu` grew a per-row
+        // height/kind. Every row here is real content or `DesktopMenuAction
+        // ::Separator`, never a non-interactive caption, so there is no
+        // `MenuRowKind::Header` case to map to.
+        let rows: Vec<(&str, bool, u32, decoration::MenuRowKind)> = menu
+            .items
+            .iter()
+            .map(|(label, action)| {
+                let kind = if matches!(action, crate::desktop_menu::DesktopMenuAction::Separator) { decoration::MenuRowKind::Separator } else { decoration::MenuRowKind::Item };
+                (*label, false, menu.row_height, kind)
+            })
+            .collect();
+        let data = decoration::render_context_menu(menu.width, &rows, theme.titlebar_bg, theme.titlebar_fg_focused, theme.titlebar_fg_unfocused, theme.default_border_color);
         let buffer = MemoryRenderBuffer::from_slice(&data, Fourcc::Argb8888, (menu.width as i32, menu.height()), 1, Transform::Normal, None);
         self.desktop_menu_buffer = Some(buffer);
         self.desktop_menu = Some(menu);
diff --git a/crates/wayland/src/state/menu.rs b/crates/wayland/src/state/menu.rs
index b8cf094..b0b0a6e 100644
--- a/crates/wayland/src/state/menu.rs
+++ b/crates/wayland/src/state/menu.rs
@@ -14,8 +14,20 @@ impl CompState {
             return;
         };
         let theme = self.wm.borrow().theme;
-        let items: Vec<(&str, bool)> = menu.items.iter().map(|&(label, _)| (label, false)).collect();
-        let data = decoration::render_context_menu(menu.width, menu.row_height, &items, theme.titlebar_bg, theme.titlebar_fg_focused, theme.titlebar_fg_unfocused, theme.default_border_color);
+        let rows: Vec<(&str, bool, u32, decoration::MenuRowKind)> = menu
+            .items
+            .iter()
+            .enumerate()
+            .map(|(i, &(label, action))| {
+                let kind = match action {
+                    crate::context_menu::MenuAction::Separator => decoration::MenuRowKind::Separator,
+                    crate::context_menu::MenuAction::Header => decoration::MenuRowKind::Header,
+                    _ => decoration::MenuRowKind::Item,
+                };
+                (label, false, menu.row_height_for(i), kind)
+            })
+            .collect();
+        let data = decoration::render_context_menu(menu.width, &rows, theme.titlebar_bg, theme.titlebar_fg_focused, theme.titlebar_fg_unfocused, theme.default_border_color);
         let buffer = MemoryRenderBuffer::from_slice(&data, Fourcc::Argb8888, (menu.width as i32, menu.height()), 1, Transform::Normal, None);
         self.context_menu_buffer = Some(buffer);
         self.context_menu = Some(menu);
@@ -60,17 +72,54 @@ impl CompState {
             MenuAction::MoveToWorkspace(workspace) => {
                 self.wm.borrow_mut().move_window_to_workspace(window, workspace);
             }
+            MenuAction::CycleButtonStyle => {
+                let mut wm = self.wm.borrow_mut();
+                wm.theme.traffic_light_buttons = !wm.theme.traffic_light_buttons;
+                drop(wm);
+                self.redraw_every_decoration();
+            }
+            MenuAction::CycleButtonSide => {
+                let mut wm = self.wm.borrow_mut();
+                wm.theme.buttons_left = !wm.theme.buttons_left;
+                drop(wm);
+                self.redraw_every_decoration();
+            }
             MenuAction::Close => {
                 if let Some(w) = self.id_to_window.get(&window) {
                     crate::input::close_dwindow(w);
                 }
             }
             // Never actually reached: the click-dispatch site
-            // (`input/pointer.rs`) intercepts `Separator` before calling
-            // this function at all. Handled here too so this match stays
-            // exhaustive without a catch-all that would silently swallow a
-            // real future variant added without updating this function.
-            MenuAction::Separator => {}
+            // (`input/pointer.rs`) intercepts `Separator`/`Header` before
+            // calling this function at all. Handled here too so this
+            // match stays exhaustive without a catch-all that would
+            // silently swallow a real future variant added without
+            // updating this function.
+            MenuAction::Separator | MenuAction::Header => {}
+        }
+    }
+
+    /// Rebuilds every open window's titlebar/border bitmap against
+    /// whatever `wm.theme` currently holds - what `CycleButtonStyle`/
+    /// `CycleButtonSide` need to actually show their effect immediately.
+    ///
+    /// `srd set button_style`/`button_side` (`crates/platform/src/ipc/
+    /// dispatch.rs`) change the exact same `ThemeConfig` fields but are
+    /// deliberately scoped to "only affects windows created (or
+    /// redecorated) after this call" - that crate is backend-agnostic
+    /// and has no way to reach into a Wayland-specific redraw. A titlebar
+    /// menu action has no such excuse: it's *this* backend's own code,
+    /// already holding `&mut self`, and a "customize" action that doesn't
+    /// visibly change the very titlebar you clicked would be exactly the
+    /// kind of "doesn't make sense" this menu was reported for in the
+    /// first place. `redraw_decoration_buffer` already no-ops on any
+    /// window whose decoration signature didn't actually change, so
+    /// calling it for every window here costs nothing for the (common)
+    /// case where most of them don't use server-side decoration at all.
+    fn redraw_every_decoration(&mut self) {
+        let ids: Vec<WindowId> = self.wm.borrow().windows().map(|w| w.id).collect();
+        for id in ids {
+            self.redraw_decoration_buffer(id);
         }
     }