Includes prior-session patches (carry forward so the app compiles): - crates/gpui/build.rs: cross-compile manifest fix - crates/gpui/src/platform.rs: PlatformWindow::activate_with_token trait method - crates/gpui/src/window.rs: Window::activate_with_token public API - crates/gpui_linux/src/linux/wayland/window.rs: WaylandWindow::activate_with_token + activate() keyboard-serial fix Plus the focus-serial fix: - serial.rs: SerialKind::KeyboardEnter - client.rs: store wl_keyboard.enter serial; latest_serial_of() Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
43 lines
943 B
Rust
43 lines
943 B
Rust
use std::{
|
|
fmt::Debug,
|
|
hash::{Hash, Hasher},
|
|
};
|
|
|
|
use anyhow::Context as _;
|
|
use uuid::Uuid;
|
|
use wayland_backend::client::ObjectId;
|
|
|
|
use gpui::{Bounds, DisplayId, Pixels, PlatformDisplay};
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub(crate) struct WaylandDisplay {
|
|
/// The ID of the wl_output object
|
|
pub id: ObjectId,
|
|
pub name: Option<String>,
|
|
pub bounds: Bounds<Pixels>,
|
|
}
|
|
|
|
impl Hash for WaylandDisplay {
|
|
fn hash<H: Hasher>(&self, state: &mut H) {
|
|
self.id.hash(state);
|
|
}
|
|
}
|
|
|
|
impl PlatformDisplay for WaylandDisplay {
|
|
fn id(&self) -> DisplayId {
|
|
DisplayId::new(self.id.protocol_id() as u64)
|
|
}
|
|
|
|
fn uuid(&self) -> anyhow::Result<Uuid> {
|
|
let name = self
|
|
.name
|
|
.as_ref()
|
|
.context("Wayland display does not have a name")?;
|
|
Ok(Uuid::new_v5(&Uuid::NAMESPACE_DNS, name.as_bytes()))
|
|
}
|
|
|
|
fn bounds(&self) -> Bounds<Pixels> {
|
|
self.bounds
|
|
}
|
|
}
|