alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-12 05:31:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #155 from vberger/master

Browse source 
wayland: Update to wayland 0.8.6
This commit is contained in:
tomaka 2017-03-13 21:06:35 +01:00 committed by GitHub
parent 2e82cac69a 50f38e2f76
commit 65034f2edf
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Cargo.toml
View file

@ -37,7 +37,7 @@ kernel32-sys = "0.2"
dwmapi-sys = "0.1" dwmapi-sys = "0.1"
[target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))'.dependencies] [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))'.dependencies]
wayland-client = { version = "0.7.4", features = ["dlopen"] } wayland-client = { version = "0.8.6", features = ["dlopen"] }
wayland-kbd = "0.7.0" wayland-kbd = "0.8.0"
wayland-window = "0.4.2" wayland-window = "0.5.0"
x11-dl = "2.8" x11-dl = "2.8"

9
src/platform/linux/wayland/context.rs
View file

@ -61,7 +61,7 @@ impl WaylandEnv {
if version < 5 { if version < 5 {
panic!("Winit requires at least version 5 of the wl_seat global."); panic!("Winit requires at least version 5 of the wl_seat global.");
} }
let seat = self.registry.bind::<wl_seat::WlSeat>(5, name).expect("Seat cannot be destroyed"); let seat = self.registry.bind::<wl_seat::WlSeat>(5, name);
return Some(seat) return Some(seat)
} }
} }
@ -87,8 +87,7 @@ impl wl_registry::Handler for WaylandEnv {
if interface == "wl_output" { if interface == "wl_output" {
// intercept outputs // intercept outputs
// this "expect" cannot trigger (see https://github.com/vberger/wayland-client-rs/issues/69) // this "expect" cannot trigger (see https://github.com/vberger/wayland-client-rs/issues/69)
let output = self.registry.bind::<wl_output::WlOutput>(1, name) let output = self.registry.bind::<wl_output::WlOutput>(1, name);
.expect("Registry cannot be dead");
evqh.register::<_, WaylandEnv>(&output, self.my_id); evqh.register::<_, WaylandEnv>(&output, self.my_id);
self.monitors.push(OutputInfo::new(output, name)); self.monitors.push(OutputInfo::new(output, name));
} }
@ -171,7 +170,7 @@ impl WaylandContext {
}; };
// this "expect" cannot trigger (see https://github.com/vberger/wayland-client-rs/issues/69) // this "expect" cannot trigger (see https://github.com/vberger/wayland-client-rs/issues/69)
let registry = display.get_registry().expect("Display cannot be already destroyed."); let registry = display.get_registry();
let env_id = event_queue.add_handler_with_init(WaylandEnv::new(registry)); let env_id = event_queue.add_handler_with_init(WaylandEnv::new(registry));
// two syncs fully initialize // two syncs fully initialize
event_queue.sync_roundtrip().expect("Wayland connection unexpectedly lost"); event_queue.sync_roundtrip().expect("Wayland connection unexpectedly lost");
@ -221,7 +220,7 @@ impl WaylandContext {
let mut state = guard.state(); let mut state = guard.state();
let env = state.get_mut_handler::<WaylandEnv>(self.env_id); let env = state.get_mut_handler::<WaylandEnv>(self.env_id);
// this "expect" cannot trigger (see https://github.com/vberger/wayland-client-rs/issues/69) // this "expect" cannot trigger (see https://github.com/vberger/wayland-client-rs/issues/69)
let surface = Arc::new(env.inner.compositor.create_surface().expect("Compositor cannot be dead")); let surface = Arc::new(env.inner.compositor.create_surface());
let decorated = wayland_window::DecoratedSurface::new( let decorated = wayland_window::DecoratedSurface::new(
&*surface, 800, 600, &*surface, 800, 600,
&env.inner.compositor, &env.inner.compositor,