diff --git a/darwin/area.m b/darwin/area.m index a184bc4a..4d128a8a 100644 --- a/darwin/area.m +++ b/darwin/area.m @@ -11,7 +11,6 @@ BOOL libui_enabled; } - (id)initWithFrame:(NSRect)r area:(uiArea *)a; -- (uiModifiers)parseModifiers:(NSEvent *)e; - (void)doMouseEvent:(NSEvent *)e; - (int)sendKeyEvent:(uiAreaKeyEvent *)ke; - (int)doKeyDownUp:(NSEvent *)e up:(int)up; @@ -87,24 +86,6 @@ struct uiArea { return YES; } -- (uiModifiers)parseModifiers:(NSEvent *)e -{ - NSEventModifierFlags mods; - uiModifiers m; - - m = 0; - mods = [e modifierFlags]; - if ((mods & NSControlKeyMask) != 0) - m |= uiModifierCtrl; - if ((mods & NSAlternateKeyMask) != 0) - m |= uiModifierAlt; - if ((mods & NSShiftKeyMask) != 0) - m |= uiModifierShift; - if ((mods & NSCommandKeyMask) != 0) - m |= uiModifierSuper; - return m; -} - - (void)setupNewTrackingArea { self->libui_ta = [[NSTrackingArea alloc] initWithRect:[self bounds] @@ -178,7 +159,7 @@ struct uiArea { break; } - me.Modifiers = [self parseModifiers:e]; + me.Modifiers = parseModifiers(e); pmb = [NSEvent pressedMouseButtons]; me.Held1To64 = 0; @@ -260,7 +241,7 @@ mouseEvent(otherMouseUp) ke.ExtKey = 0; ke.Modifier = 0; - ke.Modifiers = [self parseModifiers:e]; + ke.Modifiers = parseModifiers(e); ke.Up = up; @@ -292,7 +273,7 @@ mouseEvent(otherMouseUp) if (!uiprivKeycodeModifier([e keyCode], &whichmod)) return 0; ke.Modifier = whichmod; - ke.Modifiers = [self parseModifiers:e]; + ke.Modifiers = parseModifiers(e); ke.Up = (ke.Modifiers & ke.Modifier) == 0; // and then drop the current modifier from Modifiers ke.Modifiers &= ~ke.Modifier; diff --git a/darwin/areaevents.m b/darwin/areaevents.m index 27b5dd64..80703104 100644 --- a/darwin/areaevents.m +++ b/darwin/areaevents.m @@ -157,3 +157,21 @@ BOOL uiprivKeycodeModifier(unsigned short keycode, uiModifiers *mod) } return NO; } + +uiModifiers parseModifiers(NSEvent *e) +{ + NSEventModifierFlags mods; + uiModifiers m; + + m = 0; + mods = [e modifierFlags]; + if ((mods & NSControlKeyMask) != 0) + m |= uiModifierCtrl; + if ((mods & NSAlternateKeyMask) != 0) + m |= uiModifierAlt; + if ((mods & NSShiftKeyMask) != 0) + m |= uiModifierShift; + if ((mods & NSCommandKeyMask) != 0) + m |= uiModifierSuper; + return m; +} diff --git a/darwin/entry.m b/darwin/entry.m index 9d9bbb07..c754db8d 100644 --- a/darwin/entry.m +++ b/darwin/entry.m @@ -67,24 +67,6 @@ static BOOL isSearchField(NSTextField *tf) return [tf isKindOfClass:[NSSearchField class]]; } -static uiModifiers parseModifiers(NSEvent *e) -{ - NSEventModifierFlags mods; - uiModifiers m; - - m = 0; - mods = [e modifierFlags]; - if ((mods & NSControlKeyMask) != 0) - m |= uiModifierCtrl; - if ((mods & NSAlternateKeyMask) != 0) - m |= uiModifierAlt; - if ((mods & NSShiftKeyMask) != 0) - m |= uiModifierShift; - if ((mods & NSCommandKeyMask) != 0) - m |= uiModifierSuper; - return m; -} - static void triggerOnKeyEvent(void *key, void *e, void *data) { uiEntry *entry = (uiEntry *)e; diff --git a/darwin/uipriv_darwin.h b/darwin/uipriv_darwin.h index 8e43fb5a..7a91bb75 100644 --- a/darwin/uipriv_darwin.h +++ b/darwin/uipriv_darwin.h @@ -111,6 +111,7 @@ extern int uiprivSendAreaEvents(NSEvent *); // areaevents.m extern BOOL uiprivFromKeycode(unsigned short keycode, uiAreaKeyEvent *ke); extern BOOL uiprivKeycodeModifier(unsigned short keycode, uiModifiers *mod); +extern uiModifiers parseModifiers(NSEvent *e); // draw.m extern uiDrawContext *uiprivDrawNewContext(CGContextRef, CGFloat);