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

xwm: Reflect raising floating x11 windows correctly

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-01-23 22:53:15 +01:00
parent f597fb89c6
commit 5b201889a8
1 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/shell/focus/mod.rs
View file

@ -3,6 +3,7 @@ use crate::{
state::Common, state::Common,
utils::prelude::*, utils::prelude::*,
wayland::handlers::xdg_shell::PopupGrabData, wayland::handlers::xdg_shell::PopupGrabData,
xwayland::XWaylandState,
}; };
use indexmap::IndexSet; use indexmap::IndexSet;
use smithay::{ use smithay::{
@ -14,6 +15,8 @@ use std::cell::RefCell;
use self::target::{KeyboardFocusTarget, WindowGroup}; use self::target::{KeyboardFocusTarget, WindowGroup};
use super::CosmicSurface;
pub mod target; pub mod target;
#[derive(Debug, serde::Deserialize, Clone, Copy, PartialEq, Eq)] #[derive(Debug, serde::Deserialize, Clone, Copy, PartialEq, Eq)]
@ -124,7 +127,11 @@ impl Shell {
} }
} }
fn update_active<'a>(&mut self, seats: impl Iterator<Item = &'a Seat<State>>) { fn update_active<'a, 'b>(
&mut self,
seats: impl Iterator<Item = &'a Seat<State>>,
xwms: impl Iterator<Item = &'b mut XWaylandState>,
) {
// update activate status // update activate status
let focused_windows = seats let focused_windows = seats
.flat_map(|seat| { .flat_map(|seat| {
@ -136,10 +143,18 @@ impl Shell {
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let mut xwms = xwms.collect::<Vec<_>>();
for output in self.outputs.iter() { for output in self.outputs.iter() {
let workspace = self.workspaces.active_mut(output); let workspace = self.workspaces.active_mut(output);
for focused in focused_windows.iter() { for focused in focused_windows.iter() {
if workspace.floating_layer.mapped().any(|m| m == focused) { if workspace.floating_layer.mapped().any(|m| m == focused) {
if let CosmicSurface::X11(window) = focused.active_window() {
for xwm in xwms.iter_mut().flat_map(|state| state.xwm.as_mut()) {
if Some(xwm.id()) == window.xwm_id() {
let _ = xwm.raise_window(&window);
}
}
}
workspace.floating_layer.space.raise_element(focused, true); workspace.floating_layer.space.raise_element(focused, true);
} }
} }
@ -160,7 +175,10 @@ impl Common {
) { ) {
Shell::set_focus(state, target, active_seat, serial); Shell::set_focus(state, target, active_seat, serial);
let seats = state.common.seats().cloned().collect::<Vec<_>>(); let seats = state.common.seats().cloned().collect::<Vec<_>>();
state.common.shell.update_active(seats.iter()); state
.common
.shell
.update_active(seats.iter(), state.common.xwayland_state.values_mut());
} }
pub fn refresh_focus(state: &mut State) { pub fn refresh_focus(state: &mut State) {
@ -241,6 +259,9 @@ impl Common {
} }
let seats = state.common.seats().cloned().collect::<Vec<_>>(); let seats = state.common.seats().cloned().collect::<Vec<_>>();
state.common.shell.update_active(seats.iter()) state
.common
.shell
.update_active(seats.iter(), state.common.xwayland_state.values_mut())
} }
} }