migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-06-27 15:13:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

On X11, try alternative cursor icon names as well

Browse Source 
This should cover more icons.
This commit is contained in:
Kirill Chibisov
2023-11-04 15:19:15 +04:00
committed by GitHub
parent 0994b5ceb8
commit e9210555c1
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/platform_impl/linux/x11/util/cursor.rs
View File

@@ -1,4 +1,5 @@
use std::ffi::CString;
use std::iter;
use x11rb::connection::Connection;
@@ -56,10 +57,22 @@ impl XConnection {
None => return self.create_empty_cursor(),
};
let name = CString::new(cursor.name()).unwrap();
unsafe {
(self.xcursor.XcursorLibraryLoadCursor)(self.display, name.as_ptr() as *const c_char)
let mut xcursor = 0;
for &name in iter::once(&cursor.name()).chain(cursor.alt_names().iter()) {
let name = CString::new(name).unwrap();
xcursor = unsafe {
(self.xcursor.XcursorLibraryLoadCursor)(
self.display,
name.as_ptr() as *const c_char,
)
};
if xcursor != 0 {
break;
}
}
xcursor
}
fn update_cursor(&self, window: xproto::Window, cursor: ffi::Cursor) -> Result<(), X11Error> {