Skip to content

Fix De105Key layout: add missing AltGr keys #49

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 3 commits into from
May 14, 2025
Merged

Fix De105Key layout: add missing AltGr keys #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddc570d
Fix De105Key layout: add missing AltGr keys
rsahwe May 14, 2025
c4e0485
Updated CHANGELOG.md
rsahwe May 14, 2025
91f47af
Updated CHANGELOG.md again
rsahwe May 14, 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

* Fix 102/105-key German layout: Add missing Alt-Gr combinations

## v0.8.0 (13 Sep 2024)

* Add 102/105-key Finnish/Swedish layout
Expand Down
39 changes: 32 additions & 7 deletions src/layouts/de105.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,18 @@ impl KeyboardLayout for De105Key {
}
}
KeyCode::Key2 => {
if modifiers.is_shifted() {
if modifiers.is_altgr() {
DecodedKey::Unicode('²')
} else if modifiers.is_shifted() {
DecodedKey::Unicode('"')
} else {
DecodedKey::Unicode('2')
}
}
KeyCode::Key3 => {
if modifiers.is_shifted() {
if modifiers.is_altgr() {
DecodedKey::Unicode('³')
} else if modifiers.is_shifted() {
DecodedKey::Unicode('§')
} else {
DecodedKey::Unicode('3')
Expand Down Expand Up @@ -69,35 +73,45 @@ impl KeyboardLayout for De105Key {
}
}
KeyCode::Key7 => {
if modifiers.is_shifted() {
if modifiers.is_altgr() {
DecodedKey::Unicode('{')
} else if modifiers.is_shifted() {
DecodedKey::Unicode('/')
} else {
DecodedKey::Unicode('7')
}
}
KeyCode::Key8 => {
if modifiers.is_shifted() {
if modifiers.is_altgr() {
DecodedKey::Unicode('[')
} else if modifiers.is_shifted() {
DecodedKey::Unicode('(')
} else {
DecodedKey::Unicode('8')
}
}
KeyCode::Key9 => {
if modifiers.is_shifted() {
if modifiers.is_altgr() {
DecodedKey::Unicode(']')
} else if modifiers.is_shifted() {
DecodedKey::Unicode(')')
} else {
DecodedKey::Unicode('9')
}
}
KeyCode::Key0 => {
if modifiers.is_shifted() {
if modifiers.is_altgr() {
DecodedKey::Unicode('}')
} else if modifiers.is_shifted() {
DecodedKey::Unicode('=')
} else {
DecodedKey::Unicode('0')
}
}
KeyCode::OemMinus => {
if modifiers.is_shifted() {
if modifiers.is_altgr() {
DecodedKey::Unicode('\\')
} else if modifiers.is_shifted() {
DecodedKey::Unicode('?')
} else {
DecodedKey::Unicode('ß')
Expand Down Expand Up @@ -190,6 +204,17 @@ impl KeyboardLayout for De105Key {
DecodedKey::Unicode('y')
}
}
KeyCode::M => {
if map_to_unicode && modifiers.is_ctrl() {
DecodedKey::Unicode('\u{001A}')
} else if modifiers.is_altgr() {
DecodedKey::Unicode('µ')
} else if modifiers.is_caps() {
DecodedKey::Unicode('M')
} else {
DecodedKey::Unicode('m')
}
}
KeyCode::OemComma => {
if modifiers.is_shifted() {
DecodedKey::Unicode(';')
Expand Down
Loading