Merge pull request #27 from devmobasa/feat-add-toolbars

Add icon-first toolbar UI

Author: devmobasa

.gitignore

@@ -24,7 +24,6 @@ packaging/**
 !packaging/wayscriber.service
 !packaging/PKGBUILD
 !packaging/package.yaml
-!packaging/PKGBUILD.hyprmarker-meta
 
 docs/board
 

README.md

@@ -464,23 +464,10 @@ wayscriber/
 └── config.example.toml   # Example configuration
 ```
 
-### Project History
-
-Wayscriber shipped under the name **hyprmarker** through the v0.4 release line. The rename in v0.5.0 reflects the broader compositor support that has been built since the original Hyprland-only prototype. Use `wayscriber --migrate-config` to copy existing settings, and see **[docs/MIGRATION.md](docs/MIGRATION.md)** for the full compatibility checklist.
-
-**Coming from hyprmarker?** Uninstall the old package (`paru -R hyprmarker`, etc.) and disable the legacy user service before installing Wayscriber:
-
-```bash
-systemctl --user disable --now hyprmarker.service 2>/dev/null || true
-```
-
-Then install Wayscriber and enable `wayscriber.service` if you want the daemon on login.
-
 ### Documentation
 
 - **[docs/SETUP.md](docs/SETUP.md)** – system setup and installation details
 - **[docs/CONFIG.md](docs/CONFIG.md)** – configuration reference
-- **[docs/MIGRATION.md](docs/MIGRATION.md)** – guidance for migrating from hyprmarker
 
 ### Comparison with ZoomIt
 

docs/codebase-overview.md

@@ -7,8 +7,7 @@ This document explains how the application boots, how user input travels through
 ## 1. Execution Flow From `main.rs`
 
 1. **CLI parsing (`src/main.rs`)**
-   - Uses `clap` to parse `--daemon`, `--active`, `--mode`, and migration flags.
-   - Immediately handles `--migrate-config` via `config::migrate_config` and exits.
+   - Uses `clap` to parse `--daemon`, `--active`, `--mode`, and session management flags.
    - Verifies `WAYLAND_DISPLAY` when a Wayland session is required.
 
 2. **Mode selection**
@@ -18,7 +17,6 @@ This document explains how the application boots, how user input travels through
 
 3. **Shared subsystems automatically pulled in**
    - `config`: loads user settings, key bindings, and drawing defaults.
-   - `legacy`: prints notices for old binary names and handles hyprmarker compatibility.
 
 ---
 
@@ -126,10 +124,9 @@ Notifications are sent via `notification::send_notification_async`, keeping all
 
 ---
 
-## 6. Configuration & Legacy Support
+## 6. Configuration
 
-- **`src/config/`** handles loading `config.toml`, validating fields, and building the keybinding map. It also houses migration helpers shared with `main.rs`.
-- **`src/legacy.rs`** contains helpers to detect old binary names, environment overrides, and configurator paths. The daemon tray relies on it to launch the correct configurator binary.
+- **`src/config/`** handles loading `config.toml`, validating fields, and building the keybinding map.
 
 ---
 
@@ -147,15 +144,14 @@ Notifications are sent via `notification::send_notification_async`, keeping all
 
 | Path | Role |
 |------|------|
-| `src/main.rs` | CLI entry point, mode selection, migration trigger. |
+| `src/main.rs` | CLI entry point, mode selection. |
 | `src/daemon.rs` | Background daemon, tray menu, signal handling, overlay toggling. |
 | `src/backend/` | Wayland backend implementation split into bootstrap (`mod.rs`), runtime (`state.rs`), and input/render handlers. |
 | `src/input/` | Event/state machine for drawing tools, board modes, and capture triggers. |
 | `src/draw/` | Vector drawing primitives, canvases, fonts. |
 | `src/ui.rs` | Status/help overlays. |
 | `src/capture/` | Screenshot pipeline (manager, dependencies, sources, clipboard/file helpers). |
-| `src/config/` | Config parsing, defaults, migration helpers. |
-| `src/legacy.rs` | Compatibility notices and configurator path helpers. |
+| `src/config/` | Config parsing, defaults, keybinding map. |
 | `src/notification.rs` | Desktop notifications for capture results. |
 | `src/util.rs` | Shared math/color utilities. |
 | `tests/` | CLI + rendering integration tests. |
@@ -169,6 +165,6 @@ Notifications are sent via `notification::send_notification_async`, keeping all
 3. **Backend** sets up Wayland surfaces and loops, forwarding input to `InputState`.
 4. **InputState + draw/ui** update the overlay contents and request renders.
 5. **Capture** subsystem handles screenshot actions asynchronously and notifies the user.
-6. **Config/legacy** modules ensure user preferences and backward compatibility are honored everywhere.
+6. **Config** module ensures user preferences are honored everywhere.
 
 Use this document to trace any feature: locate the entry point (CLI, tray, keybinding), follow it through the backend/input/capture stacks, and consult the relevant modules listed above for details.

packaging/PKGBUILD

@@ -1,67 +1,8 @@
-# Maintainer: hyprarcher <[email protected]>
-pkgname=hyprmarker
-pkgver=0.4.0
-pkgrel=2
-pkgdesc='ZoomIt-like screen annotation tool for Wayland compositors with wlr-layer-shell support'
-arch=('x86_64' 'aarch64')
-url='https://github.com/devmobasa/hyprmarker'
-license=('MIT')
-depends=(
-    'cairo'
-    'wayland'
-    'pango'
-    'gcc-libs'
-    'glibc'
-    'wl-clipboard'
-    'grim'
-    'slurp'
-)
-makedepends=(
-    'cargo'
-    'git'
-)
-# Use GitHub as source
-source=("git+$url.git#tag=v$pkgver")
-sha256sums=('SKIP')
-
-prepare() {
-    cd "$pkgname"
-    export RUSTUP_TOOLCHAIN=stable
-    cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
-}
-
-build() {
-    cd "$pkgname"
-    export RUSTUP_TOOLCHAIN=stable
-    export CARGO_TARGET_DIR=target
-    cargo build --frozen --release --all-features
-    cargo build --frozen --release --manifest-path configurator/Cargo.toml
-}
-
-package() {
-    cd "$pkgname"
-
-    # Install binary
-    install -Dm755 "target/release/hyprmarker" "$pkgdir/usr/bin/hyprmarker"
-    install -Dm755 "target/release/hyprmarker-configurator" "$pkgdir/usr/bin/hyprmarker-configurator"
-
-    # Install systemd user service
-    install -Dm644 packaging/hyprmarker.service "$pkgdir/usr/lib/systemd/user/hyprmarker.service"
-
-    # Install example config
-    install -Dm644 config.example.toml "$pkgdir/usr/share/doc/$pkgname/config.example.toml"
-
-    # Install documentation
-    install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
-
-    # Install license if available
-    [ -f LICENSE ] && install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" || true
-}
 # Maintainer: wayscriber maintainers <[email protected]>
 pkgname=wayscriber
-pkgver=0.6.0
-pkgrel=2
-pkgdesc='Screen annotation tool for Wayland compositors (formerly hyprmarker)'
+pkgver=0.8.0
+pkgrel=1
+pkgdesc='Screen annotation tool for Wayland compositors'
 arch=('x86_64' 'aarch64')
 url='https://wayscriber.com'
 license=('MIT')
@@ -79,9 +20,6 @@ makedepends=(
     'cargo'
     'git'
 )
-provides=('hyprmarker')
-conflicts=('hyprmarker<0.6.0' 'hyprmarker-debug<0.6.0' 'wayscriber-debug<0.6.0')
-replaces=('hyprmarker' 'hyprmarker-debug' 'wayscriber-debug')
 source=("git+https://github.com/devmobasa/wayscriber.git#tag=v$pkgver")
 sha256sums=('SKIP')
 

src/backend/wayland/backend.rs

@@ -15,7 +15,7 @@ use smithay_client_toolkit::{
     seat::SeatState,
     shell::{
         WaylandSurface,
-        wlr_layer::{Anchor, KeyboardInteractivity, Layer, LayerShell},
+        wlr_layer::{Anchor, Layer, LayerShell},
         xdg::{XdgShell, window::WindowDecorations},
     },
     shm::Shm,
@@ -37,7 +37,7 @@ use crate::{
     capture::{CaptureManager, CaptureOutcome},
     config::{Config, ConfigSource},
     input::{BoardMode, ClickHighlightSettings, InputState},
-    legacy, notification, session,
+    notification, session,
 };
 
 fn friendly_capture_error(error: &str) -> String {
@@ -165,11 +165,6 @@ impl WaylandBackend {
             }
         };
 
-        if matches!(config_source, ConfigSource::Legacy(_)) && !legacy::warnings_suppressed() {
-            warn!(
-                "Continuing with settings from legacy hyprmarker config. Run `wayscriber --migrate-config` when convenient."
-            );
-        }
         info!("Configuration loaded");
         debug!("  Color: {:?}", config.drawing.default_color);
         debug!("  Thickness: {:.1}px", config.drawing.default_thickness);
@@ -245,6 +240,7 @@ impl WaylandBackend {
         let mut input_state = InputState::with_defaults(
             config.drawing.default_color.to_color(),
             config.drawing.default_thickness,
+            config.drawing.default_fill_enabled,
             config.drawing.default_font_size,
             font_descriptor,
             config.drawing.text_background_enabled,
@@ -255,13 +251,30 @@ impl WaylandBackend {
             action_map,
             config.session.max_shapes_per_frame,
             ClickHighlightSettings::from(&config.ui.click_highlight),
+            config.history.undo_all_delay_ms,
+            config.history.redo_all_delay_ms,
+            config.history.custom_section_enabled,
+            config.history.custom_undo_delay_ms,
+            config.history.custom_redo_delay_ms,
+            config.history.custom_undo_steps,
+            config.history.custom_redo_steps,
         );
 
         input_state.set_hit_test_tolerance(config.drawing.hit_test_tolerance);
         input_state.set_hit_test_threshold(config.drawing.hit_test_linear_threshold);
         input_state.set_undo_stack_limit(config.drawing.undo_stack_limit);
         input_state.set_context_menu_enabled(config.ui.context_menu.enabled);
 
+        // Initialize toolbar visibility from pinned config
+        input_state.init_toolbar_from_config(
+            config.ui.toolbar.top_pinned,
+            config.ui.toolbar.side_pinned,
+            config.ui.toolbar.use_icons,
+            config.ui.toolbar.show_more_colors,
+            config.ui.toolbar.show_actions_section,
+            config.ui.toolbar.show_delay_sliders,
+        );
+
         // Apply initial mode from CLI (if provided) or config default (only if board modes enabled)
         if config.board.enabled {
             let initial_mode_str = self
@@ -370,17 +383,16 @@ impl WaylandBackend {
 
             // Configure the layer surface for fullscreen overlay
             layer_surface.set_anchor(Anchor::all());
-            // NOTE: Using Exclusive keyboard interactivity for complete input capture
-            // If clipboard operations are interrupted during overlay toggle, consider switching
-            // to KeyboardInteractivity::OnDemand which cooperates better with other applications
-            layer_surface.set_keyboard_interactivity(KeyboardInteractivity::Exclusive);
+            let desired_keyboard_mode = state.desired_keyboard_interactivity();
+            layer_surface.set_keyboard_interactivity(desired_keyboard_mode);
             layer_surface.set_size(0, 0); // Use full screen size
             layer_surface.set_exclusive_zone(-1);
 
             // Commit the surface
             layer_surface.commit();
 
             state.surface.set_layer_surface(layer_surface);
+            state.current_keyboard_interactivity = Some(desired_keyboard_mode);
             info!("Layer shell surface created");
         } else if let Some(xdg_shell) = state.xdg_shell.as_ref() {
             info!("Layer shell missing; creating xdg-shell window");
@@ -408,12 +420,6 @@ impl WaylandBackend {
             ));
         }
 
-        // Freeze on start if requested
-        if self.freeze_on_start {
-            info!("Freeze-on-start enabled, requesting frozen capture");
-            state.input_state.request_frozen_toggle();
-        }
-
         // Track consecutive render failures for error recovery
         let mut consecutive_render_failures = 0u32;
         const MAX_RENDER_FAILURES: u32 = 10;
@@ -448,6 +454,20 @@ impl WaylandBackend {
                         info!("Exit requested after dispatch, breaking event loop");
                         break;
                     }
+                    // Adjust keyboard interactivity if toolbar visibility changed.
+                    state.sync_toolbar_visibility(&qh);
+
+                    // Advance any delayed history playback (undo/redo with delay).
+                    if state
+                        .input_state
+                        .tick_delayed_history(std::time::Instant::now())
+                    {
+                        state.toolbar.mark_dirty();
+                        state.input_state.needs_redraw = true;
+                    }
+                    if state.input_state.has_pending_history() {
+                        state.input_state.needs_redraw = true;
+                    }
                 }
                 Err(e) => {
                     warn!("Event queue error: {}", e);
@@ -458,7 +478,9 @@ impl WaylandBackend {
 
             if state.input_state.take_pending_frozen_toggle() {
                 if !state.frozen_enabled {
-                    warn!("Frozen mode disabled on this compositor (xdg fallback); ignoring toggle");
+                    warn!(
+                        "Frozen mode disabled on this compositor (xdg fallback); ignoring toggle"
+                    );
                 } else if state.frozen.is_in_progress() {
                     warn!("Frozen capture already in progress; ignoring toggle");
                 } else if state.input_state.frozen_active() {
@@ -562,7 +584,8 @@ impl WaylandBackend {
                     Ok(keep_rendering) => {
                         // Reset failure counter on successful render
                         consecutive_render_failures = 0;
-                        state.input_state.needs_redraw = keep_rendering;
+                        state.input_state.needs_redraw =
+                            keep_rendering || state.input_state.has_pending_history();
                         // Only set frame_callback_pending if vsync is enabled
                         if state.config.performance.enable_vsync {
                             state.surface.set_frame_callback_pending(true);

src/backend/wayland/frozen.rs

@@ -643,6 +643,7 @@ mod tests {
         let mut input = InputState::with_defaults(
             crate::draw::color::RED,
             1.0,
+            false,
             12.0,
             crate::draw::FontDescriptor::default(),
             false,
@@ -653,6 +654,13 @@ mod tests {
             std::collections::HashMap::new(),
             usize::MAX,
             crate::input::ClickHighlightSettings::disabled(),
+            0,
+            0,
+            true,
+            0,
+            0,
+            5,
+            5,
         );
 
         // Simulate an in-flight portal capture

src/backend/wayland/handlers/compositor.rs

@@ -16,9 +16,18 @@ impl CompositorHandler for WaylandState {
         _conn: &Connection,
         _qh: &QueueHandle<Self>,
         _surface: &wl_surface::WlSurface,
-        _new_factor: i32,
+        new_factor: i32,
     ) {
-        debug!("Scale factor changed");
+        let scale = new_factor.max(1);
+        debug!("Scale factor changed to {}", scale);
+        self.surface.set_scale(scale);
+        let (phys_w, phys_h) = self.surface.physical_dimensions();
+        self.frozen
+            .handle_resize(phys_w, phys_h, &mut self.input_state);
+        self.toolbar
+            .maybe_update_scale(self.surface.current_output().as_ref(), scale);
+        self.toolbar.mark_dirty();
+        self.input_state.needs_redraw = true;
     }
 
     fn transform_changed(
@@ -65,6 +74,8 @@ impl CompositorHandler for WaylandState {
         if let Some(info) = self.output_state.info(output) {
             let scale = info.scale_factor.max(1);
             self.surface.set_scale(scale);
+            self.toolbar.maybe_update_scale(Some(output), scale);
+            self.toolbar.mark_dirty();
             let (logical_w, logical_h) = info
                 .logical_size
                 .unwrap_or((self.surface.width() as i32, self.surface.height() as i32));

src/backend/wayland/handlers/keyboard.rs

@@ -157,6 +157,9 @@ fn keysym_to_key(keysym: Keysym) -> Key {
         Keysym::K => Key::Char('K'),
         Keysym::z => Key::Char('z'),
         Keysym::Z => Key::Char('Z'),
+        Keysym::F1 => Key::F1,
+        Keysym::F2 => Key::F2,
+        Keysym::F9 => Key::F9,
         Keysym::F10 => Key::F10,
         Keysym::F11 => Key::F11,
         Keysym::F12 => Key::F12,