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

Merge pull request #432 from fkaa/cocoa-cursor-grab

Browse source 
Add cursor grabbing on cocoa
This commit is contained in:
tomaka 2015-05-06 16:56:13 +02:00
parent 375197f83c 87e8018cf3
commit 9d6482e636
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,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::{CGMainDisplayID, CGDisplayPixelsHigh}; use core_graphics::display::{CGAssociateMouseAndMouseCursorPosition, CGMainDisplayID, CGDisplayPixelsHigh};
use std::ffi::CStr; use std::ffi::CStr;
use std::collections::VecDeque; use std::collections::VecDeque;
@ -523,16 +523,10 @@ impl Window {
if let Some(cxt) = context.non_nil() { if let Some(cxt) = context.non_nil() {
let pf = { let pf = {
let getValues_forAttribute_forVirtualScreen_ = |fmt: id,
vals: *mut GLint,
attrib: NSOpenGLPixelFormatAttribute,
screen: GLint| -> () {
msg_send![fmt, getValues:vals forAttribute:attrib forVirtualScreen:screen]
};
let get_attr = |attrib: NSOpenGLPixelFormatAttribute| -> i32 { let get_attr = |attrib: NSOpenGLPixelFormatAttribute| -> i32 {
let mut value = 0; let mut value = 0;
// TODO: Wait for servo/rust-cocoa/#85 to get merged
/*NSOpenGLPixelFormat::*/getValues_forAttribute_forVirtualScreen_( NSOpenGLPixelFormat::getValues_forAttribute_forVirtualScreen_(
*pixelformat, *pixelformat,
&mut value, &mut value,
attrib, attrib,
@ -721,9 +715,12 @@ impl Window {
pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> { pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
let cls = Class::get("NSCursor").unwrap(); let cls = Class::get("NSCursor").unwrap();
// TODO: Check for errors.
match state { match state {
CursorState::Normal => { CursorState::Normal => {
let _: () = unsafe { msg_send![cls, unhide] }; let _: () = unsafe { msg_send![cls, unhide] };
let _: i32 = unsafe { CGAssociateMouseAndMouseCursorPosition(true) };
Ok(()) Ok(())
}, },
CursorState::Hide => { CursorState::Hide => {
@ -731,7 +728,8 @@ impl Window {
Ok(()) Ok(())
}, },
CursorState::Grab => { CursorState::Grab => {
Err("Mouse grabbing is unimplemented".to_string()) let _: i32 = unsafe { CGAssociateMouseAndMouseCursorPosition(false) };
Ok(())
} }
} }
} }