aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/api/cocoa/mod.rs19
-rw-r--r--src/api/x11/events.rs1
-rw-r--r--src/api/x11/window.rs55
3 files changed, 51 insertions, 24 deletions
diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs
index bec56d2..e935805 100644
--- a/src/api/cocoa/mod.rs
+++ b/src/api/cocoa/mod.rs
@@ -79,11 +79,12 @@ struct WindowDelegate {
impl WindowDelegate {
/// Get the delegate class, initiailizing it neccessary
fn class() -> *const Class {
+ use std::os::raw::c_void;
use std::sync::{Once, ONCE_INIT};
extern fn window_should_close(this: &Object, _: Sel, _: id) -> BOOL {
unsafe {
- let state: *mut libc::c_void = *this.get_ivar("glutinState");
+ let state: *mut c_void = *this.get_ivar("glutinState");
let state = state as *mut DelegateState;
(*state).pending_events.lock().unwrap().push_back(Closed);
}
@@ -92,7 +93,7 @@ impl WindowDelegate {
extern fn window_did_resize(this: &Object, _: Sel, _: id) {
unsafe {
- let state: *mut libc::c_void = *this.get_ivar("glutinState");
+ let state: *mut c_void = *this.get_ivar("glutinState");
let state = &mut *(state as *mut DelegateState);
let _: () = msg_send![*state.context, update];
@@ -111,7 +112,7 @@ impl WindowDelegate {
// TODO: center the cursor if the window had mouse grab when it
// lost focus
- let state: *mut libc::c_void = *this.get_ivar("glutinState");
+ let state: *mut c_void = *this.get_ivar("glutinState");
let state = state as *mut DelegateState;
(*state).pending_events.lock().unwrap().push_back(Focused(true));
}
@@ -119,7 +120,7 @@ impl WindowDelegate {
extern fn window_did_resign_key(this: &Object, _: Sel, _: id) {
unsafe {
- let state: *mut libc::c_void = *this.get_ivar("glutinState");
+ let state: *mut c_void = *this.get_ivar("glutinState");
let state = state as *mut DelegateState;
(*state).pending_events.lock().unwrap().push_back(Focused(false));
}
@@ -131,7 +132,7 @@ impl WindowDelegate {
INIT.call_once(|| unsafe {
// Create new NSWindowDelegate
let superclass = Class::get("NSObject").unwrap();
- let mut decl = ClassDecl::new(superclass, "GlutinWindowDelegate").unwrap();
+ let mut decl = ClassDecl::new("GlutinWindowDelegate", superclass).unwrap();
// Add callback methods
decl.add_method(sel!(windowShouldClose:),
@@ -145,7 +146,7 @@ impl WindowDelegate {
window_did_resign_key as extern fn(&Object, Sel, id));
// Store internal state as user data
- decl.add_ivar::<*mut libc::c_void>("glutinState");
+ decl.add_ivar::<*mut c_void>("glutinState");
delegate_class = decl.register();
});
@@ -162,7 +163,7 @@ impl WindowDelegate {
unsafe {
let delegate = IdRef::new(msg_send![WindowDelegate::class(), new]);
- (&mut **delegate).set_ivar("glutinState", state_ptr as *mut libc::c_void);
+ (&mut **delegate).set_ivar("glutinState", state_ptr as *mut ::std::os::raw::c_void);
let _: () = msg_send![*state.window, setDelegate:*delegate];
WindowDelegate { state: state, _this: delegate }
@@ -673,8 +674,8 @@ impl Window {
let sel = Sel::register(cursor_name);
let cls = Class::get("NSCursor").unwrap();
unsafe {
- use objc::MessageArguments;
- let cursor: id = ().send(cls as *const _ as id, sel);
+ use objc::Message;
+ let cursor: id = cls.send_message(sel, ()).unwrap();
let _: () = msg_send![cursor, set];
}
}
diff --git a/src/api/x11/events.rs b/src/api/x11/events.rs
index d497319..1c6668c 100644
--- a/src/api/x11/events.rs
+++ b/src/api/x11/events.rs
@@ -3,7 +3,6 @@ use super::ffi;
use VirtualKeyCode;
pub fn keycode_to_element(scancode: libc::c_uint) -> Option<VirtualKeyCode> {
- println!("{:?}", scancode);
Some(match scancode {
ffi::XK_BackSpace => events::VirtualKeyCode::Back,
ffi::XK_Tab => events::VirtualKeyCode::Tab,
diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs
index 8cae2be..b4019e4 100644
--- a/src/api/x11/window.rs
+++ b/src/api/x11/window.rs
@@ -339,7 +339,7 @@ impl Window {
let m = (0 .. mode_num).map(|i| {
let m: ffi::XF86VidModeModeInfo = ptr::read(*modes.offset(i as isize) as *const _); m
}).find(|m| m.hdisplay >= dimensions.0 as u16 && m.vdisplay >= dimensions.1 as u16);
-
+
match m {
Some(m) => Some(m),
None => return Err(OsError(format!("Could not find a suitable graphics mode")))
@@ -845,29 +845,61 @@ impl Window {
self.x.display.check_errors().expect("Failed to call XcursorLibraryLoadCursor");
(self.x.display.xlib.XDefineCursor)(self.x.display.display, self.x.window, xcursor);
(self.x.display.xlib.XFlush)(self.x.display.display);
+ (self.x.display.xlib.XFreeCursor)(self.x.display.display, xcursor);
self.x.display.check_errors().expect("Failed to call XDefineCursor");
}
}
pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
- use CursorState::{ Grab, Normal };
+ use CursorState::{ Grab, Normal, Hide };
let mut cursor_state = self.cursor_state.lock().unwrap();
-
match (state, *cursor_state) {
- (Normal, Grab) => {
+ (Normal, Normal) | (Hide, Hide) | (Grab, Grab) => return Ok(()),
+ _ => {},
+ }
+
+ match *cursor_state {
+ Grab => {
unsafe {
(self.x.display.xlib.XUngrabPointer)(self.x.display.display, ffi::CurrentTime);
self.x.display.check_errors().expect("Failed to call XUngrabPointer");
- *cursor_state = Normal;
- Ok(())
}
},
-
- (Grab, Normal) => {
+ Normal => {},
+ Hide => {
unsafe {
- *cursor_state = Grab;
+ let xcursor = (self.x.display.xlib.XCreateFontCursor)(self.x.display.display, 68/*XC_left_ptr*/);
+ 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);
+ }
+ },
+ }
+ *cursor_state = state;
+ match state {
+ Normal => Ok(()),
+ Hide => {
+ let data = &[0, 0, 0, 0, 0, 0, 0, 0];
+ unsafe {
+ let mut black = ffi::XColor {
+ 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.check_errors().expect("Failed to call XDefineCursor");
+ (self.x.display.xlib.XFreeCursor)(self.x.display.display, cursor);
+ (self.x.display.xlib.XFreePixmap)(self.x.display.display, bitmap);
+ }
+ Ok(())
+ },
+ Grab => {
+ unsafe {
match (self.x.display.xlib.XGrabPointer)(
self.x.display.display, self.x.window, ffi::False,
(ffi::ButtonPressMask | ffi::ButtonReleaseMask | ffi::EnterWindowMask |
@@ -886,11 +918,6 @@ impl Window {
}
}
},
-
- // Nothing needs to change
- (Grab, Grab) | (Normal, Normal) => Ok(()),
-
- _ => unimplemented!(),
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-04 13:36:22 +0000