Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Handle GLFW initialization failure

Browse source 
I hit this when trying to run servo in an ssh session. It hit an rtabort with
"fatal runtime error: thread-local pointer is null. bogus!" The exit is
required because at this point, the runtime is in a very weird state, and a
fail is going to explode even more violelently than the original unwrap did.
This commit is contained in:
Corey Richardson 2013-12-02 17:47:58 -05:00
parent bf4498f948
commit 64b28decd0
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/components/main/platform/common/glfw_windowing.rs
View file

@ -14,7 +14,7 @@ use windowing::{Forward, Back};
use alert::{Alert, AlertMethods}; use alert::{Alert, AlertMethods};
use extra::time::Timespec; use extra::time::Timespec;
use extra::time; use extra::time;
use std::libc::c_int; use std::libc::{exit, c_int};
use std::local_data; use std::local_data;
use geom::point::Point2D; use geom::point::Point2D;
use geom::size::Size2D; use geom::size::Size2D;
@ -31,7 +31,14 @@ impl ApplicationMethods for Application {
// Per GLFW docs it's safe to set the error callback before calling // Per GLFW docs it's safe to set the error callback before calling
// glfwInit(), and this way we notice errors from init too. // glfwInit(), and this way we notice errors from init too.
glfw::set_error_callback(~glfw::LogErrorHandler); glfw::set_error_callback(~glfw::LogErrorHandler);
glfw::init();
if glfw::init().is_err() {
// handles things like inability to connect to X
// cannot simply fail, since the runtime isn't up yet (causes a nasty abort)
println!("GLFW initialization failed");
unsafe { exit(1); }
}
Application Application
} }
} }
@ -153,7 +160,7 @@ impl WindowMethods<Application> for Window {
glfw_callback!(glfw::ScrollCallback(win: &glfw::Window, xpos: f64, ypos: f64) { glfw_callback!(glfw::ScrollCallback(win: &glfw::Window, xpos: f64, ypos: f64) {
let dx = (xpos as f32) * 30.0; let dx = (xpos as f32) * 30.0;
let dy = (ypos as f32) * 30.0; let dy = (ypos as f32) * 30.0;
let (x, y) = win.get_cursor_pos(); let (x, y) = win.get_cursor_pos();
//handle hidpi displays, since GLFW returns non-hi-def coordinates. //handle hidpi displays, since GLFW returns non-hi-def coordinates.
let (backing_size, _) = win.get_framebuffer_size(); let (backing_size, _) = win.get_framebuffer_size();
@ -178,7 +185,7 @@ impl WindowMethods<Application> for Window {
fn present(&mut self) { fn present(&mut self) {
self.glfw_window.swap_buffers(); self.glfw_window.swap_buffers();
} }
fn recv(@mut self) -> WindowEvent { fn recv(@mut self) -> WindowEvent {
if !self.event_queue.is_empty() { if !self.event_queue.is_empty() {
return self.event_queue.shift() return self.event_queue.shift()