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

Support xdg decorations

Browse source
This commit is contained in:
bbb651 2025-03-20 15:49:35 +02:00 • committed by Shawn Wallace
parent b2613aec05
commit 0559ace758
5 changed files with 328 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

59
tests/integration.rs
View file

@ -10,7 +10,9 @@ use std::sync::{
};
use std::thread::JoinHandle;
use std::time::{Duration, Instant};
use wayland_protocols::xdg::shell::server::xdg_toplevel;
use wayland_protocols::xdg::{
decoration::zv1::server::zxdg_toplevel_decoration_v1, shell::server::xdg_toplevel,
};
use wayland_server::Resource;
use xcb::{x, Xid};
use xwayland_satellite as xwls;
@ -317,6 +319,7 @@ xcb::atoms_struct! {
multiple => b"MULTIPLE",
wm_state => b"WM_STATE",
wm_check => b"_NET_SUPPORTING_WM_CHECK",
motif_wm_hints => b"_MOTIF_WM_HINTS" only_if_exists = false,
mime1 => b"text/plain" only_if_exists = false,
mime2 => b"blah/blah" only_if_exists = false,
incr => b"INCR",
@ -1519,3 +1522,57 @@ fn negative_output_coordinates() {
assert_eq!(ptr_reply.win_x(), 30);
assert_eq!(ptr_reply.win_y(), 40);
}
#[test]
fn xdg_decorations() {
let mut f = Fixture::new();
let mut connection = Connection::new(&f.display);
let window = connection.new_window(connection.root, 0, 0, 20, 20, false);
let surface = f.map_as_toplevel(&mut connection, window);
let data = f.testwl.get_surface_data(surface).unwrap();
// The default decoration mode in x11 is SDD
assert_eq!(
data.toplevel()
.decoration
.as_ref()
.and_then(|(_, decoration)| *decoration),
Some(zxdg_toplevel_decoration_v1::Mode::ServerSide)
);
// CSD
connection.set_property(
window,
connection.atoms.motif_wm_hints,
connection.atoms.motif_wm_hints,
&[2u32, 0, 0, 0, 0],
);
std::thread::sleep(std::time::Duration::from_millis(1));
f.testwl.dispatch();
let data = f.testwl.get_surface_data(surface).unwrap();
assert_eq!(
data.toplevel()
.decoration
.as_ref()
.and_then(|(_, decoration)| *decoration),
Some(zxdg_toplevel_decoration_v1::Mode::ClientSide)
);
// SSD
connection.set_property(
window,
connection.atoms.motif_wm_hints,
connection.atoms.motif_wm_hints,
&[2u32, 0, 1, 0, 0],
);
std::thread::sleep(std::time::Duration::from_millis(1));
f.testwl.dispatch();
let data = f.testwl.get_surface_data(surface).unwrap();
assert_eq!(
data.toplevel()
.decoration
.as_ref()
.and_then(|(_, decoration)| *decoration),
Some(zxdg_toplevel_decoration_v1::Mode::ServerSide)
);
}