From db14b27885fff19b8a17026d74a82c3cbe45dec5 Mon Sep 17 00:00:00 2001 From: Charlotte Meyer Date: Mon, 28 Jan 2019 13:06:31 +0100 Subject: [PATCH] Added keyboard logging --- src/input/keyboard.rs | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/input/keyboard.rs b/src/input/keyboard.rs index ec1dc18..58f9c75 100644 --- a/src/input/keyboard.rs +++ b/src/input/keyboard.rs @@ -1,7 +1,10 @@ +use log::debug; + use wlroots::{ compositor, input::{self, keyboard}, - xkbcommon::xkb::keysyms, + xkbcommon::xkb::{keysyms, keysym_get_name}, + WLR_KEY_PRESSED, }; pub struct Keyboard; @@ -14,19 +17,24 @@ impl input::keyboard::Handler for Keyboard { key_event: &keyboard::event::Key, ) { for key in key_event.pressed_keys() { - match key { - keysyms::KEY_Escape => compositor::terminate(), - keysyms::KEY_XF86Switch_VT_1..=keysyms::KEY_XF86Switch_VT_12 => { - compositor_handle - .run(|compositor| { - let backend = compositor.backend_mut(); - if let Some(mut session) = backend.get_session() { - session.change_vt(key - keysyms::KEY_XF86Switch_VT_1 + 1); - } - }) - .unwrap(); + if key_event.key_state() == WLR_KEY_PRESSED { + debug!("Key down: {}", keysym_get_name(key)); + match key { + keysyms::KEY_Escape => compositor::terminate(), + keysyms::KEY_XF86Switch_VT_1..=keysyms::KEY_XF86Switch_VT_12 => { + compositor_handle + .run(|compositor| { + let backend = compositor.backend_mut(); + if let Some(mut session) = backend.get_session() { + session.change_vt(key - keysyms::KEY_XF86Switch_VT_1 + 1); + } + }) + .unwrap(); + } + _ => {} } - _ => {} + } else { + debug!("Key up: {}", keysym_get_name(key)); } } }