Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wayland: Fix window bounds restoration (#12581)

Browse source 
Fixes multiple issues that prevented window bounds restoration to not
work on Wayland.

Note: Since the display uuid depends on the `wl_output.name` field, this
only works properly on KDE 5.26+ or Gnome 44+ ([kwin
commit](330a02d862),
[mutter](7e838b1115)).

Release Notes:

- N/A
This commit is contained in:
apricotbucket28 2024-06-03 13:27:01 -03:00 • committed by GitHub
parent ed86b86dc7
commit 344e5e1cf2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 82 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

47
crates/gpui/src/platform/linux/wayland/client.rs
View file

@ -139,8 +139,9 @@ impl Globals {
}
}
#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Hash)]
pub struct InProgressOutput {
name: Option<String>,
scale: Option<i32>,
position: Option<Point<DevicePixels>>,
size: Option<Size<DevicePixels>>,
@ -151,6 +152,7 @@ impl InProgressOutput {
if let Some((position, size)) = self.position.zip(self.size) {
let scale = self.scale.unwrap_or(1);
Some(Output {
name: self.name.clone(),
scale,
bounds: Bounds::new(position, size),
})
@ -160,22 +162,13 @@ impl InProgressOutput {
}
}
#[derive(Debug, Clone, Copy, Eq, PartialEq)]
#[derive(Debug, Clone, Eq, PartialEq, Hash)]
pub struct Output {
pub name: Option<String>,
pub scale: i32,
pub bounds: Bounds<DevicePixels>,
}
impl Hash for Output {
fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
state.write_i32(self.scale);
state.write_i32(self.bounds.origin.x.0);
state.write_i32(self.bounds.origin.y.0);
state.write_i32(self.bounds.size.width.0);
state.write_i32(self.bounds.size.height.0);
}
}
pub(crate) struct WaylandClientState {
serial_tracker: SerialTracker,
globals: Globals,
@ -337,7 +330,6 @@ impl Drop for WaylandClient {
}
const WL_DATA_DEVICE_MANAGER_VERSION: u32 = 3;
const WL_OUTPUT_VERSION: u32 = 2;
fn wl_seat_version(version: u32) -> u32 {
// We rely on the wl_pointer.frame event
@ -354,6 +346,20 @@ fn wl_seat_version(version: u32) -> u32 {
version.clamp(WL_SEAT_MIN_VERSION, WL_SEAT_MAX_VERSION)
}
fn wl_output_version(version: u32) -> u32 {
const WL_OUTPUT_MIN_VERSION: u32 = 2;
const WL_OUTPUT_MAX_VERSION: u32 = 4;
if version < WL_OUTPUT_MIN_VERSION {
panic!(
"wl_output below required version: {} < {}",
version, WL_OUTPUT_MIN_VERSION
);
}
version.clamp(WL_OUTPUT_MIN_VERSION, WL_OUTPUT_MAX_VERSION)
}
impl WaylandClient {
pub(crate) fn new() -> Self {
let conn = Connection::connect_to_env().unwrap();
@ -378,7 +384,7 @@ impl WaylandClient {
"wl_output" => {
let output = globals.registry().bind::<wl_output::WlOutput, _, _>(
global.name,
WL_OUTPUT_VERSION,
wl_output_version(global.version),
&qh,
(),
);
@ -517,6 +523,7 @@ impl LinuxClient for WaylandClient {
.map(|(id, output)| {
Rc::new(WaylandDisplay {
id: id.clone(),
name: output.name.clone(),
bounds: output.bounds,
}) as Rc<dyn PlatformDisplay>
})
@ -532,6 +539,7 @@ impl LinuxClient for WaylandClient {
(object_id.protocol_id() == id.0).then(|| {
Rc::new(WaylandDisplay {
id: object_id.clone(),
name: output.name.clone(),
bounds: output.bounds,
}) as Rc<dyn PlatformDisplay>
})
@ -716,8 +724,12 @@ impl Dispatch<wl_registry::WlRegistry, GlobalListContents> for WaylandClientStat
);
}
"wl_output" => {
let output =
registry.bind::<wl_output::WlOutput, _, _>(name, WL_OUTPUT_VERSION, qh, ());
let output = registry.bind::<wl_output::WlOutput, _, _>(
name,
wl_output_version(version),
qh,
(),
);
state
.in_progress_outputs
@ -821,6 +833,9 @@ impl Dispatch<wl_output::WlOutput, ()> for WaylandClientStatePtr {
};
match event {
wl_output::Event::Name { name } => {
in_progress_output.name = Some(name);
}
wl_output::Event::Scale { factor } => {
in_progress_output.scale = Some(factor);
}