aboutsummaryrefslogtreecommitdiffstats
path: root/src/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/api')
-rw-r--r--src/api/wayland/context.rs15
-rw-r--r--src/api/wayland/events.rs12
-rw-r--r--src/api/wayland/keyboard.rs229
-rw-r--r--src/api/wayland/mod.rs1
4 files changed, 255 insertions, 2 deletions
diff --git a/src/api/wayland/context.rs b/src/api/wayland/context.rs
index 4b39d85..285f50c 100644
--- a/src/api/wayland/context.rs
+++ b/src/api/wayland/context.rs
@@ -14,6 +14,7 @@ use wayland_client::wayland::shell::WlShell;
use wayland_client::wayland::shm::WlShm;
use wayland_client::wayland::subcompositor::WlSubcompositor;
+use super::wayland_kbd::MappedKeyboard;
use super::wayland_window::DecoratedSurface;
lazy_static! {
@@ -34,6 +35,7 @@ pub struct WaylandFocuses {
pub pointer: Option<WlPointer>,
pub pointer_on: Option<ProxyId>,
pub pointer_at: Option<(f64, f64)>,
+ pub keyboard: Option<MappedKeyboard>,
pub keyboard_on: Option<ProxyId>
}
@@ -72,6 +74,7 @@ impl WaylandContext {
pointer: None,
pointer_on: None,
pointer_at: None,
+ keyboard: None,
keyboard_on: None
})
})
@@ -119,11 +122,19 @@ impl WaylandContext {
self.inner.display.dispatch_pending().unwrap();
let mut iterator = self.iterator.lock().unwrap();
let mut focuses = self.focuses.lock().unwrap();
- let known_ids = self.known_surfaces.lock().unwrap();
+ let known_surfaces = self.known_surfaces.lock().unwrap();
let queues = self.queues.lock().unwrap();
+ // first, keyboard events
+ let kdb_evts = super::keyboard::translate_kbd_events(&mut *focuses, &known_surfaces);
+ for (evt, id) in kdb_evts {
+ if let Some(q) = queues.get(&id) {
+ q.lock().unwrap().push_back(evt);
+ }
+ }
+ // then, the rest
for evt in &mut *iterator {
if let Some((evt, id)) = super::events::translate_event(
- evt, &mut *focuses, &known_ids,
+ evt, &mut *focuses, &known_surfaces,
self.inner.seat.as_ref().map(|s| &s.0))
{
if let Some(q) = queues.get(&id) {
diff --git a/src/api/wayland/events.rs b/src/api/wayland/events.rs
index 6a7a2e7..8aeddac 100644
--- a/src/api/wayland/events.rs
+++ b/src/api/wayland/events.rs
@@ -12,6 +12,8 @@ use wayland_client::wayland::seat::{WlSeat, WlSeatEvent, WlPointerEvent,
WlPointerButtonState,
WlPointerAxis, WlSeatCapability};
+use super::wayland_kbd::MappedKeyboard;
+
use super::context::WaylandFocuses;
pub fn translate_event(
@@ -29,6 +31,16 @@ pub fn translate_event(
focuses.pointer = Some(seat.get_pointer());
}
}
+ if cap.contains(WlSeatCapability::Keyboard) && focuses.keyboard.is_none() {
+ if let Some(seat) = seat {
+ match MappedKeyboard::new(seat) {
+ Ok(mk) => {
+ focuses.keyboard = Some(mk)
+ },
+ Err(_) => {}
+ }
+ }
+ }
None
},
_ => None
diff --git a/src/api/wayland/keyboard.rs b/src/api/wayland/keyboard.rs
new file mode 100644
index 0000000..3190b87
--- /dev/null
+++ b/src/api/wayland/keyboard.rs
@@ -0,0 +1,229 @@
+use std::collections::HashSet;
+
+use Event as GlutinEvent;
+use ElementState;
+use VirtualKeyCode;
+
+use wayland_client::ProxyId;
+use wayland_client::wayland::seat::{WlKeyboardEvent,WlKeyboardKeyState};
+
+use super::wayland_kbd::MappedKeyboardEvent;
+
+use super::context::WaylandFocuses;
+
+pub fn translate_kbd_events(
+ focuses: &mut WaylandFocuses,
+ known_surfaces: &HashSet<ProxyId>,
+) -> Vec<(GlutinEvent, ProxyId)> {
+ let mut out = Vec::new();
+ if let Some(mkbd) = focuses.keyboard.as_mut() {
+ for evt in mkbd {
+ match evt {
+ MappedKeyboardEvent::KeyEvent(kevt) => {
+ if let Some(surface) = focuses.keyboard_on {
+ let vkcode = match kevt.keycode {
+ 1 => Some(VirtualKeyCode::Escape),
+ 2 => Some(VirtualKeyCode::Key1),
+ 3 => Some(VirtualKeyCode::Key2),
+ 4 => Some(VirtualKeyCode::Key3),
+ 5 => Some(VirtualKeyCode::Key4),
+ 6 => Some(VirtualKeyCode::Key5),
+ 7 => Some(VirtualKeyCode::Key6),
+ 8 => Some(VirtualKeyCode::Key7),
+ 9 => Some(VirtualKeyCode::Key8),
+ 10 => Some(VirtualKeyCode::Key9),
+ 11 => Some(VirtualKeyCode::Key0),
+ _ => kevt.as_symbol().and_then(keysym_to_vkey)
+ };
+ let text = kevt.as_utf8();
+ out.push((
+ GlutinEvent::KeyboardInput(
+ match kevt.keystate {
+ WlKeyboardKeyState::Pressed => ElementState::Pressed,
+ WlKeyboardKeyState::Released =>ElementState::Released
+ },
+ (kevt.keycode & 0xff) as u8,
+ vkcode
+ ),
+ surface
+ ));
+ if let Some(c) = text.and_then(|s| s.chars().next()) {
+ out.push((
+ GlutinEvent::ReceivedCharacter(c),
+ surface
+ ));
+ }
+ }
+
+ }
+ MappedKeyboardEvent::Other(oevt) => match oevt {
+ WlKeyboardEvent::Enter(_, surface, _) => {
+ if known_surfaces.contains(&surface) {
+ focuses.keyboard_on = Some(surface);
+ out.push((GlutinEvent::Focused(true), surface));
+ }
+ },
+ WlKeyboardEvent::Leave(_, surface) => {
+ if known_surfaces.contains(&surface) {
+ focuses.keyboard_on = None;
+ out.push((GlutinEvent::Focused(false), surface));
+ }
+ }
+ _ => {}
+ }
+ }
+ }
+ }
+ out
+}
+
+pub fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
+ use super::wayland_kbd::keysyms;
+ match keysym {
+ // letters
+ keysyms::XKB_KEY_A | keysyms::XKB_KEY_a => Some(VirtualKeyCode::A),
+ keysyms::XKB_KEY_B | keysyms::XKB_KEY_b => Some(VirtualKeyCode::B),
+ keysyms::XKB_KEY_C | keysyms::XKB_KEY_c => Some(VirtualKeyCode::C),
+ keysyms::XKB_KEY_D | keysyms::XKB_KEY_d => Some(VirtualKeyCode::D),
+ keysyms::XKB_KEY_E | keysyms::XKB_KEY_e => Some(VirtualKeyCode::E),
+ keysyms::XKB_KEY_F | keysyms::XKB_KEY_f => Some(VirtualKeyCode::F),
+ keysyms::XKB_KEY_G | keysyms::XKB_KEY_g => Some(VirtualKeyCode::G),
+ keysyms::XKB_KEY_H | keysyms::XKB_KEY_h => Some(VirtualKeyCode::H),
+ keysyms::XKB_KEY_I | keysyms::XKB_KEY_i => Some(VirtualKeyCode::I),
+ keysyms::XKB_KEY_J | keysyms::XKB_KEY_j => Some(VirtualKeyCode::J),
+ keysyms::XKB_KEY_K | keysyms::XKB_KEY_k => Some(VirtualKeyCode::K),
+ keysyms::XKB_KEY_L | keysyms::XKB_KEY_l => Some(VirtualKeyCode::L),
+ keysyms::XKB_KEY_M | keysyms::XKB_KEY_m => Some(VirtualKeyCode::M),
+ keysyms::XKB_KEY_N | keysyms::XKB_KEY_n => Some(VirtualKeyCode::N),
+ keysyms::XKB_KEY_O | keysyms::XKB_KEY_o => Some(VirtualKeyCode::O),
+ keysyms::XKB_KEY_P | keysyms::XKB_KEY_p => Some(VirtualKeyCode::P),
+ keysyms::XKB_KEY_Q | keysyms::XKB_KEY_q => Some(VirtualKeyCode::Q),
+ keysyms::XKB_KEY_R | keysyms::XKB_KEY_r => Some(VirtualKeyCode::R),
+ keysyms::XKB_KEY_S | keysyms::XKB_KEY_s => Some(VirtualKeyCode::S),
+ keysyms::XKB_KEY_T | keysyms::XKB_KEY_t => Some(VirtualKeyCode::T),
+ keysyms::XKB_KEY_U | keysyms::XKB_KEY_u => Some(VirtualKeyCode::U),
+ keysyms::XKB_KEY_V | keysyms::XKB_KEY_v => Some(VirtualKeyCode::V),
+ keysyms::XKB_KEY_W | keysyms::XKB_KEY_w => Some(VirtualKeyCode::W),
+ keysyms::XKB_KEY_X | keysyms::XKB_KEY_x => Some(VirtualKeyCode::X),
+ keysyms::XKB_KEY_Y | keysyms::XKB_KEY_y => Some(VirtualKeyCode::Y),
+ keysyms::XKB_KEY_Z | keysyms::XKB_KEY_z => Some(VirtualKeyCode::Z),
+ // F--
+ keysyms::XKB_KEY_F1 => Some(VirtualKeyCode::F1),
+ keysyms::XKB_KEY_F2 => Some(VirtualKeyCode::F2),
+ keysyms::XKB_KEY_F3 => Some(VirtualKeyCode::F3),
+ keysyms::XKB_KEY_F4 => Some(VirtualKeyCode::F4),
+ keysyms::XKB_KEY_F5 => Some(VirtualKeyCode::F5),
+ keysyms::XKB_KEY_F6 => Some(VirtualKeyCode::F6),
+ keysyms::XKB_KEY_F7 => Some(VirtualKeyCode::F7),
+ keysyms::XKB_KEY_F8 => Some(VirtualKeyCode::F8),
+ keysyms::XKB_KEY_F9 => Some(VirtualKeyCode::F9),
+ keysyms::XKB_KEY_F10 => Some(VirtualKeyCode::F10),
+ keysyms::XKB_KEY_F11 => Some(VirtualKeyCode::F11),
+ keysyms::XKB_KEY_F12 => Some(VirtualKeyCode::F12),
+ keysyms::XKB_KEY_F13 => Some(VirtualKeyCode::F13),
+ keysyms::XKB_KEY_F14 => Some(VirtualKeyCode::F14),
+ keysyms::XKB_KEY_F15 => Some(VirtualKeyCode::F15),
+ // flow control
+ keysyms::XKB_KEY_Print => Some(VirtualKeyCode::Snapshot),
+ keysyms::XKB_KEY_Scroll_Lock => Some(VirtualKeyCode::Scroll),
+ keysyms::XKB_KEY_Pause => Some(VirtualKeyCode::Pause),
+ keysyms::XKB_KEY_Insert => Some(VirtualKeyCode::Insert),
+ keysyms::XKB_KEY_Home => Some(VirtualKeyCode::Home),
+ keysyms::XKB_KEY_Delete => Some(VirtualKeyCode::Delete),
+ keysyms::XKB_KEY_End => Some(VirtualKeyCode::End),
+ keysyms::XKB_KEY_Page_Down => Some(VirtualKeyCode::PageDown),
+ keysyms::XKB_KEY_Page_Up => Some(VirtualKeyCode::PageUp),
+ // arrows
+ keysyms::XKB_KEY_Left => Some(VirtualKeyCode::Left),
+ keysyms::XKB_KEY_Up => Some(VirtualKeyCode::Up),
+ keysyms::XKB_KEY_Right => Some(VirtualKeyCode::Right),
+ keysyms::XKB_KEY_Down => Some(VirtualKeyCode::Down),
+ //
+ keysyms::XKB_KEY_BackSpace => Some(VirtualKeyCode::Back),
+ keysyms::XKB_KEY_Return => Some(VirtualKeyCode::Return),
+ keysyms::XKB_KEY_space => Some(VirtualKeyCode::Space),
+ // keypad
+ keysyms::XKB_KEY_Num_Lock => Some(VirtualKeyCode::Numlock),
+ keysyms::XKB_KEY_KP_0 => Some(VirtualKeyCode::Numpad0),
+ keysyms::XKB_KEY_KP_1 => Some(VirtualKeyCode::Numpad1),
+ keysyms::XKB_KEY_KP_2 => Some(VirtualKeyCode::Numpad2),
+ keysyms::XKB_KEY_KP_3 => Some(VirtualKeyCode::Numpad3),
+ keysyms::XKB_KEY_KP_4 => Some(VirtualKeyCode::Numpad4),
+ keysyms::XKB_KEY_KP_5 => Some(VirtualKeyCode::Numpad5),
+ keysyms::XKB_KEY_KP_6 => Some(VirtualKeyCode::Numpad6),
+ keysyms::XKB_KEY_KP_7 => Some(VirtualKeyCode::Numpad7),
+ keysyms::XKB_KEY_KP_8 => Some(VirtualKeyCode::Numpad8),
+ keysyms::XKB_KEY_KP_9 => Some(VirtualKeyCode::Numpad9),
+ // misc
+ // => Some(VirtualKeyCode::AbntC1),
+ // => Some(VirtualKeyCode::AbntC2),
+ keysyms::XKB_KEY_plus => Some(VirtualKeyCode::Add),
+ keysyms::XKB_KEY_apostrophe => Some(VirtualKeyCode::Apostrophe),
+ // => Some(VirtualKeyCode::Apps),
+ // => Some(VirtualKeyCode::At),
+ // => Some(VirtualKeyCode::Ax),
+ keysyms::XKB_KEY_backslash => Some(VirtualKeyCode::Backslash),
+ // => Some(VirtualKeyCode::Calculator),
+ // => Some(VirtualKeyCode::Capital),
+ keysyms::XKB_KEY_colon => Some(VirtualKeyCode::Colon),
+ keysyms::XKB_KEY_comma => Some(VirtualKeyCode::Comma),
+ // => Some(VirtualKeyCode::Convert),
+ // => Some(VirtualKeyCode::Decimal),
+ // => Some(VirtualKeyCode::Divide),
+ keysyms::XKB_KEY_equal => Some(VirtualKeyCode::Equals),
+ // => Some(VirtualKeyCode::Grave),
+ // => Some(VirtualKeyCode::Kana),
+ // => Some(VirtualKeyCode::Kanji),
+ keysyms::XKB_KEY_Alt_L => Some(VirtualKeyCode::LAlt),
+ // => Some(VirtualKeyCode::LBracket),
+ keysyms::XKB_KEY_Control_L => Some(VirtualKeyCode::LControl),
+ // => Some(VirtualKeyCode::LMenu),
+ keysyms::XKB_KEY_Shift_L => Some(VirtualKeyCode::LShift),
+ // => Some(VirtualKeyCode::LWin),
+ // => Some(VirtualKeyCode::Mail),
+ // => Some(VirtualKeyCode::MediaSelect),
+ // => Some(VirtualKeyCode::MediaStop),
+ keysyms::XKB_KEY_minus => Some(VirtualKeyCode::Minus),
+ keysyms::XKB_KEY_asterisk => Some(VirtualKeyCode::Multiply),
+ // => Some(VirtualKeyCode::Mute),
+ // => Some(VirtualKeyCode::MyComputer),
+ // => Some(VirtualKeyCode::NextTrack),
+ // => Some(VirtualKeyCode::NoConvert),
+ keysyms::XKB_KEY_KP_Separator => Some(VirtualKeyCode::NumpadComma),
+ keysyms::XKB_KEY_KP_Enter => Some(VirtualKeyCode::NumpadEnter),
+ keysyms::XKB_KEY_KP_Equal => Some(VirtualKeyCode::NumpadEquals),
+ // => Some(VirtualKeyCode::OEM102),
+ // => Some(VirtualKeyCode::Period),
+ // => Some(VirtualKeyCode::Playpause),
+ // => Some(VirtualKeyCode::Power),
+ // => Some(VirtualKeyCode::Prevtrack),
+ keysyms::XKB_KEY_Alt_R => Some(VirtualKeyCode::RAlt),
+ // => Some(VirtualKeyCode::RBracket),
+ keysyms::XKB_KEY_Control_R => Some(VirtualKeyCode::RControl),
+ // => Some(VirtualKeyCode::RMenu),
+ keysyms::XKB_KEY_Shift_R => Some(VirtualKeyCode::RShift),
+ // => Some(VirtualKeyCode::RWin),
+ keysyms::XKB_KEY_semicolon => Some(VirtualKeyCode::Semicolon),
+ keysyms::XKB_KEY_slash => Some(VirtualKeyCode::Slash),
+ // => Some(VirtualKeyCode::Sleep),
+ // => Some(VirtualKeyCode::Stop),
+ // => Some(VirtualKeyCode::Subtract),
+ // => Some(VirtualKeyCode::Sysrq),
+ keysyms::XKB_KEY_Tab => Some(VirtualKeyCode::Tab),
+ // => Some(VirtualKeyCode::Underline),
+ // => Some(VirtualKeyCode::Unlabeled),
+ keysyms::XKB_KEY_XF86AudioLowerVolume => Some(VirtualKeyCode::VolumeDown),
+ keysyms::XKB_KEY_XF86AudioRaiseVolume => Some(VirtualKeyCode::VolumeUp),
+ // => Some(VirtualKeyCode::Wake),
+ // => Some(VirtualKeyCode::Webback),
+ // => Some(VirtualKeyCode::WebFavorites),
+ // => Some(VirtualKeyCode::WebForward),
+ // => Some(VirtualKeyCode::WebHome),
+ // => Some(VirtualKeyCode::WebRefresh),
+ // => Some(VirtualKeyCode::WebSearch),
+ // => Some(VirtualKeyCode::WebStop),
+ // => Some(VirtualKeyCode::Yen),
+ // fallback
+ _ => None
+ }
+} \ No newline at end of file
diff --git a/src/api/wayland/mod.rs b/src/api/wayland/mod.rs
index f2e3b2f..b6a2602 100644
--- a/src/api/wayland/mod.rs
+++ b/src/api/wayland/mod.rs
@@ -8,6 +8,7 @@ extern crate wayland_window;
mod context;
mod events;
+mod keyboard;
mod monitor;
mod window;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 23:50:53 +0000