1
0
Fork 0

X11: set XlibDisplayHandle.screen

This commit is contained in:
Joakim Frostegård 2022-11-24 19:02:08 +01:00 committed by Robbert van der Helm
parent e35f3080f6
commit 70f46a691d

View file

@ -685,9 +685,7 @@ impl Window {
unsafe impl HasRawWindowHandle for Window { unsafe impl HasRawWindowHandle for Window {
fn raw_window_handle(&self) -> RawWindowHandle { fn raw_window_handle(&self) -> RawWindowHandle {
let mut handle = XlibWindowHandle::empty(); let mut handle = XlibWindowHandle::empty();
handle.window = self.window_id as c_ulong; handle.window = self.window_id as c_ulong;
// FIXME: handle.visual_id?
RawWindowHandle::Xlib(handle) RawWindowHandle::Xlib(handle)
} }
@ -695,10 +693,11 @@ unsafe impl HasRawWindowHandle for Window {
unsafe impl HasRawDisplayHandle for Window { unsafe impl HasRawDisplayHandle for Window {
fn raw_display_handle(&self) -> RawDisplayHandle { fn raw_display_handle(&self) -> RawDisplayHandle {
let display = self.xcb_connection.conn.get_raw_dpy();
let mut handle = XlibDisplayHandle::empty(); let mut handle = XlibDisplayHandle::empty();
handle.display = self.xcb_connection.conn.get_raw_dpy() as *mut c_void; handle.display = display as *mut c_void;
// FIXME: handle.screen? handle.screen = unsafe { x11::xlib::XDefaultScreen(display) };
RawDisplayHandle::Xlib(handle) RawDisplayHandle::Xlib(handle)
} }