From 44b8a88de65b51dfc851808174eef827603a6c39 Mon Sep 17 00:00:00 2001 From: Victor Timofei Date: Sat, 11 Dec 2021 14:14:50 +0200 Subject: [PATCH] Use ctrl as mod key for debugging purposes --- anvil/src/input_handler.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/anvil/src/input_handler.rs b/anvil/src/input_handler.rs index 0958900..044ee49 100644 --- a/anvil/src/input_handler.rs +++ b/anvil/src/input_handler.rs @@ -526,9 +526,8 @@ enum KeyAction { } fn process_keyboard_shortcut(modifiers: ModifiersState, keysym: Keysym) -> Option { - if modifiers.ctrl && modifiers.alt && keysym == xkb::KEY_BackSpace - || modifiers.logo && keysym == xkb::KEY_q - { + let modkey = modifiers.ctrl; + if modkey && keysym == xkb::KEY_q { // ctrl+alt+backspace = quit // logo + q = quit Some(KeyAction::Quit) @@ -537,14 +536,14 @@ fn process_keyboard_shortcut(modifiers: ModifiersState, keysym: Keysym) -> Optio Some(KeyAction::VtSwitch( (keysym - xkb::KEY_XF86Switch_VT_1 + 1) as i32, )) - } else if modifiers.logo && keysym == xkb::KEY_Return { + } else if modkey && keysym == xkb::KEY_Return { // run terminal - Some(KeyAction::Run("weston-terminal".into())) - } else if modifiers.logo && keysym >= xkb::KEY_1 && keysym <= xkb::KEY_9 { + Some(KeyAction::Run("alacritty".into())) + } else if modkey && keysym >= xkb::KEY_1 && keysym <= xkb::KEY_9 { Some(KeyAction::Screen((keysym - xkb::KEY_1) as usize)) - } else if modifiers.logo && modifiers.shift && keysym == xkb::KEY_M { + } else if modkey && modifiers.shift && keysym == xkb::KEY_M { Some(KeyAction::ScaleDown) - } else if modifiers.logo && modifiers.shift && keysym == xkb::KEY_P { + } else if modkey && modifiers.shift && keysym == xkb::KEY_P { Some(KeyAction::ScaleUp) } else { None