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

Only cancel the keyboard grabs that we initiate

Browse source
This commit is contained in:
Joe Neeman 2025-01-17 21:25:43 +07:00 • committed by Victoria Brekenfeld
parent 53d2cf01aa
commit 38366700de
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/input/mod.rs
View file

@ -19,7 +19,7 @@ use crate::{
grabs::{ReleaseMode, ResizeEdge}, grabs::{ReleaseMode, ResizeEdge},
layout::{ layout::{
floating::ResizeGrabMarker, floating::ResizeGrabMarker,
tiling::{NodeDesc, TilingLayout}, tiling::{NodeDesc, SwapWindowGrab, TilingLayout},
}, },
SeatExt, Trigger, SeatExt, Trigger,
}, },
@ -44,7 +44,7 @@ use smithay::{
TabletToolButtonEvent, TabletToolEvent, TabletToolProximityEvent, TabletToolTipEvent, TabletToolButtonEvent, TabletToolEvent, TabletToolProximityEvent, TabletToolTipEvent,
TabletToolTipState, TouchEvent, TabletToolTipState, TouchEvent,
}, },
desktop::{utils::under_from_surface_tree, WindowSurfaceType}, desktop::{utils::under_from_surface_tree, PopupKeyboardGrab, WindowSurfaceType},
input::{ input::{
keyboard::{FilterResult, KeysymHandle, ModifiersState}, keyboard::{FilterResult, KeysymHandle, ModifiersState},
pointer::{ pointer::{
@ -1428,7 +1428,12 @@ impl State {
let keyboard = seat.get_keyboard().unwrap(); let keyboard = seat.get_keyboard().unwrap();
let pointer = seat.get_pointer().unwrap(); let pointer = seat.get_pointer().unwrap();
let is_grabbed = keyboard.is_grabbed() || pointer.is_grabbed(); // We're only interested in filtering keyboard grabs if we initiated them.
// The easiest way to check that is to check the type of the grab.
let keyboard_grabbed = keyboard.with_grab(|_serial, grab| {
grab.is::<SwapWindowGrab>() || grab.is::<PopupKeyboardGrab<State>>()
}) == Some(true);
let is_grabbed = keyboard_grabbed || pointer.is_grabbed();
let current_focus = keyboard.current_focus(); let current_focus = keyboard.current_focus();
//this should fall back to active output since there may not be a focused output //this should fall back to active output since there may not be a focused output