limeth/acid
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Work-around for unsupported unicode control keys in Slint

Browse source
This commit is contained in:
Jakub Hlusička 2026-01-20 01:59:18 +01:00
parent c98acc4da4
commit 35c017535e
1 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
firmware2/src/ui/backend.rs
View file

@ -1,16 +1,16 @@
use core::{cell::RefCell, time::Duration}; use core::{cell::RefCell, time::Duration};
use alloc::rc::Rc; use alloc::{rc::Rc, string::ToString};
use esp_hal::time::Instant; use esp_hal::time::Instant;
use log::{debug, info}; use log::{debug, info, warn};
use slint::{ use slint::{
PhysicalSize, SharedString, WindowSize, PhysicalSize, SharedString, ToSharedString, WindowSize,
platform::{ platform::{
Key, WindowEvent, Key, WindowEvent,
software_renderer::{RenderingRotation, RepaintBufferType, Rgb565Pixel, SoftwareRenderer}, software_renderer::{RenderingRotation, RepaintBufferType, Rgb565Pixel, SoftwareRenderer},
}, },
}; };
use xkbcommon::xkb; use xkbcommon::xkb::{self, Keysym};
use crate::keymap::{KEY_MESSAGE_CHANNEL, TryFromKeysym}; use crate::keymap::{KEY_MESSAGE_CHANNEL, TryFromKeysym};
@ -59,12 +59,42 @@ impl slint::platform::Platform for SlintBackend {
{ {
if let Some(window) = self.window.borrow().clone() { if let Some(window) = self.window.borrow().clone() {
// Handle key presses // Handle key presses
while let Ok(key_message) = KEY_MESSAGE_CHANNEL.try_receive() { while let Ok(mut key_message) = KEY_MESSAGE_CHANNEL.try_receive() {
debug!("key_message = {key_message:?}"); debug!("key_message = {key_message:?}");
let text = key_message.string.map(SharedString::from).or_else(|| { if let Some(string) = key_message.string.as_ref()
Key::try_from_keysym(key_message.keysym).map(SharedString::from) && (Keysym::a..=Keysym::z).contains(&key_message.keysym)
}); {
if let &[code] = string.as_bytes() {
const UNICODE_CTRL_A: char = '\u{1}';
let letter_index_from_keysym =
key_message.keysym.raw().wrapping_sub(Keysym::a.raw());
let letter_index_from_string =
(code as u32).wrapping_sub(UNICODE_CTRL_A as u32);
if letter_index_from_keysym == letter_index_from_string {
key_message.keysym =
Keysym::new(Keysym::a.raw() + letter_index_from_keysym);
// TODO: Avoid allocation
key_message.string = Some(
((b'a' + letter_index_from_keysym as u8) as char).to_string(),
);
info!(
"Translating CTRL-{letter} to {letter}",
letter = (b'A' + letter_index_from_keysym as u8) as char
);
}
}
}
// let text = key_message.string.map(SharedString::from).or_else(|| {
// Key::try_from_keysym(key_message.keysym).map(SharedString::from)
// });
let text = Key::try_from_keysym(key_message.keysym)
.map(SharedString::from)
.or_else(|| key_message.string.map(SharedString::from));
debug!("text = {text:?}"); debug!("text = {text:?}");