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

state: Move Xwayland state into shell

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-11-22 12:44:11 +01:00 • committed by Victoria Brekenfeld
parent 41a69cfc9f
commit c09a735289
8 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/xwayland.rs
View file

@ -46,7 +46,7 @@ pub struct XWaylandState {
impl State {
pub fn launch_xwayland(&mut self, render_node: Option<DrmNode>) {
if self.common.xwayland_state.is_some() {
if self.common.shell.xwayland_state.is_some() {
return;
}
@ -90,11 +90,11 @@ impl State {
);
}
let xwayland_state = data.common.xwayland_state.as_mut().unwrap();
let xwayland_state = data.common.shell.xwayland_state.as_mut().unwrap();
xwayland_state.xwm = Some(wm);
}
XWaylandEvent::Exited => {
if let Some(mut xwayland_state) = data.common.xwayland_state.take() {
if let Some(mut xwayland_state) = data.common.shell.xwayland_state.take() {
xwayland_state.xwm = None;
}
}
@ -119,7 +119,7 @@ impl State {
},
) {
Ok(display) => {
self.common.xwayland_state = Some(XWaylandState {
self.common.shell.xwayland_state = Some(XWaylandState {
xwayland,
xwm: None,
display,
@ -136,6 +136,7 @@ impl State {
impl XwmHandler for State {
fn xwm_state(&mut self, _xwm: XwmId) -> &mut X11Wm {
self.common
.shell
.xwayland_state
.as_mut()
.and_then(|state| state.xwm.as_mut())