fix(engine): swallow game-mutating hotkeys during pointer drags #185

2026-07-14T18:49:04Z

funman300 commented

2026-07-14 18:49:04 +00:00

U (undo), N (new game), Z (zen), D/Space (draw) and G (forfeit) were not gated on an active drag: pressing one mid-drag fired a StateChangedEvent whose card re-sync inserted a CardAnim on the dragged cards, fighting follow_drag's per-frame Transform writes (jittering XY, animated Z) and leaving DragState origin indices stale against the mutated state.

handle_keyboard_core and handle_keyboard_forfeit now reuse the mutual-exclusion guard handle_selection_keys already documents: skip while DragState is non-idle, unless it carries the keyboard-lift sentinel (KEYBOARD_DRAG_TOUCH_ID) — that lift is already dropped cleanly by clear_selection_on_state_change, so blocking it would regress keyboard play. H (hint) is untouched; it never mutates state.

Adds five tests: U fires when idle, U swallowed during mouse drag, D swallowed during touch drag, U still allowed during keyboard lift, G swallowed during mouse drag.

Gates: cargo test --workspace and cargo clippy --workspace -- -D warnings both exit 0.

🤖 Generated with Claude Code

U (undo), N (new game), Z (zen), D/Space (draw) and G (forfeit) were not gated on an active drag: pressing one mid-drag fired a StateChangedEvent whose card re-sync inserted a `CardAnim` on the dragged cards, fighting `follow_drag`'s per-frame Transform writes (jittering XY, animated Z) and leaving `DragState` origin indices stale against the mutated state. `handle_keyboard_core` and `handle_keyboard_forfeit` now reuse the mutual-exclusion guard `handle_selection_keys` already documents: skip while `DragState` is non-idle, unless it carries the keyboard-lift sentinel (`KEYBOARD_DRAG_TOUCH_ID`) — that lift is already dropped cleanly by `clear_selection_on_state_change`, so blocking it would regress keyboard play. H (hint) is untouched; it never mutates state. Adds five tests: U fires when idle, U swallowed during mouse drag, D swallowed during touch drag, U still allowed during keyboard lift, G swallowed during mouse drag. Gates: `cargo test --workspace` and `cargo clippy --workspace -- -D warnings` both exit 0. 🤖 Generated with [Claude Code](https://claude.com/claude-code)

funman300 added 1 commit 2026-07-14 18:49:04 +00:00

fix(engine): swallow game-mutating hotkeys during pointer drags

Test / fmt (pull_request) Successful in 6s

Details

Test / test (pull_request) Successful in 4m43s

Details

5430d4c3ab

U (undo), N (new game), Z (zen), D/Space (draw) and G (forfeit) were
not gated on an active drag, so pressing one mid-drag fired a
StateChangedEvent whose card re-sync inserted a `CardAnim` on the
dragged cards — fighting `follow_drag`'s per-frame Transform writes
(jittering XY, animated Z) and leaving `DragState` origin indices
stale against the mutated state.

`handle_keyboard_core` and `handle_keyboard_forfeit` now reuse the
mutual-exclusion guard `handle_selection_keys` already documents: skip
while `DragState` is non-idle, unless it is the keyboard-lift sentinel
(`KEYBOARD_DRAG_TOUCH_ID`), whose lift is already dropped cleanly by
`clear_selection_on_state_change`.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

funman300 merged commit 9081a9916c into master

2026-07-14 18:49:18 +00:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: funman300/Ferrous-Solitaire#185