Fix up cocoa frontend.

- Convert to ARC
- Fix crash due to endless responder chain recursion
- Update makefile to find openssl installed via home-brew
- Fix most compiler warnings 

1 files changed, 10 insertions, 18 deletions

diff --git a/frontends/cocoa/BrowserView.m b/frontends/cocoa/BrowserView.m
index e6e8e0b17..31e74255d 100644
--- a/frontends/cocoa/BrowserView.m
+++ b/frontends/cocoa/BrowserView.m
@@ -63,7 +63,7 @@
 static const CGFloat CaretWidth = 1.0;
 static const NSTimeInterval CaretBlinkTime = 0.8;
 
-- initWithFrame: (NSRect) frame
+- (instancetype)initWithFrame: (NSRect) frame
 {
         if ((self = [super initWithFrame: frame]) == nil) {
                 return nil;
@@ -78,17 +78,13 @@ static const NSTimeInterval CaretBlinkTime = 0.8;
 {
         [self setCaretTimer: nil];
         [self setMarkedText: nil];
-        [history release];
-
-        [super dealloc];
 }
 
 - (void) setCaretTimer: (NSTimer *)newTimer
 {
         if (newTimer != caretTimer) {
                 [caretTimer invalidate];
-                [caretTimer release];
-                caretTimer = [newTimer retain];
+                caretTimer = newTimer;
         }
 }
 
@@ -148,7 +144,7 @@ static inline NSRect cocoa_get_caret_rect( BrowserView *view )
 
 - (void)drawRect:(NSRect)dirtyRect
 {
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    @autoreleasepool {
 
         struct redraw_context ctx = {
                 .interactive = true,
@@ -177,7 +173,7 @@ static inline NSRect cocoa_get_caret_rect( BrowserView *view )
                 [NSBezierPath fillRect: caretRect];
         }
 
-        [pool release];
+    }
 }
 
 - (BOOL) isFlipped
@@ -192,7 +188,6 @@ static inline NSRect cocoa_get_caret_rect( BrowserView *view )
                                                               owner: self
                                                            userInfo: nil];
         [self addTrackingArea: area];
-        [area release];
 }
 
 static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
@@ -200,8 +195,8 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
         browser_mouse_state result = 0;
         NSUInteger flags = [evt modifierFlags];
 
-        if (flags & NSShiftKeyMask) result |= BROWSER_MOUSE_MOD_1;
-        if (flags & NSAlternateKeyMask) result |= BROWSER_MOUSE_MOD_2;
+        if (flags & NSEventModifierFlagShift) result |= BROWSER_MOUSE_MOD_1;
+        if (flags & NSEventModifierFlagOption) result |= BROWSER_MOUSE_MOD_2;
 
         return result;
 }
@@ -221,7 +216,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
 
 - (void) mouseDown: (NSEvent *)theEvent
 {
-        if ([theEvent modifierFlags] & NSControlKeyMask) {
+        if ([theEvent modifierFlags] & NSEventModifierFlagControl) {
                 [self popUpContextMenuForEvent: theEvent];
                 return;
         }
@@ -527,7 +522,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
                                keyEquivalent: @""] setRepresentedObject: imageURL];
                 [[popupMenu addItemWithTitle: NSLocalizedString( @"Copy image", @"Context menu" )
                                       action: @selector(cmImageCopy:)
-                               keyEquivalent: @""] setRepresentedObject: (id)content_get_bitmap( cont.object )];
+                               keyEquivalent: @""] setRepresentedObject: (__bridge id)content_get_bitmap( cont.object )];
 
                 [popupMenu addItem: [NSMenuItem separatorItem]];
         }
@@ -561,8 +556,6 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
                              action: @selector(viewSource:) keyEquivalent: @""];
 
         [NSMenu popUpContextMenu: popupMenu withEvent: event forView: self];
-
-        [popupMenu release];
 }
 
 - (IBAction) cmOpenURLInTab: (id)sender
@@ -693,7 +686,6 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
 
 - (void) setMarkedText: (id) aString selectedRange: (NSRange) selRange
 {
-        [markedText release];
         markedText = [aString isEqualToString: @""] ? nil : [aString copy];
 }
 
@@ -714,7 +706,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
 
 - (NSAttributedString *) attributedSubstringFromRange: (NSRange) theRange
 {
-        return [[[NSAttributedString alloc] initWithString: @""] autorelease];
+        return [[NSAttributedString alloc] initWithString: @""];
 }
 
 - (NSRange) markedRange
@@ -742,7 +734,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
         return [NSArray array];
 }
 
-- (void) doCommandBySelector: (SEL) sel;
+- (void) doCommandBySelector: (SEL) sel
 {
         [super doCommandBySelector: sel];
 }