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

call XInitThreads() before creating our cef Display* object

Browse source
This commit is contained in:
Mike Blumenkrantz 2015-05-18 15:41:24 -04:00
parent 09aba1f9de
commit e5a274b467
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ports/cef/window.rs
View file

@ -33,7 +33,7 @@ use std::sync::mpsc::{Sender, channel};
#[cfg(target_os="linux")] #[cfg(target_os="linux")]
extern crate x11; extern crate x11;
#[cfg(target_os="linux")] #[cfg(target_os="linux")]
use self::x11::xlib::XOpenDisplay; use self::x11::xlib::{XInitThreads,XOpenDisplay};
#[cfg(target_os="linux")] #[cfg(target_os="linux")]
pub static mut DISPLAY: *mut c_void = 0 as *mut c_void; pub static mut DISPLAY: *mut c_void = 0 as *mut c_void;
@ -383,7 +383,10 @@ impl CompositorProxy for CefCompositorProxy {
#[cfg(target_os="linux")] #[cfg(target_os="linux")]
pub fn init_window() { pub fn init_window() {
unsafe { DISPLAY = XOpenDisplay(ptr::null()) as *mut c_void ; } unsafe {
assert!(XInitThreads() != 0);
DISPLAY = XOpenDisplay(ptr::null()) as *mut c_void;
}
} }
#[cfg(not(target_os="linux"))] #[cfg(not(target_os="linux"))]
pub fn init_window() {} pub fn init_window() {}