alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 14:21:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #684 from AnthIste/0.4.4-cocoa-api

Browse source 
Implement set_cursor_position on OSX with Cocoa
This commit is contained in:
tomaka 2015-12-29 21:21:17 +01:00
parent 0a598d7980 d892ba168b
commit c1a98a200b
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/api/cocoa/mod.rs
View file

@ -34,7 +34,7 @@ use core_foundation::base::TCFType;
use core_foundation::string::CFString; use core_foundation::string::CFString;
use core_foundation::bundle::{CFBundleGetBundleWithIdentifier, CFBundleGetFunctionPointerForName}; use core_foundation::bundle::{CFBundleGetBundleWithIdentifier, CFBundleGetFunctionPointerForName};
use core_graphics::display::{CGAssociateMouseAndMouseCursorPosition, CGMainDisplayID, CGDisplayPixelsHigh}; use core_graphics::display::{CGAssociateMouseAndMouseCursorPosition, CGMainDisplayID, CGDisplayPixelsHigh, CGWarpMouseCursorPosition};
use std::ffi::CStr; use std::ffi::CStr;
use std::collections::VecDeque; use std::collections::VecDeque;
@ -371,7 +371,7 @@ impl Window {
let count: NSUInteger = msg_send![screens, count]; let count: NSUInteger = msg_send![screens, count];
let key = IdRef::new(NSString::alloc(nil).init_str("NSScreenNumber")); let key = IdRef::new(NSString::alloc(nil).init_str("NSScreenNumber"));
let mut matching_screen: Option<id> = None; let mut matching_screen: Option<id> = None;
for i in (0..count) { for i in 0..count {
let screen = msg_send![screens, objectAtIndex:i as NSUInteger]; let screen = msg_send![screens, objectAtIndex:i as NSUInteger];
let device_description = NSScreen::deviceDescription(screen); let device_description = NSScreen::deviceDescription(screen);
let value: id = msg_send![device_description, objectForKey:*key]; let value: id = msg_send![device_description, objectForKey:*key];
@ -765,8 +765,17 @@ impl Window {
} }
#[inline] #[inline]
pub fn set_cursor_position(&self, _x: i32, _y: i32) -> Result<(), ()> { pub fn set_cursor_position(&self, x: i32, y: i32) -> Result<(), ()> {
unimplemented!(); let (window_x, window_y) = self.get_position().unwrap_or((0, 0));
let (cursor_x, cursor_y) = (window_x + x, window_y + y);
unsafe {
// TODO: Check for errors.
let _ = CGWarpMouseCursorPosition(CGPoint { x: cursor_x as CGFloat, y: cursor_y as CGFloat });
let _ = CGAssociateMouseAndMouseCursorPosition(true);
}
Ok(())
} }
} }