Merge pull request #51 from rsahwe/main

Author: thejpster

CHANGELOG.md

@@ -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)

src/layouts/colemak.rs

@@ -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 {

src/layouts/de105.rs

@@ -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 {
@@ -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 {
@@ -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() {