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

Recognize drag and drop window type

Browse source 
Fixes #166
This commit is contained in:
skyrelia 2025-06-10 00:24:54 -04:00 • committed by Shawn Wallace
parent 0b2a139f98
commit ef24bce5d9
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/xstate/mod.rs
View file

@ -639,7 +639,13 @@ impl XState {
x if x == self.window_atoms.normal || x == self.window_atoms.dialog => { x if x == self.window_atoms.normal || x == self.window_atoms.dialog => {
is_popup = override_redirect; is_popup = override_redirect;
} }
x if x == self.window_atoms.menu || x == self.window_atoms.tooltip => { x if [
self.window_atoms.menu,
self.window_atoms.tooltip,
self.window_atoms.drag_n_drop,
]
.contains(&x) =>
{
is_popup = true; is_popup = true;
} }
_ => { _ => {
@ -923,6 +929,7 @@ xcb::atoms_struct! {
ty => b"_NET_WM_WINDOW_TYPE" only_if_exists = false, ty => b"_NET_WM_WINDOW_TYPE" only_if_exists = false,
normal => b"_NET_WM_WINDOW_TYPE_NORMAL" only_if_exists = false, normal => b"_NET_WM_WINDOW_TYPE_NORMAL" only_if_exists = false,
dialog => b"_NET_WM_WINDOW_TYPE_DIALOG" only_if_exists = false, dialog => b"_NET_WM_WINDOW_TYPE_DIALOG" only_if_exists = false,
drag_n_drop => b"_NET_WM_WINDOW_TYPE_DND" only_if_exists = false,
splash => b"_NET_WM_WINDOW_TYPE_SPLASH" only_if_exists = false, splash => b"_NET_WM_WINDOW_TYPE_SPLASH" only_if_exists = false,
menu => b"_NET_WM_WINDOW_TYPE_MENU" only_if_exists = false, menu => b"_NET_WM_WINDOW_TYPE_MENU" only_if_exists = false,
utility => b"_NET_WM_WINDOW_TYPE_UTILITY" only_if_exists = false, utility => b"_NET_WM_WINDOW_TYPE_UTILITY" only_if_exists = false,

10
tests/integration.rs
View file

@ -320,6 +320,7 @@ xcb::atoms_struct! {
win_type_normal => b"_NET_WM_WINDOW_TYPE_NORMAL", win_type_normal => b"_NET_WM_WINDOW_TYPE_NORMAL",
win_type_menu => b"_NET_WM_WINDOW_TYPE_MENU", win_type_menu => b"_NET_WM_WINDOW_TYPE_MENU",
win_type_tooltip => b"_NET_WM_WINDOW_TYPE_TOOLTIP", win_type_tooltip => b"_NET_WM_WINDOW_TYPE_TOOLTIP",
win_type_dnd => b"_NET_WM_WINDOW_TYPE_DND",
motif_wm_hints => b"_MOTIF_WM_HINTS" only_if_exists = false, motif_wm_hints => b"_MOTIF_WM_HINTS" only_if_exists = false,
mime1 => b"text/plain" only_if_exists = false, mime1 => b"text/plain" only_if_exists = false,
mime2 => b"blah/blah" only_if_exists = false, mime2 => b"blah/blah" only_if_exists = false,
@ -1787,6 +1788,15 @@ fn popup_heuristics() {
&[connection.atoms.win_type_tooltip], &[connection.atoms.win_type_tooltip],
); );
f.map_as_popup(&mut connection, chromium_tooltip); f.map_as_popup(&mut connection, chromium_tooltip);
let discord_dnd = connection.new_window(connection.root, 20, 138, 48, 48, true);
connection.set_property(
discord_dnd,
x::ATOM_ATOM,
connection.atoms.win_type,
&[connection.atoms.win_type_dnd],
);
f.map_as_popup(&mut connection, discord_dnd);
} }
#[test] #[test]