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

x11: Refactor NoneCursor logic so it applies to CursorState::Hide too

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2016-04-17 18:14:53 +02:00
parent 51aeb27d7e
commit 0918fe4d9c
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/api/x11/window.rs
View file

@ -11,7 +11,6 @@ use std::sync::{Arc, Mutex};
use std::os::raw::c_long; use std::os::raw::c_long;
use std::thread; use std::thread;
use std::time::Duration; use std::time::Duration;
use x11_dl::xlib;
use Api; use Api;
use ContextError; use ContextError;
@ -841,20 +840,14 @@ impl Window {
pub fn set_cursor(&self, cursor: MouseCursor) { pub fn set_cursor(&self, cursor: MouseCursor) {
unsafe { unsafe {
use std::ffi::CString; let load = |name: &str| {
let load = |name :&str| { self.load_cursor(name)
let c_string = CString::new(name.as_bytes().to_vec()).unwrap();
return (self.x.display.xcursor.XcursorLibraryLoadCursor)(self.x.display.display, c_string.as_ptr());
}; };
let loadn = |names :&[&str]| {
for name in names.iter() { let loadn = |names: &[&str]| {
let xcursor = load(*name); self.load_first_existing_cursor(names)
if xcursor != 0 {
return xcursor;
}
}
return 0;
}; };
// Try multiple names in some cases where the name // Try multiple names in some cases where the name
// differs on the desktop environments or themes. // differs on the desktop environments or themes.
// //
@ -914,14 +907,31 @@ impl Window {
} }
} }
fn load_cursor(&self, name: &str) -> ffi::Cursor {
use std::ffi::CString;
unsafe {
let c_string = CString::new(name.as_bytes()).unwrap();
(self.x.display.xcursor.XcursorLibraryLoadCursor)(self.x.display.display, c_string.as_ptr())
}
}
fn load_first_existing_cursor(&self, names :&[&str]) -> ffi::Cursor {
for name in names.iter() {
let xcursor = self.load_cursor(name);
if xcursor != 0 {
return xcursor;
}
}
0
}
// TODO: This could maybe be cached. I don't think it's worth // TODO: This could maybe be cached. I don't think it's worth
// the complexity, since cursor changes are not so common, // the complexity, since cursor changes are not so common,
// and this is just allocating a 1x1 pixmap... // and this is just allocating a 1x1 pixmap...
fn create_empty_cursor(&self) -> xlib::Cursor { fn create_empty_cursor(&self) -> ffi::Cursor {
use std::mem; use std::mem;
let data = 0; let data = 0;
unsafe { unsafe {
let pixmap = (self.x.display.xlib.XCreateBitmapFromData)(self.x.display.display, self.x.window, &data, 1, 1); let pixmap = (self.x.display.xlib.XCreateBitmapFromData)(self.x.display.display, self.x.window, &data, 1, 1);
if pixmap == 0 { if pixmap == 0 {
@ -931,7 +941,7 @@ impl Window {
// We don't care about this color, since it only fills bytes // We don't care about this color, since it only fills bytes
// in the pixmap which are not 0 in the mask. // in the pixmap which are not 0 in the mask.
let dummy_color: xlib::XColor = mem::uninitialized(); let dummy_color: ffi::XColor = mem::uninitialized();
let cursor = (self.x.display.xlib.XCreatePixmapCursor)(self.x.display.display, let cursor = (self.x.display.xlib.XCreatePixmapCursor)(self.x.display.display,
pixmap, pixmap,
pixmap, pixmap,
@ -960,13 +970,10 @@ impl Window {
}, },
Normal => {}, Normal => {},
Hide => { Hide => {
// NB: Calling XDefineCursor with None (aka 0)
// as a value resets the cursor to the default.
unsafe { unsafe {
let xcursor = (self.x.display.xlib.XCreateFontCursor)(self.x.display.display, 68/*XC_left_ptr*/); (self.x.display.xlib.XDefineCursor)(self.x.display.display, self.x.window, 0);
self.x.display.check_errors().expect("Failed to call XCreateFontCursor");
(self.x.display.xlib.XDefineCursor)(self.x.display.display, self.x.window, xcursor);
self.x.display.check_errors().expect("Failed to call XDefineCursor");
(self.x.display.xlib.XFlush)(self.x.display.display);
(self.x.display.xlib.XFreeCursor)(self.x.display.display, xcursor);
} }
}, },
} }
@ -975,18 +982,13 @@ impl Window {
match state { match state {
Normal => Ok(()), Normal => Ok(()),
Hide => { Hide => {
let data = &[0, 0, 0, 0, 0, 0, 0, 0];
unsafe { unsafe {
let mut black = ffi::XColor { let cursor = self.create_empty_cursor();
red: 0, green: 0, blue: 0,
pad: 0, pixel: 0, flags: 0,
};
let bitmap = (self.x.display.xlib.XCreateBitmapFromData)(self.x.display.display, self.x.window, data.as_ptr(), 8, 8);
let cursor = (self.x.display.xlib.XCreatePixmapCursor)(self.x.display.display, bitmap, bitmap, &mut black, &mut black, 0, 0);
(self.x.display.xlib.XDefineCursor)(self.x.display.display, self.x.window, cursor); (self.x.display.xlib.XDefineCursor)(self.x.display.display, self.x.window, cursor);
self.x.display.check_errors().expect("Failed to call XDefineCursor"); if cursor != 0 {
(self.x.display.xlib.XFreeCursor)(self.x.display.display, cursor); (self.x.display.xlib.XFreeCursor)(self.x.display.display, cursor);
(self.x.display.xlib.XFreePixmap)(self.x.display.display, bitmap); }
self.x.display.check_errors().expect("Failed to call XDefineCursor or free the empty cursor");
} }
Ok(()) Ok(())
}, },