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

focus: Check if X11 surface matches in KeyboardFocus::replace()

Browse source 
Tested on `SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS=1 supertux2`, using
XWayland. If the game starts with fullscreen configured, it minimizes
immediately on start. But after this change, this no longer happens.

This hopefully will improve behaviors with various X11/wine fullscreen
clients. It may fix
https://github.com/pop-os/cosmic-comp/issues/1510, though looking at the
video the behavior there may be a bit different.
This commit is contained in:
Ian Douglas Scott 2025-09-30 10:22:10 -07:00 • committed by Victoria Brekenfeld
parent 9e66bed9d6
commit 346f055fdc
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/shell/focus/target.rs
View file

@ -494,7 +494,7 @@ impl KeyboardTarget<State> for KeyboardFocusTarget {
} }
fn replace( fn replace(
&self, &self,
replaced: <State as smithay::input::SeatHandler>::KeyboardFocus, replaced: Self,
seat: &Seat<State>, seat: &Seat<State>,
data: &mut State, data: &mut State,
keys: Vec<KeysymHandle<'_>>, keys: Vec<KeysymHandle<'_>>,
@ -504,6 +504,9 @@ impl KeyboardTarget<State> for KeyboardFocusTarget {
if !replaced if !replaced
.wl_surface() .wl_surface()
.is_some_and(|s| Some(s) == self.wl_surface()) .is_some_and(|s| Some(s) == self.wl_surface())
&& !replaced
.x11_surface()
.is_some_and(|s| Some(s) == self.x11_surface())
{ {
KeyboardTarget::leave(&replaced, seat, data, serial); KeyboardTarget::leave(&replaced, seat, data, serial);
KeyboardTarget::enter(self, seat, data, keys, serial); KeyboardTarget::enter(self, seat, data, keys, serial);