Skip to content

Fix Ctrl combination handling for Colemak and De105Key layouts #50 #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 1, 2025
Merged

Fix Ctrl combination handling for Colemak and De105Key layouts #50 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4cb203
Fix Ctrl combination handling for Colemak and De105Key layouts
rsahwe May 31, 2025
db8d9dd
Update CHANGELOG.md
rsahwe May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

* Fix Ctrl combination handling for Colemak and De105Key layouts
* Fix 102/105-key German layout: Add missing Alt-Gr combinations

## v0.8.0 (13 Sep 2024)
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/colemak.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ impl KeyboardLayout for Colemak {
}
KeyCode::R => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0012}')
DecodedKey::Unicode('\u{0010}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('P')
} else {
Expand Down
6 changes: 3 additions & 3 deletions src/layouts/de105.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ impl KeyboardLayout for De105Key {
}
KeyCode::Y => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{0014}')
DecodedKey::Unicode('\u{001A}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('Z')
} else {
Expand Down Expand Up @@ -197,7 +197,7 @@ impl KeyboardLayout for De105Key {
}
KeyCode::Z => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{001A}')
DecodedKey::Unicode('\u{0019}')
} else if modifiers.is_caps() {
DecodedKey::Unicode('Y')
} else {
Expand All @@ -206,7 +206,7 @@ impl KeyboardLayout for De105Key {
}
KeyCode::M => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{001A}')
DecodedKey::Unicode('\u{000D}')
} else if modifiers.is_altgr() {
DecodedKey::Unicode('µ')
} else if modifiers.is_caps() {
Expand Down
Loading