Initial transition to objc2 (#2452)
* Use objc2 * Use objc2's NSInteger/NSUInteger/NSRange
This commit is contained in:
parent
e0018d0710
commit
112965b4ff
23 changed files with 394 additions and 480 deletions
|
|
@ -12,11 +12,12 @@ use std::{
|
|||
use cocoa::{
|
||||
appkit::{NSApp, NSEvent, NSEventModifierFlags, NSEventPhase, NSView, NSWindow},
|
||||
base::{id, nil},
|
||||
foundation::{NSInteger, NSPoint, NSRect, NSSize, NSString, NSUInteger},
|
||||
foundation::{NSPoint, NSRect, NSSize, NSString},
|
||||
};
|
||||
use objc::{
|
||||
declare::ClassDecl,
|
||||
runtime::{Class, Object, Protocol, Sel, BOOL, NO, YES},
|
||||
declare::ClassBuilder,
|
||||
foundation::{NSInteger, NSRange, NSUInteger},
|
||||
runtime::{Bool, Class, Object, Protocol, Sel},
|
||||
};
|
||||
use once_cell::sync::Lazy;
|
||||
|
||||
|
|
@ -124,7 +125,7 @@ pub fn new_view(ns_window: id) -> (IdRef, Weak<Mutex<CursorState>>) {
|
|||
}
|
||||
|
||||
pub unsafe fn set_ime_position(ns_view: id, position: LogicalPosition<f64>) {
|
||||
let state_ptr: *mut c_void = *(*ns_view).get_mut_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *(*ns_view).ivar_mut("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
state.ime_position = position;
|
||||
let input_context: id = msg_send![ns_view, inputContext];
|
||||
|
|
@ -132,7 +133,7 @@ pub unsafe fn set_ime_position(ns_view: id, position: LogicalPosition<f64>) {
|
|||
}
|
||||
|
||||
pub unsafe fn set_ime_allowed(ns_view: id, ime_allowed: bool) {
|
||||
let state_ptr: *mut c_void = *(*ns_view).get_mut_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *(*ns_view).ivar_mut("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
if state.ime_allowed == ime_allowed {
|
||||
return;
|
||||
|
|
@ -141,7 +142,7 @@ pub unsafe fn set_ime_allowed(ns_view: id, ime_allowed: bool) {
|
|||
if state.ime_allowed {
|
||||
return;
|
||||
}
|
||||
let marked_text_ref: &mut id = (*ns_view).get_mut_ivar("markedText");
|
||||
let marked_text_ref: &mut id = (*ns_view).ivar_mut("markedText");
|
||||
|
||||
// Clear markedText
|
||||
let _: () = msg_send![*marked_text_ref, release];
|
||||
|
|
@ -164,170 +165,135 @@ unsafe impl Sync for ViewClass {}
|
|||
|
||||
static VIEW_CLASS: Lazy<ViewClass> = Lazy::new(|| unsafe {
|
||||
let superclass = class!(NSView);
|
||||
let mut decl = ClassDecl::new("WinitView", superclass).unwrap();
|
||||
decl.add_method(sel!(dealloc), dealloc as extern "C" fn(&Object, Sel));
|
||||
let mut decl = ClassBuilder::new("WinitView", superclass).unwrap();
|
||||
decl.add_method(sel!(dealloc), dealloc as extern "C" fn(_, _));
|
||||
decl.add_method(
|
||||
sel!(initWithWinit:),
|
||||
init_with_winit as extern "C" fn(&Object, Sel, *mut c_void) -> id,
|
||||
init_with_winit as extern "C" fn(_, _, _) -> _,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(viewDidMoveToWindow),
|
||||
view_did_move_to_window as extern "C" fn(&Object, Sel),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(drawRect:),
|
||||
draw_rect as extern "C" fn(&Object, Sel, NSRect),
|
||||
view_did_move_to_window as extern "C" fn(_, _),
|
||||
);
|
||||
decl.add_method(sel!(drawRect:), draw_rect as extern "C" fn(_, _, _));
|
||||
decl.add_method(
|
||||
sel!(acceptsFirstResponder),
|
||||
accepts_first_responder as extern "C" fn(&Object, Sel) -> BOOL,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(touchBar),
|
||||
touch_bar as extern "C" fn(&Object, Sel) -> BOOL,
|
||||
accepts_first_responder as extern "C" fn(_, _) -> _,
|
||||
);
|
||||
decl.add_method(sel!(touchBar), touch_bar as extern "C" fn(_, _) -> _);
|
||||
decl.add_method(
|
||||
sel!(resetCursorRects),
|
||||
reset_cursor_rects as extern "C" fn(&Object, Sel),
|
||||
reset_cursor_rects as extern "C" fn(_, _),
|
||||
);
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
// NSTextInputClient
|
||||
decl.add_method(
|
||||
sel!(hasMarkedText),
|
||||
has_marked_text as extern "C" fn(&Object, Sel) -> BOOL,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(markedRange),
|
||||
marked_range as extern "C" fn(&Object, Sel) -> NSRange,
|
||||
has_marked_text as extern "C" fn(_, _) -> _,
|
||||
);
|
||||
decl.add_method(sel!(markedRange), marked_range as extern "C" fn(_, _) -> _);
|
||||
decl.add_method(
|
||||
sel!(selectedRange),
|
||||
selected_range as extern "C" fn(&Object, Sel) -> NSRange,
|
||||
selected_range as extern "C" fn(_, _) -> _,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(setMarkedText:selectedRange:replacementRange:),
|
||||
set_marked_text as extern "C" fn(&mut Object, Sel, id, NSRange, NSRange),
|
||||
set_marked_text as extern "C" fn(_, _, _, _, _),
|
||||
);
|
||||
decl.add_method(sel!(unmarkText), unmark_text as extern "C" fn(&Object, Sel));
|
||||
decl.add_method(sel!(unmarkText), unmark_text as extern "C" fn(_, _));
|
||||
decl.add_method(
|
||||
sel!(validAttributesForMarkedText),
|
||||
valid_attributes_for_marked_text as extern "C" fn(&Object, Sel) -> id,
|
||||
valid_attributes_for_marked_text as extern "C" fn(_, _) -> _,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(attributedSubstringForProposedRange:actualRange:),
|
||||
attributed_substring_for_proposed_range
|
||||
as extern "C" fn(&Object, Sel, NSRange, *mut c_void) -> id,
|
||||
attributed_substring_for_proposed_range as extern "C" fn(_, _, _, _) -> _,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(insertText:replacementRange:),
|
||||
insert_text as extern "C" fn(&Object, Sel, id, NSRange),
|
||||
insert_text as extern "C" fn(_, _, _, _),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(characterIndexForPoint:),
|
||||
character_index_for_point as extern "C" fn(&Object, Sel, NSPoint) -> NSUInteger,
|
||||
character_index_for_point as extern "C" fn(_, _, _) -> _,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(firstRectForCharacterRange:actualRange:),
|
||||
first_rect_for_character_range
|
||||
as extern "C" fn(&Object, Sel, NSRange, *mut c_void) -> NSRect,
|
||||
first_rect_for_character_range as extern "C" fn(_, _, _, _) -> _,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(doCommandBySelector:),
|
||||
do_command_by_selector as extern "C" fn(&Object, Sel, Sel),
|
||||
do_command_by_selector as extern "C" fn(_, _, _),
|
||||
);
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
decl.add_method(sel!(keyDown:), key_down as extern "C" fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(keyUp:), key_up as extern "C" fn(&Object, Sel, id));
|
||||
decl.add_method(
|
||||
sel!(flagsChanged:),
|
||||
flags_changed as extern "C" fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(insertTab:),
|
||||
insert_tab as extern "C" fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(sel!(keyDown:), key_down as extern "C" fn(_, _, _));
|
||||
decl.add_method(sel!(keyUp:), key_up as extern "C" fn(_, _, _));
|
||||
decl.add_method(sel!(flagsChanged:), flags_changed as extern "C" fn(_, _, _));
|
||||
decl.add_method(sel!(insertTab:), insert_tab as extern "C" fn(_, _, _));
|
||||
decl.add_method(
|
||||
sel!(insertBackTab:),
|
||||
insert_back_tab as extern "C" fn(&Object, Sel, id),
|
||||
insert_back_tab as extern "C" fn(_, _, _),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(mouseDown:),
|
||||
mouse_down as extern "C" fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(sel!(mouseUp:), mouse_up as extern "C" fn(&Object, Sel, id));
|
||||
decl.add_method(sel!(mouseDown:), mouse_down as extern "C" fn(_, _, _));
|
||||
decl.add_method(sel!(mouseUp:), mouse_up as extern "C" fn(_, _, _));
|
||||
decl.add_method(
|
||||
sel!(rightMouseDown:),
|
||||
right_mouse_down as extern "C" fn(&Object, Sel, id),
|
||||
right_mouse_down as extern "C" fn(_, _, _),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(rightMouseUp:),
|
||||
right_mouse_up as extern "C" fn(&Object, Sel, id),
|
||||
right_mouse_up as extern "C" fn(_, _, _),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(otherMouseDown:),
|
||||
other_mouse_down as extern "C" fn(&Object, Sel, id),
|
||||
other_mouse_down as extern "C" fn(_, _, _),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(otherMouseUp:),
|
||||
other_mouse_up as extern "C" fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(mouseMoved:),
|
||||
mouse_moved as extern "C" fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(mouseDragged:),
|
||||
mouse_dragged as extern "C" fn(&Object, Sel, id),
|
||||
other_mouse_up as extern "C" fn(_, _, _),
|
||||
);
|
||||
decl.add_method(sel!(mouseMoved:), mouse_moved as extern "C" fn(_, _, _));
|
||||
decl.add_method(sel!(mouseDragged:), mouse_dragged as extern "C" fn(_, _, _));
|
||||
decl.add_method(
|
||||
sel!(rightMouseDragged:),
|
||||
right_mouse_dragged as extern "C" fn(&Object, Sel, id),
|
||||
right_mouse_dragged as extern "C" fn(_, _, _),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(otherMouseDragged:),
|
||||
other_mouse_dragged as extern "C" fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(mouseEntered:),
|
||||
mouse_entered as extern "C" fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(mouseExited:),
|
||||
mouse_exited as extern "C" fn(&Object, Sel, id),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(scrollWheel:),
|
||||
scroll_wheel as extern "C" fn(&Object, Sel, id),
|
||||
other_mouse_dragged as extern "C" fn(_, _, _),
|
||||
);
|
||||
decl.add_method(sel!(mouseEntered:), mouse_entered as extern "C" fn(_, _, _));
|
||||
decl.add_method(sel!(mouseExited:), mouse_exited as extern "C" fn(_, _, _));
|
||||
decl.add_method(sel!(scrollWheel:), scroll_wheel as extern "C" fn(_, _, _));
|
||||
decl.add_method(
|
||||
sel!(magnifyWithEvent:),
|
||||
magnify_with_event as extern "C" fn(&Object, Sel, id),
|
||||
magnify_with_event as extern "C" fn(_, _, _),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(rotateWithEvent:),
|
||||
rotate_with_event as extern "C" fn(&Object, Sel, id),
|
||||
rotate_with_event as extern "C" fn(_, _, _),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(pressureChangeWithEvent:),
|
||||
pressure_change_with_event as extern "C" fn(&Object, Sel, id),
|
||||
pressure_change_with_event as extern "C" fn(_, _, _),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(_wantsKeyDownForEvent:),
|
||||
wants_key_down_for_event as extern "C" fn(&Object, Sel, id) -> BOOL,
|
||||
wants_key_down_for_event as extern "C" fn(_, _, _) -> _,
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(cancelOperation:),
|
||||
cancel_operation as extern "C" fn(&Object, Sel, id),
|
||||
cancel_operation as extern "C" fn(_, _, _),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(frameDidChange:),
|
||||
frame_did_change as extern "C" fn(&Object, Sel, id),
|
||||
frame_did_change as extern "C" fn(_, _, _),
|
||||
);
|
||||
decl.add_method(
|
||||
sel!(acceptsFirstMouse:),
|
||||
accepts_first_mouse as extern "C" fn(&Object, Sel, id) -> BOOL,
|
||||
accepts_first_mouse as extern "C" fn(_, _, _) -> _,
|
||||
);
|
||||
decl.add_ivar::<*mut c_void>("winitState");
|
||||
decl.add_ivar::<id>("markedText");
|
||||
|
|
@ -338,9 +304,9 @@ static VIEW_CLASS: Lazy<ViewClass> = Lazy::new(|| unsafe {
|
|||
|
||||
extern "C" fn dealloc(this: &Object, _sel: Sel) {
|
||||
unsafe {
|
||||
let marked_text: id = *this.get_ivar("markedText");
|
||||
let marked_text: id = *this.ivar("markedText");
|
||||
let _: () = msg_send![marked_text, release];
|
||||
let state: *mut c_void = *this.get_ivar("winitState");
|
||||
let state: *mut c_void = *this.ivar("winitState");
|
||||
drop(Box::from_raw(state as *mut ViewState));
|
||||
}
|
||||
}
|
||||
|
|
@ -353,7 +319,7 @@ extern "C" fn init_with_winit(this: &Object, _sel: Sel, state: *mut c_void) -> i
|
|||
let marked_text =
|
||||
<id as NSMutableAttributedString>::init(NSMutableAttributedString::alloc(nil));
|
||||
(*this).set_ivar("markedText", marked_text);
|
||||
let _: () = msg_send![this, setPostsFrameChangedNotifications: YES];
|
||||
let _: () = msg_send![this, setPostsFrameChangedNotifications: true];
|
||||
|
||||
let notification_center: &Object =
|
||||
msg_send![class!(NSNotificationCenter), defaultCenter];
|
||||
|
|
@ -364,7 +330,7 @@ extern "C" fn init_with_winit(this: &Object, _sel: Sel, state: *mut c_void) -> i
|
|||
notification_center,
|
||||
addObserver: this
|
||||
selector: sel!(frameDidChange:)
|
||||
name: frame_did_change_notification_name
|
||||
name: *frame_did_change_notification_name
|
||||
object: this
|
||||
];
|
||||
|
||||
|
|
@ -378,7 +344,7 @@ extern "C" fn init_with_winit(this: &Object, _sel: Sel, state: *mut c_void) -> i
|
|||
extern "C" fn view_did_move_to_window(this: &Object, _sel: Sel) {
|
||||
trace_scope!("viewDidMoveToWindow");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
if let Some(tracking_rect) = state.tracking_rect.take() {
|
||||
|
|
@ -386,11 +352,12 @@ extern "C" fn view_did_move_to_window(this: &Object, _sel: Sel) {
|
|||
}
|
||||
|
||||
let rect: NSRect = msg_send![this, visibleRect];
|
||||
let tracking_rect: NSInteger = msg_send![this,
|
||||
addTrackingRect:rect
|
||||
owner:this
|
||||
userData:ptr::null_mut::<c_void>()
|
||||
assumeInside:NO
|
||||
let tracking_rect: NSInteger = msg_send![
|
||||
this,
|
||||
addTrackingRect: rect,
|
||||
owner: this,
|
||||
userData: ptr::null_mut::<c_void>(),
|
||||
assumeInside: false
|
||||
];
|
||||
state.tracking_rect = Some(tracking_rect);
|
||||
}
|
||||
|
|
@ -399,7 +366,7 @@ extern "C" fn view_did_move_to_window(this: &Object, _sel: Sel) {
|
|||
extern "C" fn frame_did_change(this: &Object, _sel: Sel, _event: id) {
|
||||
trace_scope!("frameDidChange:");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
if let Some(tracking_rect) = state.tracking_rect.take() {
|
||||
|
|
@ -407,11 +374,12 @@ extern "C" fn frame_did_change(this: &Object, _sel: Sel, _event: id) {
|
|||
}
|
||||
|
||||
let rect: NSRect = msg_send![this, visibleRect];
|
||||
let tracking_rect: NSInteger = msg_send![this,
|
||||
addTrackingRect:rect
|
||||
owner:this
|
||||
userData:ptr::null_mut::<c_void>()
|
||||
assumeInside:NO
|
||||
let tracking_rect: NSInteger = msg_send![
|
||||
this,
|
||||
addTrackingRect: rect,
|
||||
owner: this,
|
||||
userData: ptr::null_mut::<c_void>(),
|
||||
assumeInside: false,
|
||||
];
|
||||
state.tracking_rect = Some(tracking_rect);
|
||||
|
||||
|
|
@ -430,7 +398,7 @@ extern "C" fn frame_did_change(this: &Object, _sel: Sel, _event: id) {
|
|||
extern "C" fn draw_rect(this: &Object, _sel: Sel, rect: NSRect) {
|
||||
trace_scope!("drawRect:");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
AppState::handle_redraw(WindowId(get_window_id(state.ns_window)));
|
||||
|
|
@ -440,23 +408,23 @@ extern "C" fn draw_rect(this: &Object, _sel: Sel, rect: NSRect) {
|
|||
}
|
||||
}
|
||||
|
||||
extern "C" fn accepts_first_responder(_this: &Object, _sel: Sel) -> BOOL {
|
||||
extern "C" fn accepts_first_responder(_this: &Object, _sel: Sel) -> Bool {
|
||||
trace_scope!("acceptsFirstResponder");
|
||||
YES
|
||||
Bool::YES
|
||||
}
|
||||
|
||||
// This is necessary to prevent a beefy terminal error on MacBook Pros:
|
||||
// IMKInputSession [0x7fc573576ff0 presentFunctionRowItemTextInputViewWithEndpoint:completionHandler:] : [self textInputContext]=0x7fc573558e10 *NO* NSRemoteViewController to client, NSError=Error Domain=NSCocoaErrorDomain Code=4099 "The connection from pid 0 was invalidated from this process." UserInfo={NSDebugDescription=The connection from pid 0 was invalidated from this process.}, com.apple.inputmethod.EmojiFunctionRowItem
|
||||
// TODO: Add an API extension for using `NSTouchBar`
|
||||
extern "C" fn touch_bar(_this: &Object, _sel: Sel) -> BOOL {
|
||||
extern "C" fn touch_bar(_this: &Object, _sel: Sel) -> Bool {
|
||||
trace_scope!("touchBar");
|
||||
NO
|
||||
Bool::NO
|
||||
}
|
||||
|
||||
extern "C" fn reset_cursor_rects(this: &Object, _sel: Sel) {
|
||||
trace_scope!("resetCursorRects");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let bounds: NSRect = msg_send![this, bounds];
|
||||
|
|
@ -473,18 +441,18 @@ extern "C" fn reset_cursor_rects(this: &Object, _sel: Sel) {
|
|||
}
|
||||
}
|
||||
|
||||
extern "C" fn has_marked_text(this: &Object, _sel: Sel) -> BOOL {
|
||||
extern "C" fn has_marked_text(this: &Object, _sel: Sel) -> Bool {
|
||||
trace_scope!("hasMarkedText");
|
||||
unsafe {
|
||||
let marked_text: id = *this.get_ivar("markedText");
|
||||
(marked_text.length() > 0) as BOOL
|
||||
let marked_text: id = *this.ivar("markedText");
|
||||
Bool::new(marked_text.length() > 0)
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" fn marked_range(this: &Object, _sel: Sel) -> NSRange {
|
||||
trace_scope!("markedRange");
|
||||
unsafe {
|
||||
let marked_text: id = *this.get_ivar("markedText");
|
||||
let marked_text: id = *this.ivar("markedText");
|
||||
let length = marked_text.length();
|
||||
if length > 0 {
|
||||
NSRange::new(0, length)
|
||||
|
|
@ -516,13 +484,13 @@ extern "C" fn set_marked_text(
|
|||
trace_scope!("setMarkedText:selectedRange:replacementRange:");
|
||||
unsafe {
|
||||
// Get pre-edit text
|
||||
let marked_text_ref: &mut id = this.get_mut_ivar("markedText");
|
||||
let marked_text_ref: &mut id = this.ivar_mut("markedText");
|
||||
|
||||
// Update markedText
|
||||
let _: () = msg_send![(*marked_text_ref), release];
|
||||
let _: () = msg_send![*marked_text_ref, release];
|
||||
let marked_text = NSMutableAttributedString::alloc(nil);
|
||||
let has_attr: BOOL = msg_send![string, isKindOfClass: class!(NSAttributedString)];
|
||||
if has_attr != NO {
|
||||
let has_attr = msg_send![string, isKindOfClass: class!(NSAttributedString)];
|
||||
if has_attr {
|
||||
marked_text.initWithAttributedString(string);
|
||||
} else {
|
||||
marked_text.initWithString(string);
|
||||
|
|
@ -530,7 +498,7 @@ extern "C" fn set_marked_text(
|
|||
*marked_text_ref = marked_text;
|
||||
|
||||
// Update ViewState with new marked text
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
let preedit_string = id_to_string_lossy(string);
|
||||
|
||||
|
|
@ -568,7 +536,7 @@ extern "C" fn set_marked_text(
|
|||
extern "C" fn unmark_text(this: &Object, _sel: Sel) {
|
||||
trace_scope!("unmarkText");
|
||||
unsafe {
|
||||
let marked_text: id = *this.get_ivar("markedText");
|
||||
let marked_text: id = *this.ivar("markedText");
|
||||
let mutable_string = marked_text.mutableString();
|
||||
let s: id = msg_send![class!(NSString), new];
|
||||
let _: () = msg_send![mutable_string, setString: s];
|
||||
|
|
@ -576,7 +544,7 @@ extern "C" fn unmark_text(this: &Object, _sel: Sel) {
|
|||
let input_context: id = msg_send![this, inputContext];
|
||||
let _: () = msg_send![input_context, discardMarkedText];
|
||||
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
AppState::queue_event(EventWrapper::StaticEvent(Event::WindowEvent {
|
||||
window_id: WindowId(get_window_id(state.ns_window)),
|
||||
|
|
@ -619,7 +587,7 @@ extern "C" fn first_rect_for_character_range(
|
|||
) -> NSRect {
|
||||
trace_scope!("firstRectForCharacterRange:actualRange:");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
let content_rect =
|
||||
NSWindow::contentRectForFrameRect_(state.ns_window, NSWindow::frame(state.ns_window));
|
||||
|
|
@ -638,7 +606,7 @@ extern "C" fn first_rect_for_character_range(
|
|||
extern "C" fn insert_text(this: &Object, _sel: Sel, string: id, _replacement_range: NSRange) {
|
||||
trace_scope!("insertText:replacementRange:");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let string = id_to_string_lossy(string);
|
||||
|
|
@ -663,7 +631,7 @@ extern "C" fn do_command_by_selector(this: &Object, _sel: Sel, _command: Sel) {
|
|||
// Basically, we're sent this message whenever a keyboard event that doesn't generate a "human
|
||||
// readable" character happens, i.e. newlines, tabs, and Ctrl+C.
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
// We shouldn't forward any character from just commited text, since we'll end up sending
|
||||
|
|
@ -675,8 +643,8 @@ extern "C" fn do_command_by_selector(this: &Object, _sel: Sel, _command: Sel) {
|
|||
|
||||
state.forward_key_to_app = true;
|
||||
|
||||
let has_marked_text: BOOL = msg_send![this, hasMarkedText];
|
||||
if has_marked_text == NO && state.ime_state == ImeState::Preedit {
|
||||
let has_marked_text = msg_send![this, hasMarkedText];
|
||||
if has_marked_text && state.ime_state == ImeState::Preedit {
|
||||
// Leave preedit so that we also report the keyup for this key
|
||||
state.ime_state = ImeState::Enabled;
|
||||
}
|
||||
|
|
@ -754,7 +722,7 @@ fn update_potentially_stale_modifiers(state: &mut ViewState, event: id) {
|
|||
extern "C" fn key_down(this: &Object, _sel: Sel, event: id) {
|
||||
trace_scope!("keyDown:");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
let window_id = WindowId(get_window_id(state.ns_window));
|
||||
|
||||
|
|
@ -837,7 +805,7 @@ extern "C" fn key_down(this: &Object, _sel: Sel, event: id) {
|
|||
extern "C" fn key_up(this: &Object, _sel: Sel, event: id) {
|
||||
trace_scope!("keyUp:");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let scancode = get_scancode(event) as u32;
|
||||
|
|
@ -870,7 +838,7 @@ extern "C" fn key_up(this: &Object, _sel: Sel, event: id) {
|
|||
extern "C" fn flags_changed(this: &Object, _sel: Sel, event: id) {
|
||||
trace_scope!("flagsChanged:");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let mut events = VecDeque::with_capacity(4);
|
||||
|
|
@ -956,7 +924,7 @@ extern "C" fn insert_back_tab(this: &Object, _sel: Sel, _sender: id) {
|
|||
extern "C" fn cancel_operation(this: &Object, _sel: Sel, _sender: id) {
|
||||
trace_scope!("cancelOperation:");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let scancode = 0x2f;
|
||||
|
|
@ -988,7 +956,7 @@ extern "C" fn cancel_operation(this: &Object, _sel: Sel, _sender: id) {
|
|||
|
||||
fn mouse_click(this: &Object, event: id, button: MouseButton, button_state: ElementState) {
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
update_potentially_stale_modifiers(state, event);
|
||||
|
|
@ -1045,7 +1013,7 @@ extern "C" fn other_mouse_up(this: &Object, _sel: Sel, event: id) {
|
|||
|
||||
fn mouse_motion(this: &Object, event: id) {
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
// We have to do this to have access to the `NSView` trait...
|
||||
|
|
@ -1107,7 +1075,7 @@ extern "C" fn other_mouse_dragged(this: &Object, _sel: Sel, event: id) {
|
|||
extern "C" fn mouse_entered(this: &Object, _sel: Sel, _event: id) {
|
||||
trace_scope!("mouseEntered:");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let enter_event = Event::WindowEvent {
|
||||
|
|
@ -1124,7 +1092,7 @@ extern "C" fn mouse_entered(this: &Object, _sel: Sel, _event: id) {
|
|||
extern "C" fn mouse_exited(this: &Object, _sel: Sel, _event: id) {
|
||||
trace_scope!("mouseExited:");
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let window_event = Event::WindowEvent {
|
||||
|
|
@ -1144,12 +1112,12 @@ extern "C" fn scroll_wheel(this: &Object, _sel: Sel, event: id) {
|
|||
mouse_motion(this, event);
|
||||
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let delta = {
|
||||
let (x, y) = (event.scrollingDeltaX(), event.scrollingDeltaY());
|
||||
if event.hasPreciseScrollingDeltas() == YES {
|
||||
if Bool::from_raw(event.hasPreciseScrollingDeltas()).as_bool() {
|
||||
let delta = LogicalPosition::new(x, y).to_physical(state.get_scale_factor());
|
||||
MouseScrollDelta::PixelDelta(delta)
|
||||
} else {
|
||||
|
|
@ -1184,7 +1152,7 @@ extern "C" fn scroll_wheel(this: &Object, _sel: Sel, event: id) {
|
|||
event: DeviceEvent::MouseWheel { delta },
|
||||
};
|
||||
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
update_potentially_stale_modifiers(state, event);
|
||||
|
|
@ -1208,7 +1176,7 @@ extern "C" fn magnify_with_event(this: &Object, _sel: Sel, event: id) {
|
|||
trace_scope!("magnifyWithEvent:");
|
||||
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let delta = event.magnification();
|
||||
|
|
@ -1237,7 +1205,7 @@ extern "C" fn rotate_with_event(this: &Object, _sel: Sel, event: id) {
|
|||
trace_scope!("rotateWithEvent:");
|
||||
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let delta = event.rotation();
|
||||
|
|
@ -1268,7 +1236,7 @@ extern "C" fn pressure_change_with_event(this: &Object, _sel: Sel, event: id) {
|
|||
mouse_motion(this, event);
|
||||
|
||||
unsafe {
|
||||
let state_ptr: *mut c_void = *this.get_ivar("winitState");
|
||||
let state_ptr: *mut c_void = *this.ivar("winitState");
|
||||
let state = &mut *(state_ptr as *mut ViewState);
|
||||
|
||||
let pressure = event.pressure();
|
||||
|
|
@ -1290,12 +1258,12 @@ extern "C" fn pressure_change_with_event(this: &Object, _sel: Sel, event: id) {
|
|||
// Allows us to receive Ctrl-Tab and Ctrl-Esc.
|
||||
// Note that this *doesn't* help with any missing Cmd inputs.
|
||||
// https://github.com/chromium/chromium/blob/a86a8a6bcfa438fa3ac2eba6f02b3ad1f8e0756f/ui/views/cocoa/bridged_content_view.mm#L816
|
||||
extern "C" fn wants_key_down_for_event(_this: &Object, _sel: Sel, _event: id) -> BOOL {
|
||||
extern "C" fn wants_key_down_for_event(_this: &Object, _sel: Sel, _event: id) -> Bool {
|
||||
trace_scope!("_wantsKeyDownForEvent:");
|
||||
YES
|
||||
Bool::YES
|
||||
}
|
||||
|
||||
extern "C" fn accepts_first_mouse(_this: &Object, _sel: Sel, _event: id) -> BOOL {
|
||||
extern "C" fn accepts_first_mouse(_this: &Object, _sel: Sel, _event: id) -> Bool {
|
||||
trace_scope!("acceptsFirstMouse:");
|
||||
YES
|
||||
Bool::YES
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue