*/
extern const struct drawing_api osx_drawing;
+/*
+ * The NSApplication shared instance, which I'll want to refer to from
+ * a few places here and there.
+ */
+NSApplication *app;
+
/* ----------------------------------------------------------------------
* Miscellaneous support routines that aren't part of any object or
* clearly defined subsystem.
[status setBezeled:YES];
[status setBezelStyle:NSTextFieldSquareBezel];
[status setDrawsBackground:YES];
- [[status cell] setTitle:@""];
+ [[status cell] setTitle:@DEFAULT_STATUSBAR_TEXT];
[status sizeToFit];
rect2 = [status frame];
rect.size.height += rect2.size.height;
[op setAllowsMultipleSelection:NO];
if ([op runModalForTypes:nil] == NSOKButton) {
- const char *name = [[[op filenames] objectAtIndex:0] cString];
+ /*
+ * This used to be
+ *
+ * [[[op filenames] objectAtIndex:0] cString]
+ *
+ * but the plain cString method became deprecated and Xcode 7
+ * started complaining about it. Since OS X 10.9 we can
+ * apparently use the more modern API
+ *
+ * [[[op URLs] objectAtIndex:0] fileSystemRepresentation]
+ *
+ * but the alternative below still compiles with Xcode 7 and
+ * is a bit more backwards compatible, so I'll try it for the
+ * moment.
+ */
+ const char *name = [[[op filenames] objectAtIndex:0]
+ cStringUsingEncoding:
+ [NSString defaultCStringEncoding]];
char *err;
FILE *fp = fopen(name, "r");
for (k = 0; k < cfg_ncontrols; k++)
[[sheet contentView] addSubview:cfg_controls[k]];
- [NSApp beginSheet:sheet modalForWindow:self
+ [app beginSheet:sheet modalForWindow:self
modalDelegate:nil didEndSelector:NULL contextInfo:nil];
}
- (void)sheetEndWithStatus:(BOOL)update
{
assert(sheet != NULL);
- [NSApp endSheet:sheet];
+ [app endSheet:sheet];
[sheet orderOut:self];
sheet = NULL;
if (update) {
NSRectFill(NSMakeRect(x1, fe->h-y1-1, 1, 1));
NSRectFill(NSMakeRect(x2, fe->h-y2-1, 1, 1));
}
+
+static void osx_draw_thick_line(
+ void *handle, float thickness,
+ float x1, float y1,
+ float x2, float y2,
+ int colour)
+{
+ frontend *fe = (frontend *)handle;
+ NSBezierPath *path = [NSBezierPath bezierPath];
+
+ assert(colour >= 0 && colour < fe->ncolours);
+ [fe->colours[colour] set];
+ [[NSGraphicsContext currentContext] setShouldAntialias: YES];
+ [path setLineWidth: thickness];
+ [path setLineCapStyle: NSButtLineCapStyle];
+ [path moveToPoint: NSMakePoint(x1, fe->h-y1)];
+ [path lineToPoint: NSMakePoint(x2, fe->h-y2)];
+ [path stroke];
+}
+
static void osx_draw_rect(void *handle, int x, int y, int w, int h, int colour)
{
frontend *fe = (frontend *)handle;
NULL, NULL, NULL, NULL, NULL, NULL, /* {begin,end}_{doc,page,puzzle} */
NULL, NULL, /* line_width, line_dotted */
osx_text_fallback,
+ osx_draw_thick_line,
};
void deactivate_timer(frontend *fe)
* AppController: the object which receives the messages from all
* menu selections that aren't standard OS X functions.
*/
-@interface AppController : NSObject
+@interface AppController : NSObject <NSApplicationDelegate>
{
}
- (void)newGameWindow:(id)sender;
pool = [[NSAutoreleasePool alloc] init];
icon = [NSImage imageNamed:@"NSApplicationIcon"];
- [NSApplication sharedApplication];
- [NSApp setApplicationIconImage:icon];
+ app = [NSApplication sharedApplication];
+ [app setApplicationIconImage:icon];
controller = [[[AppController alloc] init] autorelease];
- [NSApp setDelegate:controller];
+ [app setDelegate:controller];
- [NSApp setMainMenu: newmenu("Main Menu")];
+ [app setMainMenu: newmenu("Main Menu")];
- menu = newsubmenu([NSApp mainMenu], "Apple Menu");
+ menu = newsubmenu([app mainMenu], "Apple Menu");
newitem(menu, "About Puzzles", "", NULL, @selector(about:));
[menu addItem:[NSMenuItem separatorItem]];
- [NSApp setServicesMenu:newsubmenu(menu, "Services")];
+ [app setServicesMenu:newsubmenu(menu, "Services")];
[menu addItem:[NSMenuItem separatorItem]];
- newitem(menu, "Hide Puzzles", "h", NSApp, @selector(hide:));
- newitem(menu, "Hide Others", "o-h", NSApp, @selector(hideOtherApplications:));
- newitem(menu, "Show All", "", NSApp, @selector(unhideAllApplications:));
+ newitem(menu, "Hide Puzzles", "h", app, @selector(hide:));
+ newitem(menu, "Hide Others", "o-h", app, @selector(hideOtherApplications:));
+ newitem(menu, "Show All", "", app, @selector(unhideAllApplications:));
[menu addItem:[NSMenuItem separatorItem]];
- newitem(menu, "Quit", "q", NSApp, @selector(terminate:));
- [NSApp setAppleMenu: menu];
+ newitem(menu, "Quit", "q", app, @selector(terminate:));
+ [app setAppleMenu: menu];
- menu = newsubmenu([NSApp mainMenu], "File");
+ menu = newsubmenu([app mainMenu], "File");
newitem(menu, "Open", "o", NULL, @selector(loadSavedGame:));
newitem(menu, "Save As", "s", NULL, @selector(saveGame:));
newitem(menu, "New Game", "n", NULL, @selector(newGame:));
[menu addItem:[NSMenuItem separatorItem]];
newitem(menu, "Close", "w", NULL, @selector(performClose:));
- menu = newsubmenu([NSApp mainMenu], "Edit");
+ menu = newsubmenu([app mainMenu], "Edit");
newitem(menu, "Undo", "z", NULL, @selector(undoMove:));
newitem(menu, "Redo", "S-z", NULL, @selector(redoMove:));
[menu addItem:[NSMenuItem separatorItem]];
[menu addItem:[NSMenuItem separatorItem]];
newitem(menu, "Solve", "S-s", NULL, @selector(solveGame:));
- menu = newsubmenu([NSApp mainMenu], "Type");
+ menu = newsubmenu([app mainMenu], "Type");
typemenu = menu;
newitem(menu, "Custom", "", NULL, @selector(customGameType:));
- menu = newsubmenu([NSApp mainMenu], "Window");
- [NSApp setWindowsMenu: menu];
+ menu = newsubmenu([app mainMenu], "Window");
+ [app setWindowsMenu: menu];
newitem(menu, "Minimise Window", "m", NULL, @selector(performMiniaturize:));
- menu = newsubmenu([NSApp mainMenu], "Help");
- newitem(menu, "Puzzles Help", "?", NSApp, @selector(showHelp:));
+ menu = newsubmenu([app mainMenu], "Help");
+ newitem(menu, "Puzzles Help", "?", app, @selector(showHelp:));
- [NSApp run];
+ [app run];
[pool release];
return 0;