Feat/wlroots keyboard layout fix - #1395
Merged
Merged
Conversation
When running Sway as a nested compositor inside Wolf, pressing modifier keys (Shift, Ctrl, Alt) would reset non-US keyboard layouts to US. Root cause: The Wayland wl_keyboard.modifiers event bundles modifier state together with layout group. wlroots calls xkb_state_update_mask() with the parent compositor's group, overriding Sway's own layout. Fix: Patch wlroots to add WLR_IGNORE_PARENT_KEYBOARD_LAYOUT env var. When set to "1", wlroots preserves its own layout group instead of accepting the parent's group value. Implementation uses Debian packaging (dpkg-buildpackage + quilt patches) to maintain the patch cleanly. The patched library is versioned with -helix1 suffix (e.g., 0.17.4-2helix1). 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
Configure XKB_DEFAULT_LAYOUT and XKB_DEFAULT_OPTIONS for the inner compositor (Sway). Reads from environment with sensible defaults: - XKB_DEFAULT_LAYOUT: us,gb,fr (US, British, French) - XKB_DEFAULT_OPTIONS: caps:ctrl_nocaps (Caps Lock as Ctrl) This complements the wlroots patch that preserves Sway's layout when receiving modifiers events from the outer compositor. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This reverts commit 02a9042.
lukemarsden
added a commit
that referenced
this pull request
May 13, 2026
Adds two test cases for handleUserCreatedThread that prove Fix 2 is correctly wired: - TestUserCreatedThread_PhantomDraftGuard_RefusesWhenEmptyWorkSessionExists: spec_task already has an active work_session whose helix_session has zero interactions. The handler must short-circuit BEFORE calling CreateSession / CreateSpecTaskWorkSession / CreateSpecTaskZedThread. Verified to FAIL when the PHANTOM-DRAFT GUARD block in websocket_external_agent_sync.go is removed (gomock surfaces "Unexpected call to *store.MockStore.CreateSession", which is precisely the regression signal we want). - TestUserCreatedThread_PhantomDraftGuard_AllowsWhenExistingSessionHasInteractions: positive control — when the existing work_session HAS interactions, the guard does not fire and the normal create path runs. Also adds the new ListSpecTaskZedThreads mock expectation to the existing TestUserCreatedThread_CreatesWorkSessionForSpectask so it keeps passing under the new code path (CI build #1395 was failing because the existing test wasn't aware of the new ListSpecTaskZedThreads call introduced by the guard). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.