leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

input: Only capture Escape, if a grab is active

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-12-13 16:36:49 +00:00
parent 53de98a068
commit a8b401b11d
2 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/input/mod.rs
View file

@ -2,7 +2,7 @@
use crate::{
backend::render::cursor::CursorState,
config::{xkb_config_to_wl, Action, Config, KeyPattern},
config::{xkb_config_to_wl, Action, Config, KeyPattern, KeyModifiers},
shell::{
focus::{target::PointerFocusTarget, FocusDirection},
grabs::{ResizeEdge, SeatMenuGrabState, SeatMoveGrabState},
@ -282,6 +282,8 @@ impl State {
let serial = SERIAL_COUNTER.next_serial();
let time = Event::time_msec(&event);
let keyboard = seat.get_keyboard().unwrap();
let pointer = seat.get_pointer().unwrap();
let is_grabbed = keyboard.is_grabbed() || pointer.is_grabbed();
let current_focus = keyboard.current_focus();
if let Some((action, pattern)) = keyboard
.input(
@ -452,6 +454,28 @@ impl State {
}
}
// cancel grabs
if is_grabbed
&& handle.modified_sym() == Keysym::Escape
&& state == KeyState::Pressed
&& !modifiers.alt
&& !modifiers.ctrl
&& !modifiers.logo
&& !modifiers.shift
{
userdata
.get::<SupressedKeys>()
.unwrap()
.add(&handle, None);
return FilterResult::Intercept(Some((
Action::Escape,
KeyPattern {
modifiers: KeyModifiers::default(),
key: Some(Keysym::Escape),
}
)));
}
// Skip released events for initially surpressed keys
if state == KeyState::Released {
if let Some(tokens) = userdata.get::<SupressedKeys>().unwrap().filter(&handle) {