wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 22:01:47 +03:00
Code Issues Projects Releases Wiki Activity

Implement adding keymap

Browse Source
This commit is contained in:
Timmy Xiao 2024-01-10 17:06:23 -05:00 committed by Wez Furlong
parent 136a043008
commit 25c123af75
No known key found for this signature in database
GPG Key ID: 7A7F66A31EC9B387
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
window/src/os/wayland/seat.rs
View File

@ -1,14 +1,17 @@
use std::borrow::BorrowMut; use std::borrow::BorrowMut;
use std::cell::RefMut;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use std::time::Instant; use std::time::Instant;
use smithay_client_toolkit::seat::keyboard::{KeyEvent, KeyboardHandler}; use smithay_client_toolkit::seat::keyboard::{KeyEvent, KeyboardHandler, Keymap};
use smithay_client_toolkit::seat::{Capability, SeatHandler, SeatState}; use smithay_client_toolkit::seat::{Capability, SeatHandler, SeatState};
use wayland_client::protocol::wl_keyboard::WlKeyboard; use wayland_client::protocol::wl_keyboard::WlKeyboard;
use wayland_client::protocol::wl_seat::WlSeat; use wayland_client::protocol::wl_seat::WlSeat;
use wayland_client::protocol::wl_surface::WlSurface; use wayland_client::protocol::wl_surface::WlSurface;
use wayland_client::{Connection, Proxy, QueueHandle}; use wayland_client::{Connection, Proxy, QueueHandle};
use crate::x11::KeyboardWithFallback;
use super::state::WaylandState; use super::state::WaylandState;
use super::{KeyRepeatState, SurfaceUserData}; use super::{KeyRepeatState, SurfaceUserData};
@ -115,29 +118,29 @@ impl KeyboardHandler for WaylandState {
let Some(&window_id) = self.keyboard_window_id.as_ref() else { let Some(&window_id) = self.keyboard_window_id.as_ref() else {
return; return;
}; };
let Some(mut win) = self.window_by_id(window_id) else { let Some(win) = self.window_by_id(window_id) else {
return; return;
}; };
let inner = win.borrow_mut();
let events = &mut inner.as_ref().borrow_mut().events; let inner = win.as_ref().borrow_mut();
let (mut events, mut key_repeat) =
RefMut::map_split(inner, |w| (&mut w.events, &mut w.key_repeat));
let mapper = self.keyboard_mapper.borrow_mut(); let mapper = self.keyboard_mapper.borrow_mut();
let mapper = mapper.as_mut().expect("no keymap"); let mapper = mapper.as_mut().expect("no keymap");
// TODO: not sure if i should use keysym vs rawcode // TODO: not sure if i should use keysym vs rawcode
let key = event.keysym; let key = event.keysym;
let key_repeat = &mut inner.as_ref().borrow_mut().key_repeat; if let Some(event) = mapper.process_wayland_key(key, true, &mut events) {
if let Some(event) = mapper.process_wayland_key(key, true, events) {
let rep = Arc::new(Mutex::new(KeyRepeatState { let rep = Arc::new(Mutex::new(KeyRepeatState {
when: Instant::now(), when: Instant::now(),
event, event,
})); }));
let kp = &mut inner.as_ref().borrow_mut().key_repeat; key_repeat.replace((key, Arc::clone(&rep)));
kp.replace((key, Arc::clone(&rep)));
KeyRepeatState::schedule(rep, window_id); KeyRepeatState::schedule(rep, window_id);
} else if let Some((cur_key, _)) = key_repeat { } else if let Some((cur_key, _)) = key_repeat.as_mut() {
if *cur_key == key { if *cur_key == key {
key_repeat.take(); key_repeat.take();
} }
@ -157,29 +160,29 @@ impl KeyboardHandler for WaylandState {
let Some(&window_id) = self.keyboard_window_id.as_ref() else { let Some(&window_id) = self.keyboard_window_id.as_ref() else {
return; return;
}; };
let Some(mut win) = self.window_by_id(window_id) else { let Some(win) = self.window_by_id(window_id) else {
return; return;
}; };
let inner = win.borrow_mut();
let events = &mut inner.as_ref().borrow_mut().events; let inner = win.as_ref().borrow_mut();
let (mut events, mut key_repeat) =
RefMut::map_split(inner, |w| (&mut w.events, &mut w.key_repeat));
let mapper = self.keyboard_mapper.borrow_mut(); let mapper = self.keyboard_mapper.borrow_mut();
let mapper = mapper.as_mut().expect("no keymap"); let mapper = mapper.as_mut().expect("no keymap");
// TODO: not sure if i should use keysym vs rawcode // TODO: not sure if i should use keysym vs rawcode
let key = event.keysym; let key = event.keysym;
let key_repeat = &mut inner.as_ref().borrow_mut().key_repeat; if let Some(event) = mapper.process_wayland_key(key, false, &mut events) {
if let Some(event) = mapper.process_wayland_key(key, false, events) {
let rep = Arc::new(Mutex::new(KeyRepeatState { let rep = Arc::new(Mutex::new(KeyRepeatState {
when: Instant::now(), when: Instant::now(),
event, event,
})); }));
let kp = &mut inner.as_ref().borrow_mut().key_repeat; key_repeat.replace((key, Arc::clone(&rep)));
kp.replace((key, Arc::clone(&rep)));
KeyRepeatState::schedule(rep, window_id); KeyRepeatState::schedule(rep, window_id);
} else if let Some((cur_key, _)) = key_repeat { } else if let Some((cur_key, _)) = key_repeat.as_mut() {
if *cur_key == key { if *cur_key == key {
key_repeat.take(); key_repeat.take();
} }
@ -201,9 +204,17 @@ impl KeyboardHandler for WaylandState {
&mut self, &mut self,
_conn: &Connection, _conn: &Connection,
_qh: &QueueHandle<Self>, _qh: &QueueHandle<Self>,
_keyboard: &wayland_client::protocol::wl_keyboard::WlKeyboard, _keyboard: &WlKeyboard,
_keymap: smithay_client_toolkit::seat::keyboard::Keymap<'_>, keymap: Keymap<'_>,
) { ) {
todo!() let keymap_str = keymap.as_string();
match KeyboardWithFallback::new_from_string(keymap_str) {
Ok(k) => {
self.keyboard_mapper.replace(k);
}
Err(err) => {
log::error!("Error processing keymap change: {:#}", err);
}
}
} }
} }