Fixes for Catalina (10.14+)

.gitignore

@@ -0,0 +1,39 @@
+# Created by https://www.gitignore.io/api/xcode
+# Edit at https://www.gitignore.io/?templates=xcode
+
+### Xcode ###
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## User settings
+xcuserdata/
+
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+*.xcscmblueprint
+*.xccheckout
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
+build/
+DerivedData/
+*.moved-aside
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+
+## Xcode Patch
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcworkspace/contents.xcworkspacedata
+/*.gcno
+
+### Xcode Patch ###
+**/xcshareddata/WorkspaceSettings.xcsettings
+
+# End of https://www.gitignore.io/api/xcode

FPCheckmark.m

@@ -61,8 +61,8 @@ - (BOOL)placeWithEvent:(NSEvent *)theEvent
 
         // get ready for next iteration of the loop, or break out of loop
         theEvent = [[_docView window] nextEventMatchingMask:
-            (NSLeftMouseDraggedMask | NSLeftMouseUpMask)];
-        if ([theEvent type] == NSLeftMouseUp)
+                    (NSEventMaskLeftMouseDragged | NSEventMaskLeftMouseUp)];
+        if ([theEvent type] == NSEventTypeLeftMouseUp)
             break;
     }
 

FPDocumentView.m

@@ -177,8 +177,15 @@ - (void)scrollToMidpointOnPage:(unsigned int)page point:(NSPoint)midPoint
     NSPoint viewPoint = [self convertPoint:midPoint fromPage:page];
     NSPoint viewOrigin = NSMakePoint(floorf(viewPoint.x - viewWidth/2.0),
                                      floorf(viewPoint.y - viewHeight/2.0));
+/*
+ TODO
+ Fix the error:
+ Sending 'NSPoint' (aka 'struct CGPoint') to parameter of incompatible type 'NSRect' (aka 'struct CGRect')
     [[_scrollView contentView] scrollToPoint:
-        [[_scrollView contentView] constrainScrollPoint:viewOrigin]];
+        [[_scrollView contentView] constrainBoundsRect:viewOrigin]];
+ */
+    [[_scrollView contentView] scrollToPoint:viewOrigin];
+
     [_scrollView reflectScrolledClipView:[_scrollView contentView]];
 }
 
@@ -302,7 +309,8 @@ - (void)drawRect:(NSRect)rect
         [at concat];
 
         if (!_is_printing || [_doc drawsOriginalPDF])
