leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

X11: Fix panic when no monitors are available (#1158)

Browse source 
* X11: Fix panic when no monitors are available

* Set dummy monitor's dimensions to `(1, 1)`

* X11: Avoid panicking when there are no monitors in Window::new
This commit is contained in:
Murarth 2019-09-23 11:45:29 -07:00 • committed by Osspial
parent c0a7900341
commit 472eddcc1b
4 changed files with 38 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/platform_impl/linux/x11/window.rs
View file

@ -119,7 +119,7 @@ impl UnownedWindow {
.unwrap_or(1.0)
})
} else {
return Err(os_error!(OsError::XMisc("No monitors were detected.")));
1.0
};
info!("Guessed window DPI factor: {}", dpi_factor);
@ -637,6 +637,11 @@ impl UnownedWindow {
_ => unreachable!(),
};
// Don't set fullscreen on an invalid dummy monitor handle
if monitor.id == 0 {
return None;
}
if let Some(video_mode) = video_mode {
// FIXME: this is actually not correct if we're setting the
// video mode to a resolution higher than the current
@ -704,11 +709,11 @@ impl UnownedWindow {
pub fn current_monitor(&self) -> X11MonitorHandle {
let monitor = self.shared_state.lock().last_monitor.as_ref().cloned();
monitor.unwrap_or_else(|| {
let monitor = self
.xconn
.get_monitor_for_window(Some(self.get_rect()))
.to_owned();
self.shared_state.lock().last_monitor = Some(monitor.clone());
let monitor = self.xconn.get_monitor_for_window(Some(self.get_rect()));
// Avoid caching an invalid dummy monitor handle
if monitor.id != 0 {
self.shared_state.lock().last_monitor = Some(monitor.clone());
}
monitor
})
}