bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid processing events from a reparented window

Browse source 
Should fix #71
This commit is contained in:
Shawn Wallace 2024-11-08 22:36:27 -05:00
parent b0ee6db9fa
commit 3e6f892d20
3 changed files with 77 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/server/mod.rs
View file

@ -575,7 +575,10 @@ impl<C: XConnection> ServerState<C> {
}
pub fn set_win_title(&mut self, window: x::Window, name: WmName) {
let win = self.windows.get_mut(&window).unwrap();
let Some(win) = self.windows.get_mut(&window) else {
debug!("not setting title for unknown window {window:?}");
return;
};
let new_title = match &mut win.attrs.title {
Some(w) => {
@ -607,7 +610,10 @@ impl<C: XConnection> ServerState<C> {
}
pub fn set_win_class(&mut self, window: x::Window, class: String) {
let win = self.windows.get_mut(&window).unwrap();
let Some(win) = self.windows.get_mut(&window) else {
debug!("not setting class for unknown window {window:?}");
return;
};
let class = win.attrs.class.insert(class);
if let Some(key) = win.surface_key {
@ -623,12 +629,18 @@ impl<C: XConnection> ServerState<C> {
}
pub fn set_win_hints(&mut self, window: x::Window, hints: WmHints) {
let win = self.windows.get_mut(&window).unwrap();
let Some(win) = self.windows.get_mut(&window) else {
debug!("not setting hints for unknown window {window:?}");
return;
};
win.attrs.group = hints.window_group;
}
pub fn set_size_hints(&mut self, window: x::Window, hints: WmNormalHints) {
let win = self.windows.get_mut(&window).unwrap();
let Some(win) = self.windows.get_mut(&window) else {
debug!("not setting size hints for unknown window {window:?}");
return;
};
if win.attrs.size_hints.is_none() || *win.attrs.size_hints.as_ref().unwrap() != hints {
debug!("setting {window:?} hints {hints:?}");
@ -669,7 +681,10 @@ impl<C: XConnection> ServerState<C> {
}
pub fn reconfigure_window(&mut self, event: x::ConfigureNotifyEvent) {
let win = self.windows.get_mut(&event.window()).unwrap();
let Some(win) = self.windows.get_mut(&event.window()) else {
debug!("not reconfiguring unknown window {:?}", event.window());
return;
};
let dims = WindowDims {
x: event.x(),
y: event.y(),
@ -716,7 +731,10 @@ impl<C: XConnection> ServerState<C> {
pub fn map_window(&mut self, window: x::Window) {
debug!("mapping {window:?}");
let window = self.windows.get_mut(&window).unwrap();
let Some(window) = self.windows.get_mut(&window) else {
debug!("not mapping unknown window {window:?}");
return;
};
window.mapped = true;
}

6
src/xstate/mod.rs
View file

@ -235,6 +235,8 @@ impl XState {
}
};
}
let mut ignored_windows = Vec::new();
while let Some(event) = self.connection.poll_for_event().unwrap() {
trace!("x11 event: {event:?}");
@ -268,6 +270,7 @@ impl XState {
} else {
debug!("destroying window since its parent is no longer root!");
server_state.destroy_window(e.window());
ignored_windows.push(e.window());
}
}
xcb::Event::X(x::Event::MapRequest(e)) => {
@ -325,6 +328,9 @@ impl XState {
server_state.destroy_window(e.window());
}
xcb::Event::X(x::Event::PropertyNotify(e)) => {
if ignored_windows.contains(&e.window()) {
continue;
}
self.handle_property_change(e, server_state);
}
xcb::Event::X(x::Event::ConfigureRequest(e)) => {