Skip to content

Commit dde53cd

Browse files
thejpsterthejpster
committed
Use Unicode literals
Using Unicode Literals ('\u{0000}') is more consistent with the diagrams I am about to add, and forces us to standardise on one notation instead of a mixture of decimal and hexadecimal.
1 parent 9dace78 commit dde53cd

File tree

7 files changed

+38
-38
lines changed

7 files changed

+38
-38
lines changed

‎src/layouts/azerty.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ impl KeyboardLayout for Azerty {
2020
) -> DecodedKey {
2121
let map_to_unicode = handle_ctrl == HandleControl::MapLettersToUnicode;
2222
match keycode {
23-
KeyCode::Escape => DecodedKey::Unicode(0x1B.into()),
23+
KeyCode::Escape => DecodedKey::Unicode('\u{001B}'),
2424
KeyCode::Oem8 => DecodedKey::Unicode('²'),
2525
KeyCode::Oem5 => {
2626
if modifiers.is_shifted() {
@@ -135,8 +135,8 @@ impl KeyboardLayout for Azerty {
135135
DecodedKey::Unicode('=')
136136
}
137137
}
138-
KeyCode::Backspace => DecodedKey::Unicode(0x08.into()),
139-
KeyCode::Tab => DecodedKey::Unicode(0x09.into()),
138+
KeyCode::Backspace => DecodedKey::Unicode('\u{0008}'),
139+
KeyCode::Tab => DecodedKey::Unicode('\u{0009}'),
140140
KeyCode::Q => {
141141
if map_to_unicode && modifiers.is_ctrl() {
142142
DecodedKey::Unicode('\u{0001}')
@@ -350,7 +350,7 @@ impl KeyboardLayout for Azerty {
350350
}
351351
}
352352
// Enter gives LF, not CRLF or CR
353-
KeyCode::Return => DecodedKey::Unicode(10.into()),
353+
KeyCode::Return => DecodedKey::Unicode('\u{000A}'),
354354
KeyCode::Z => {
355355
if map_to_unicode && modifiers.is_ctrl() {
356356
DecodedKey::Unicode('\u{0017}')
@@ -434,7 +434,7 @@ impl KeyboardLayout for Azerty {
434434
}
435435
}
436436
KeyCode::Spacebar => DecodedKey::Unicode(' '),
437-
KeyCode::Delete => DecodedKey::Unicode(127.into()),
437+
KeyCode::Delete => DecodedKey::Unicode('\u{007F}'),
438438
KeyCode::NumpadDivide => DecodedKey::Unicode('/'),
439439
KeyCode::NumpadMultiply => DecodedKey::Unicode('*'),
440440
KeyCode::NumpadSubtract => DecodedKey::Unicode('-'),
@@ -507,10 +507,10 @@ impl KeyboardLayout for Azerty {
507507
if modifiers.numlock {
508508
DecodedKey::Unicode('.')
509509
} else {
510-
DecodedKey::Unicode(127.into())
510+
DecodedKey::Unicode('\u{007F}')
511511
}
512512
}
513-
KeyCode::NumpadEnter => DecodedKey::Unicode(10.into()),
513+
KeyCode::NumpadEnter => DecodedKey::Unicode('\u{000A}'),
514514
k => DecodedKey::RawKey(k),
515515
}
516516
}

‎src/layouts/colemak.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl KeyboardLayout for Colemak {
2323
DecodedKey::Unicode('`')
2424
}
2525
}
26-
KeyCode::Escape => DecodedKey::Unicode(0x1B.into()),
26+
KeyCode::Escape => DecodedKey::Unicode('\u{001B}'),
2727
KeyCode::Key1 => {
2828
if modifiers.is_shifted() {
2929
DecodedKey::Unicode('!')
@@ -108,8 +108,8 @@ impl KeyboardLayout for Colemak {
108108
DecodedKey::Unicode('=')
109109
}
110110
}
111-
KeyCode::Backspace => DecodedKey::Unicode(0x08.into()),
112-
KeyCode::Tab => DecodedKey::Unicode(0x09.into()),
111+
KeyCode::Backspace => DecodedKey::Unicode('\u{0008}'),
112+
KeyCode::Tab => DecodedKey::Unicode('\u{0009}'),
113113
KeyCode::Q => {
114114
if map_to_unicode && modifiers.is_ctrl() {
115115
DecodedKey::Unicode('\u{0011}')
@@ -317,7 +317,7 @@ impl KeyboardLayout for Colemak {
317317
}
318318
}
319319
// Enter gives LF, not CRLF or CR
320-
KeyCode::Return => DecodedKey::Unicode(10.into()),
320+
KeyCode::Return => DecodedKey::Unicode('\u{000A}'),
321321
KeyCode::Z => {
322322
if map_to_unicode && modifiers.is_ctrl() {
323323
DecodedKey::Unicode('\u{001A}')
@@ -403,7 +403,7 @@ impl KeyboardLayout for Colemak {
403403
}
404404
}
405405
KeyCode::Spacebar => DecodedKey::Unicode(' '),
406-
KeyCode::Delete => DecodedKey::Unicode(127.into()),
406+
KeyCode::Delete => DecodedKey::Unicode('\u{007F}'),
407407
KeyCode::NumpadDivide => DecodedKey::Unicode('/'),
408408
KeyCode::NumpadMultiply => DecodedKey::Unicode('*'),
409409
KeyCode::NumpadSubtract => DecodedKey::Unicode('-'),
@@ -476,10 +476,10 @@ impl KeyboardLayout for Colemak {
476476
if modifiers.numlock {
477477
DecodedKey::Unicode('.')
478478
} else {
479-
DecodedKey::Unicode(127.into())
479+
DecodedKey::Unicode('\u{007F}')
480480
}
481481
}
482-
KeyCode::NumpadEnter => DecodedKey::Unicode(10.into()),
482+
KeyCode::NumpadEnter => DecodedKey::Unicode('\u{000A}'),
483483
k => DecodedKey::RawKey(k),
484484
}
485485
}

‎src/layouts/de105.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ impl KeyboardLayout for De105Key {
1818
) -> DecodedKey {
1919
let map_to_unicode = handle_ctrl == HandleControl::MapLettersToUnicode;
2020
match keycode {
21-
KeyCode::Escape => DecodedKey::Unicode(0x1B.into()),
21+
KeyCode::Escape => DecodedKey::Unicode('\u{001B}'),
2222
KeyCode::Oem8 => {
2323
if modifiers.is_shifted() {
2424
DecodedKey::Unicode('°')
@@ -124,8 +124,8 @@ impl KeyboardLayout for De105Key {
124124
DecodedKey::Unicode('´')
125125
}
126126
}
127-
KeyCode::Backspace => DecodedKey::Unicode(0x08.into()),
128-
KeyCode::Tab => DecodedKey::Unicode(0x09.into()),
127+
KeyCode::Backspace => DecodedKey::Unicode('\u{0008}'),
128+
KeyCode::Tab => DecodedKey::Unicode('\u{0009}'),
129129
KeyCode::Q => {
130130
if map_to_unicode && modifiers.is_ctrl() {
131131
DecodedKey::Unicode('\u{0011}')
@@ -173,7 +173,7 @@ impl KeyboardLayout for De105Key {
173173
DecodedKey::Unicode('+')
174174
}
175175
}
176-
KeyCode::Return => DecodedKey::Unicode(10.into()),
176+
KeyCode::Return => DecodedKey::Unicode('\u{000A}'),
177177
KeyCode::Oem7 => {
178178
if modifiers.is_shifted() {
179179
DecodedKey::Unicode('\'')

‎src/layouts/dvorak_programmer104.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl KeyboardLayout for DVP104Key {
2323
DecodedKey::Unicode('$')
2424
}
2525
}
26-
KeyCode::Escape => DecodedKey::Unicode(0x1B.into()),
26+
KeyCode::Escape => DecodedKey::Unicode('\u{001B}'),
2727
KeyCode::Key1 => {
2828
if modifiers.is_shifted() {
2929
DecodedKey::Unicode('%')
@@ -108,8 +108,8 @@ impl KeyboardLayout for DVP104Key {
108108
DecodedKey::Unicode('=')
109109
}
110110
}
111-
KeyCode::Backspace => DecodedKey::Unicode(0x08.into()),
112-
KeyCode::Tab => DecodedKey::Unicode(0x09.into()),
111+
KeyCode::Backspace => DecodedKey::Unicode('\u{0008}'),
112+
KeyCode::Tab => DecodedKey::Unicode('\u{0009}'),
113113
KeyCode::Q => {
114114
if modifiers.is_shifted() {
115115
DecodedKey::Unicode(':')
@@ -312,7 +312,7 @@ impl KeyboardLayout for DVP104Key {
312312
DecodedKey::Unicode('-')
313313
}
314314
}
315-
KeyCode::Return => DecodedKey::Unicode(10.into()),
315+
KeyCode::Return => DecodedKey::Unicode('\u{000A}'),
316316
KeyCode::Z => {
317317
if modifiers.is_shifted() {
318318
DecodedKey::Unicode('"')
@@ -402,7 +402,7 @@ impl KeyboardLayout for DVP104Key {
402402
}
403403
}
404404
KeyCode::Spacebar => DecodedKey::Unicode(' '),
405-
KeyCode::Delete => DecodedKey::Unicode(127.into()),
405+
KeyCode::Delete => DecodedKey::Unicode('\u{007F}'),
406406
KeyCode::NumpadDivide => DecodedKey::Unicode('/'),
407407
KeyCode::NumpadMultiply => DecodedKey::Unicode('*'),
408408
KeyCode::NumpadSubtract => DecodedKey::Unicode('-'),
@@ -475,10 +475,10 @@ impl KeyboardLayout for DVP104Key {
475475
if modifiers.numlock {
476476
DecodedKey::Unicode('.')
477477
} else {
478-
DecodedKey::Unicode(127.into())
478+
DecodedKey::Unicode('\u{007F}')
479479
}
480480
}
481-
KeyCode::NumpadEnter => DecodedKey::Unicode(10.into()),
481+
KeyCode::NumpadEnter => DecodedKey::Unicode('\u{000A}'),
482482
k => DecodedKey::RawKey(k),
483483
}
484484
}

‎src/layouts/jis109.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ impl KeyboardLayout for Jis109Key {
2222
// hankaku/zenkaku/kanji
2323
DecodedKey::RawKey(KeyCode::Oem8)
2424
}
25-
KeyCode::Escape => DecodedKey::Unicode(0x1B.into()),
25+
KeyCode::Escape => DecodedKey::Unicode('\u{001B}'),
2626
KeyCode::Key1 => {
2727
if modifiers.is_shifted() {
2828
DecodedKey::Unicode('!')

‎src/layouts/no105.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ impl KeyboardLayout for No105Key {
1616
) -> DecodedKey {
1717
let map_to_unicode = handle_ctrl == HandleControl::MapLettersToUnicode;
1818
match keycode {
19-
KeyCode::Escape => DecodedKey::Unicode(0x1B.into()),
19+
KeyCode::Escape => DecodedKey::Unicode('\u{001B}'),
2020
KeyCode::Oem8 => {
2121
if modifiers.is_shifted() {
2222
DecodedKey::Unicode('§')
@@ -126,8 +126,8 @@ impl KeyboardLayout for No105Key {
126126
DecodedKey::Unicode('\\')
127127
}
128128
}
129-
KeyCode::Backspace => DecodedKey::Unicode(0x08.into()),
130-
KeyCode::Tab => DecodedKey::Unicode(0x09.into()),
129+
KeyCode::Backspace => DecodedKey::Unicode('\u{0008}'),
130+
KeyCode::Tab => DecodedKey::Unicode('\u{0009}'),
131131
KeyCode::E => {
132132
if map_to_unicode && modifiers.is_ctrl() {
133133
DecodedKey::Unicode('\u{0005}')
@@ -155,7 +155,7 @@ impl KeyboardLayout for No105Key {
155155
DecodedKey::Unicode('¨')
156156
}
157157
}
158-
KeyCode::Return => DecodedKey::Unicode(10.into()),
158+
KeyCode::Return => DecodedKey::Unicode('\u{000A}'),
159159
KeyCode::Oem7 => {
160160
if modifiers.is_shifted() {
161161
DecodedKey::Unicode('*')
@@ -220,7 +220,7 @@ impl KeyboardLayout for No105Key {
220220
if modifiers.numlock {
221221
DecodedKey::Unicode(',')
222222
} else {
223-
DecodedKey::Unicode(127.into())
223+
DecodedKey::Unicode('\u{007F}')
224224
}
225225
}
226226
e => {

‎src/layouts/us104.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl KeyboardLayout for Us104Key {
2323
DecodedKey::Unicode('`')
2424
}
2525
}
26-
KeyCode::Escape => DecodedKey::Unicode(0x1B.into()),
26+
KeyCode::Escape => DecodedKey::Unicode('\u{001B}'),
2727
KeyCode::Key1 => {
2828
if modifiers.is_shifted() {
2929
DecodedKey::Unicode('!')
@@ -108,8 +108,8 @@ impl KeyboardLayout for Us104Key {
108108
DecodedKey::Unicode('=')
109109
}
110110
}
111-
KeyCode::Backspace => DecodedKey::Unicode(0x08.into()),
112-
KeyCode::Tab => DecodedKey::Unicode(0x09.into()),
111+
KeyCode::Backspace => DecodedKey::Unicode('\u{0008}'),
112+
KeyCode::Tab => DecodedKey::Unicode('\u{0009}'),
113113
KeyCode::Q => {
114114
if map_to_unicode && modifiers.is_ctrl() {
115115
DecodedKey::Unicode('\u{0011}')
@@ -317,7 +317,7 @@ impl KeyboardLayout for Us104Key {
317317
}
318318
}
319319
// Enter gives LF, not CRLF or CR
320-
KeyCode::Return => DecodedKey::Unicode(10.into()),
320+
KeyCode::Return => DecodedKey::Unicode('\u{000A}'),
321321
KeyCode::Z => {
322322
if map_to_unicode && modifiers.is_ctrl() {
323323
DecodedKey::Unicode('\u{001A}')
@@ -403,7 +403,7 @@ impl KeyboardLayout for Us104Key {
403403
}
404404
}
405405
KeyCode::Spacebar => DecodedKey::Unicode(' '),
406-
KeyCode::Delete => DecodedKey::Unicode(127.into()),
406+
KeyCode::Delete => DecodedKey::Unicode('\u{007f}'),
407407
KeyCode::NumpadDivide => DecodedKey::Unicode('/'),
408408
KeyCode::NumpadMultiply => DecodedKey::Unicode('*'),
409409
KeyCode::NumpadSubtract => DecodedKey::Unicode('-'),
@@ -476,10 +476,10 @@ impl KeyboardLayout for Us104Key {
476476
if modifiers.numlock {
477477
DecodedKey::Unicode('.')
478478
} else {
479-
DecodedKey::Unicode(127.into())
479+
DecodedKey::Unicode('\u{007f}')
480480
}
481481
}
482-
KeyCode::NumpadEnter => DecodedKey::Unicode(10.into()),
482+
KeyCode::NumpadEnter => DecodedKey::Unicode('\u{000A}'),
483483
k => DecodedKey::RawKey(k),
484484
}
485485
}

0 commit comments

Comments
 (0)