rustdesk/qemu-display
1
0
Fork 0
mirror of https://github.com/rustdesk/qemu-display.git synced 2025-07-01 15:25:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu-rdw: lookup keymap from rdw

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-11-15 15:49:01 +04:00
parent 788987acce
commit 543de41f89
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qemu-rdw/src/display.rs
View File

@ -1,10 +1,10 @@
use futures_util::StreamExt; use futures_util::StreamExt;
use glib::{clone, subclass::prelude::*, MainContext}; use glib::{clone, subclass::prelude::*, MainContext};
use gtk::glib; use gtk::glib;
use keycodemap::KEYMAP_XORGEVDEV2QNUM;
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use qemu_display::{Console, ConsoleListenerHandler}; use qemu_display::{Console, ConsoleListenerHandler};
use rdw::{gtk, DisplayExt}; use rdw::{gtk, DisplayExt};
use std::cell::Cell;
#[cfg(unix)] #[cfg(unix)]
use std::os::unix::io::IntoRawFd; use std::os::unix::io::IntoRawFd;
@ -41,6 +41,7 @@ mod imp {
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct Display { pub struct Display {
pub(crate) console: OnceCell<Console>, pub(crate) console: OnceCell<Console>,
keymap: Cell<Option<&'static [u16]>>,
} }
#[glib::object_subclass] #[glib::object_subclass]
@ -60,14 +61,15 @@ mod imp {
self.obj().connect_key_event( self.obj().connect_key_event(
clone!(@weak self as this => move |_, keyval, keycode, event| { clone!(@weak self as this => move |_, keyval, keycode, event| {
log::debug!("key-event: {:?}", (keyval, keycode, event)); let mapped = this.keymap.get().and_then(|m| m.get(keycode as usize)).map(|x| *x as u32);
if let Some(qnum) = KEYMAP_XORGEVDEV2QNUM.get(keycode as usize) { log::debug!("key-{event:?}: {keyval} {keycode} -> {mapped:?}");
if let Some(qnum) = mapped {
MainContext::default().spawn_local(clone!(@weak this => async move { MainContext::default().spawn_local(clone!(@weak this => async move {
if event.contains(rdw::KeyEvent::PRESS) { if event.contains(rdw::KeyEvent::PRESS) {
let _ = this.obj().console().keyboard.press(*qnum as u32).await; let _ = this.obj().console().keyboard.press(qnum).await;
} }
if event.contains(rdw::KeyEvent::RELEASE) { if event.contains(rdw::KeyEvent::RELEASE) {
let _ = this.obj().console().keyboard.release(*qnum as u32).await; let _ = this.obj().console().keyboard.release(qnum).await;
} }
})); }));
} }
@ -146,6 +148,8 @@ mod imp {
fn realize(&self) { fn realize(&self) {
self.parent_realize(); self.parent_realize();
self.keymap.set(rdw::keymap_qnum());
MainContext::default().spawn_local(clone!(@weak self as this => async move { MainContext::default().spawn_local(clone!(@weak self as this => async move {
let console = this.console.get().unwrap(); let console = this.console.get().unwrap();
// we have to use a channel, because widget is not Send.. // we have to use a channel, because widget is not Send..