-            [[_pdf_document pageAtIndex:i] drawWithBox:_box];
+            [[_pdf_document pageAtIndex:i] drawWithBox:_box
+                                             toContext:theContext.CGContext];
 
         for (unsigned int j = 0; j < [_overlayGraphics count]; j++) {
             FPGraphic *g;
@@ -453,9 +461,8 @@ - (void)moveSelectionWithEvent:(NSEvent *)theEvent
     for (;;) {
         // get ready for next iteration of the loop, or break out of loop
         theEvent =
-            [[self window] nextEventMatchingMask:(NSLeftMouseDraggedMask |
-                                                  NSLeftMouseUpMask)];
-        if ([theEvent type] == NSLeftMouseUp)
+            [[self window] nextEventMatchingMask:(NSEventMaskLeftMouseDragged | NSEventMaskLeftMouseUp)];
+        if ([theEvent type] == NSEventTypeLeftMouseUp)
             break;
 
         // main loop body
@@ -586,7 +593,7 @@ - (void)mouseDown:(NSEvent *)theEvent
             if (([graphic page] == page) &&
                 NSPointInRect(pagePoint, [graphic safeBounds])) {
                 // we hit 'graphic'
-                if ([theEvent modifierFlags] & NSShiftKeyMask) {
+                if ([theEvent modifierFlags] & NSEventModifierFlagShift) {
                     [_selectedGraphics invertMembershipForObject:graphic];
                     [[NSNotificationCenter defaultCenter] postNotificationName:FPSelectionChangedNotification
                                                                         object:[self window]
@@ -630,7 +637,7 @@ - (void)mouseDown:(NSEvent *)theEvent
         } else {
             if ([_selectedGraphics count]) {
                 [self setNeedsDisplay:YES];
-                if ([theEvent modifierFlags] & NSAlternateKeyMask) {
+                if ([theEvent modifierFlags] & NSEventModifierFlagOption) {
                     DLog(@"will copy\n");
                     // if option key is down, and a drag is begun, 
                     // copy the elements and drag those new ones
@@ -762,23 +769,22 @@ - (IBAction)placeImage:(id)sender
     DLog(@"DocView's plageImage\n");
     NSOpenPanel *panel = [NSOpenPanel openPanel];
     [panel setAllowsMultipleSelection:NO];
-    [panel beginSheetForDirectory:nil
-                             file:nil
-                            types:nil
-                   modalForWindow:[self window]
-                    modalDelegate:self
-                   didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:)
-                      contextInfo:nil];
+    [panel beginSheetModalForWindow:[self window]
+                  completionHandler:^(NSInteger returnCode) {
+        [self openPanelDidEnd:panel
+                   returnCode:returnCode
+                  contextInfo:NULL ];
+    } ];
+
 }
 
 - (void)openPanelDidEnd:(NSOpenPanel *)panel
              returnCode:(int)returnCode
             contextInfo:(void *)contextInfo
 {
-    if (NSOKButton != returnCode) return;
-
+    if (NSModalResponseOK != returnCode) return;
     NSImage *image = [[[NSImage alloc]
-                       initWithContentsOfFile:[panel filename]] autorelease];
+                       initWithContentsOfFile:[[panel URL] path]] autorelease];
 
     if (nil == image) {
         // failed to open

FPDocumentWindow.m

@@ -92,8 +92,8 @@ - (void)flagsChanged:(NSEvent *)theEvent
 {
     DLog(@"flags changed\n");
     if ((NO == _sentQuickMove) &&
-        ([theEvent modifierFlags] & NSAlternateKeyMask) &&
-        ([theEvent modifierFlags] & NSCommandKeyMask) &&
+        ([theEvent modifierFlags] & NSEventModifierFlagOption) &&
+        ([theEvent modifierFlags] & NSEventModifierFlagCommand) &&
         ([_docView shouldEnterQuickMove])) {
         DLog(@"got apple-option\n");
         [[NSNotificationCenter defaultCenter] postNotification:

FPGraphic.m

@@ -142,13 +142,9 @@ - (id)initWithArchivalDictionary:(NSDictionary *)dict
         _strokeWidth =
             [[dict objectForKey:strokeWidthArchiveKey] floatValue];
         _fillColor =
-            [[NSUnarchiver
-              unarchiveObjectWithData:
-              [dict objectForKey:fillColorArchiveKey]] retain];
+            [[NSKeyedUnarchiver unarchivedObjectOfClass:[NSColor class] fromData:[dict objectForKey:fillColorArchiveKey] error:nil] retain];
         _strokeColor =
-            [[NSUnarchiver
-              unarchiveObjectWithData:
-              [dict objectForKey:strokeColorArchiveKey]] retain];
+        [[NSKeyedUnarchiver unarchivedObjectOfClass:[NSColor class] fromData:[dict objectForKey:strokeColorArchiveKey] error:nil] retain];
         _knobMask =
             [[dict objectForKey:knobMaskArchiveKey] intValue];
         _gFlags.hidesWhenPrinting =
@@ -171,9 +167,9 @@ - (NSDictionary *)archivalDictionary
             forKey:drawsStrokeArchiveKey];
     [ret setObject:[NSNumber numberWithFloat:_strokeWidth]
             forKey:strokeWidthArchiveKey];
-    [ret setObject:[NSArchiver archivedDataWithRootObject:_fillColor]
+    [ret setObject:[NSKeyedArchiver archivedDataWithRootObject:_fillColor requiringSecureCoding:YES error:nil]
             forKey:fillColorArchiveKey];
-    [ret setObject:[NSArchiver archivedDataWithRootObject:_strokeColor]
+    [ret setObject:[NSKeyedArchiver archivedDataWithRootObject:_strokeColor requiringSecureCoding:YES error:nil]
             forKey:strokeColorArchiveKey];
     [ret setObject:[NSNumber numberWithInt:_knobMask]
             forKey:knobMaskArchiveKey];
@@ -218,8 +214,8 @@ - (BOOL)placeWithEvent:(NSEvent *)theEvent
 
         // get ready for next iteration of the loop, or break out of loop
         theEvent = [[_docView window] nextEventMatchingMask:
-                    (NSLeftMouseDraggedMask | NSLeftMouseUpMask)];
-        if ([theEvent type] == NSLeftMouseUp)
+                    (NSEventMaskLeftMouseDragged | NSEventMaskLeftMouseUp)];
+        if ([theEvent type] == NSEventTypeLeftMouseUp)
             break;
     }
     assert(_hasPage);
@@ -365,7 +361,7 @@ - (void)resizeWithEvent:(NSEvent *)theEvent byKnob:(int)knob
             }
         }
 
-        if ([theEvent modifierFlags] & NSShiftKeyMask) {
+        if ([theEvent modifierFlags] & NSEventModifierFlagShift) {
             BOOL didFlip;
             switch (knob) {
                 case UpperRightKnob:
@@ -395,8 +391,8 @@ - (void)resizeWithEvent:(NSEvent *)theEvent byKnob:(int)knob
 
         // get ready for next iteration of the loop, or break out of loop
         theEvent = [[_docView window] nextEventMatchingMask:
-                    (NSLeftMouseDraggedMask | NSLeftMouseUpMask)];
-        if ([theEvent type] == NSLeftMouseUp)
+                    (NSEventMaskLeftMouseDragged | NSEventMaskLeftMouseUp)];
+        if ([theEvent type] == NSEventTypeLeftMouseUp)
             break;
     }
     [_docView discardCursorRects];

FPImage.m

@@ -36,8 +36,8 @@ - (id)initWithArchivalDictionary:(NSDictionary *)dict
     self = [super initWithArchivalDictionary:dict
                               inDocumentView:docView];
     if (self) {
-        _image = [[NSUnarchiver unarchiveObjectWithData:
-                   [dict objectForKey:imageArchiveKey]] retain];
+        _image=[[NSKeyedUnarchiver unarchivedObjectOfClass:[FPImage class]
+                                                  fromData:[dict objectForKey:imageArchiveKey] error:nil] retain];
     }
     return self;
 }
@@ -47,7 +47,9 @@ - (NSDictionary *)archivalDictionary
     NSMutableDictionary *ret =
         [NSMutableDictionary
          dictionaryWithDictionary:[super archivalDictionary]];
-    [ret setObject:[NSArchiver archivedDataWithRootObject:_image]
+    [ret setObject:[NSKeyedArchiver archivedDataWithRootObject:_image
+                                         requiringSecureCoding:YES
+                                                         error:nil]
      forNonexistentKey:imageArchiveKey];
     return ret;
 }
@@ -81,7 +83,7 @@ - (void)draw:(BOOL)selected
 {
     [_image drawInRect:[self bounds]
               fromRect:NSZeroRect
-             operation:NSCompositeSourceOver
+             operation:NSCompositingOperationSourceOver
               fraction:1.0]; // 1.0 means fully opaque
 }
 

FPInspectorController.m

@@ -34,7 +34,7 @@ - (void)awakeFromNib
 
 - (void)cascadeEnabledness
 {
-    BOOL doStroke = ([_strokeCheckbox state] == NSOnState);
+    BOOL doStroke = ([_strokeCheckbox state] == NSControlStateValueOn);
     [_widthTextField setEnabled:doStroke];
     [_widthStepper setEnabled:doStroke];
     [_strokeColorWell setEnabled:doStroke];
@@ -46,7 +46,7 @@ - (void)cascadeEnabledness
         [_widthLabel setTextColor:[NSColor grayColor]];
     }
 
-    BOOL doFill = ([_fillCheckbox state] == NSOnState);
+    BOOL doFill = ([_fillCheckbox state] == NSControlStateValueOn);
     [_fillColorWell setEnabled:doFill];
 }
 

FPRectangle.m

@@ -47,8 +47,8 @@ - (BOOL)placeWithEvent:(NSEvent *)theEvent
     _naturalBounds.size = NSMakeSize(1.0, 1.0);
 
     // if the next event is mouse up, then the user didn't drag at all, so scrap the shape.
-    theEvent = [[_docView window] nextEventMatchingMask:(NSLeftMouseDraggedMask | NSLeftMouseUpMask)];
-    if ([theEvent type] == NSLeftMouseUp)
+    theEvent = [[_docView window] nextEventMatchingMask:(NSEventMaskLeftMouseDragged | NSEventMaskLeftMouseUp)];
+    if ([theEvent type] == NSEventTypeLeftMouseUp)
         return NO;
     // ok, we have a shape, and user is dragging to size it
     [self resizeWithEvent:theEvent byKnob:LowerRightKnob];

FPSquiggle.m

@@ -153,10 +153,10 @@ - (BOOL)placeWithEvent:(NSEvent *)theEvent
 
         // get ready for next iteration of the loop, or break out of loop
         point = new_point;
-        
+
         theEvent = [[_docView window] nextEventMatchingMask:
-                    (NSLeftMouseDraggedMask | NSLeftMouseUpMask)];
-        if ([theEvent type] == NSLeftMouseUp)
+                    (NSEventMaskLeftMouseDragged | NSEventMaskLeftMouseUp)];
+        if ([theEvent type] == NSEventTypeLeftMouseUp)
             break;
     }
     _bounds = [_path bounds];

FPTextAreaB.m

@@ -101,7 +101,7 @@ - (NSDictionary *)archivalDictionary
          forNonexistentKey:editorFrameKey];
     NSData *d =
         [_textStorage RTFFromRange:NSMakeRange(0, [_textStorage length])
-                documentAttributes:nil];
+                documentAttributes: @{}];
     NSString *rtfstr =
         [[NSString alloc] initWithData:d encoding:NSUTF8StringEncoding];
 
@@ -149,9 +149,9 @@ - (BOOL)placeWithEvent:(NSEvent *)theEvent
 
     // if the next event is mouse up, then the user didn't drag at all
     theEvent = [[_docView window] nextEventMatchingMask:
-                (NSLeftMouseDraggedMask | NSLeftMouseUpMask)];
+                (NSEventMaskLeftMouseDragged | NSEventMaskLeftMouseUp)];
     _isAutoSizedX = _isAutoSizedY = YES;
-    if ([theEvent type] != NSLeftMouseUp) {
+    if ([theEvent type] != NSEventTypeLeftMouseUp) {
         [self resizeWithEvent:theEvent byKnob:LowerRightKnob];
     }
     _isPlacing = NO;

FPTipsController.m

@@ -67,10 +67,10 @@ - (void)awakeFromNib
         DLog(@"unable to load tips.plist\n");
         return;
     }
-    _tips = [NSPropertyListSerialization propertyListFromData:data
-                                            mutabilityOption:NSPropertyListImmutable
-                                                      format:nil
-                                            errorDescription:nil];
+    _tips = [NSPropertyListSerialization propertyListWithData:data
+                                                      options:NSPropertyListImmutable
+                                                       format:nil
+                                                        error:nil];
     [_tips retain];
     _tipOnDisplay = [self getNextTipIndexFromDefaults];
     [self displayTip:_tipOnDisplay];

FPToolPaletteController.m

@@ -66,8 +66,8 @@ + (FPToolPaletteController *)sharedToolPaletteController
 - (IBAction)chooseTool:(id)sender
 {
     [_buttonArray makeObjectsPerformSelector:@selector(setState:)
-                                  withObject:(id)NSOffState];
-    [sender setState:NSOnState];
+                                  withObject:(id)NSControlStateValueOff];
+    [sender setState:NSControlStateValueOn];
     [[NSNotificationCenter defaultCenter] postNotification:
         [NSNotification notificationWithName:FPToolChosen
                                       object:self]];
@@ -78,7 +78,7 @@ - (unsigned int)currentTool
     for (unsigned int i = 0; i < [_buttonArray count]; i++) {
         NSButton *b = [_buttonArray objectAtIndex:i];
         DLog(@"button = 0x%08x\n", (unsigned)b);
-        if ([[_buttonArray objectAtIndex:i] state] == NSOnState)
+        if ([[_buttonArray objectAtIndex:i] state] == NSControlStateValueOn)
             return i;
     }
     assert(0);
@@ -103,7 +103,7 @@ - (void)keyDown:(NSEvent *)theEvent
     if (1 != [[theEvent charactersIgnoringModifiers] length])
         return;
     // we don't want any modifiers, except numeric pad is okay
-    if ((NSDeviceIndependentModifierFlagsMask ^ NSNumericPadKeyMask) & [theEvent modifierFlags]) {
+    if ((NSEventModifierFlagDeviceIndependentFlagsMask ^ NSEventModifierFlagNumericPad) & [theEvent modifierFlags]) {
         return;
     }
     unichar c = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];