* recreate it.
*/
+#define COMBINED /* we put all the puzzles in one binary in this port */
+
#include <ctype.h>
+#include <time.h>
#include <sys/time.h>
#import <Cocoa/Cocoa.h>
#include "puzzles.h"
*/
NSMenu *typemenu;
+/*
+ * Forward reference.
+ */
+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.
} else {
alert = [[alert init] autorelease];
[alert addButtonWithTitle:@"Oh dear"];
- [alert setInformativeText:[NSString stringWithCString:errorbuf]];
+ [alert setInformativeText:[NSString stringWithUTF8String:errorbuf]];
[alert runModal];
}
exit(1);
*randseedsize = sizeof(time_t);
}
+static void savefile_write(void *wctx, void *buf, int len)
+{
+ FILE *fp = (FILE *)wctx;
+ fwrite(buf, 1, len, fp);
+}
+
+static int savefile_read(void *wctx, void *buf, int len)
+{
+ FILE *fp = (FILE *)wctx;
+ int ret;
+
+ ret = fread(buf, 1, len, fp);
+ return (ret == len);
+}
+
+/*
+ * Since this front end does not support printing (yet), we need
+ * this stub to satisfy the reference in midend_print_puzzle().
+ */
+void document_add_puzzle(document *doc, const game *game, game_params *par,
+ game_state *st, game_state *st2)
+{
+}
+
+/*
+ * setAppleMenu isn't listed in the NSApplication header, but an
+ * NSApp responds to it, so we're adding it here to silence
+ * warnings. (This was removed from the headers in 10.4, so we
+ * only need to include it for 10.4+.)
+ */
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040
+@interface NSApplication(NSAppleMenu)
+- (void)setAppleMenu:(NSMenu *)menu;
+@end
+#endif
+
/* ----------------------------------------------------------------------
* Tiny extension to NSMenuItem which carries a payload of a `void
* *', allowing several menu items to invoke the same message but
NSMenu *newmenu(const char *title)
{
return [[[NSMenu allocWithZone:[NSMenu menuZone]]
- initWithTitle:[NSString stringWithCString:title]]
+ initWithTitle:[NSString stringWithUTF8String:title]]
autorelease];
}
NSMenu *child;
item = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
- initWithTitle:[NSString stringWithCString:title]
+ initWithTitle:[NSString stringWithUTF8String:title]
action:NULL
keyEquivalent:@""]
autorelease];
key++;
}
- item = [[item initWithTitle:[NSString stringWithCString:title]
+ item = [[item initWithTitle:[NSString stringWithUTF8String:title]
action:NULL
- keyEquivalent:[NSString stringWithCString:key]]
+ keyEquivalent:[NSString stringWithUTF8String:key]]
autorelease];
if (*key)
[tf setBordered:NO];
[tf setDrawsBackground:NO];
[tf setFont:font1];
- [tf setStringValue:[NSString stringWithCString:ver]];
+ [tf setStringValue:[NSString stringWithUTF8String:ver]];
[tf sizeToFit];
views[nviews++] = tf;
NSColor **colours;
int ncolours;
int clipped;
+ int w, h;
};
@interface MyImageView : NSImageView
GameWindow *ourwin;
}
- (void)setWindow:(GameWindow *)win;
-- (BOOL)isFlipped;
- (void)mouseEvent:(NSEvent *)ev button:(int)b;
- (void)mouseDown:(NSEvent *)ev;
- (void)mouseDragged:(NSEvent *)ev;
@interface GameWindow : NSWindow
{
const game *ourgame;
- midend_data *me;
+ midend *me;
struct frontend fe;
struct timeval last_time;
NSTimer *timer;
NSView **cfg_controls;
int cfg_ncontrols;
NSTextField *status;
+ struct preset_menu *preset_menu;
+ NSMenuItem **preset_menu_items;
+ int n_preset_menu_items;
}
- (id)initWithGame:(const game *)g;
-- dealloc;
+- (void)dealloc;
- (void)processButton:(int)b x:(int)x y:(int)y;
+- (void)processKey:(int)b;
- (void)keyDown:(NSEvent *)ev;
- (void)activateTimer;
- (void)deactivateTimer;
-- (void)setStatusLine:(NSString *)text;
+- (void)setStatusLine:(char *)text;
+- (void)resizeForNewGameParams;
+- (void)updateTypeMenuTick;
@end
@implementation MyImageView
ourwin = win;
}
-- (BOOL)isFlipped
-{
- return YES;
-}
-
- (void)mouseEvent:(NSEvent *)ev button:(int)b
{
NSPoint point = [self convertPoint:[ev locationInWindow] fromView:nil];
frame.origin.y = 0;
frame.origin.x = 0;
- midend_size(me, &w, &h);
+ w = h = INT_MAX;
+ midend_size(me, &w, &h, FALSE);
frame.size.width = w;
frame.size.height = h;
+ fe.w = w;
+ fe.h = h;
fe.image = [[NSImage alloc] initWithSize:frame.size];
- [fe.image setFlipped:YES];
fe.view = [[MyImageView alloc] initWithFrame:frame];
[fe.view setImage:fe.image];
[fe.view setWindow:self];
int w, h;
ourgame = g;
+ preset_menu = NULL;
+ preset_menu_items = NULL;
fe.window = self;
- me = midend_new(&fe, ourgame);
+ me = midend_new(&fe, ourgame, &osx_drawing, &fe);
/*
* If we ever need to open a fresh window using a provided game
* ID, I think the right thing is to move most of this method
* initWithGame: simply call that one and pass it NULL.
*/
midend_new_game(me);
- midend_size(me, &w, &h);
+ w = h = INT_MAX;
+ midend_size(me, &w, &h, FALSE);
rect.size.width = w;
rect.size.height = h;
+ fe.w = w;
+ fe.h = h;
/*
* Create the status bar, which will just be an NSTextField.
*/
- if (ourgame->wants_statusbar()) {
+ if (midend_wants_statusbar(me)) {
status = [[NSTextField alloc] initWithFrame:NSMakeRect(0,0,100,50)];
[status setEditable:NO];
[status setSelectable:NO];
[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;
NSClosableWindowMask)
backing:NSBackingStoreBuffered
defer:YES];
- [self setTitle:[NSString stringWithCString:ourgame->name]];
+ [self setTitle:[NSString stringWithUTF8String:ourgame->name]];
{
float *colours;
return self;
}
-- dealloc
+- (void)dealloc
{
int i;
for (i = 0; i < fe.ncolours; i++) {
[fe.colours[i] release];
}
sfree(fe.colours);
+ sfree(preset_menu_items);
midend_free(me);
- return [super dealloc];
+ [super dealloc];
}
- (void)processButton:(int)b x:(int)x y:(int)y
{
- if (!midend_process_key(me, x, y, b))
+ if (!midend_process_key(me, x, fe.h - 1 - y, b))
+ [self close];
+}
+
+- (void)processKey:(int)b
+{
+ if (!midend_process_key(me, -1, -1, b))
[self close];
}
* function key codes.
*/
if (c >= 0x80) {
+ int mods = FALSE;
switch (c) {
case NSUpArrowFunctionKey:
c = CURSOR_UP;
+ mods = TRUE;
break;
case NSDownArrowFunctionKey:
c = CURSOR_DOWN;
+ mods = TRUE;
break;
case NSLeftArrowFunctionKey:
c = CURSOR_LEFT;
+ mods = TRUE;
break;
case NSRightArrowFunctionKey:
c = CURSOR_RIGHT;
+ mods = TRUE;
break;
default:
continue;
}
+
+ if (mods) {
+ if ([ev modifierFlags] & NSShiftKeyMask)
+ c |= MOD_SHFT;
+ if ([ev modifierFlags] & NSControlKeyMask)
+ c |= MOD_CTRL;
+ }
}
if (c >= '0' && c <= '9' && ([ev modifierFlags] & NSNumericPadKeyMask))
c |= MOD_NUM_KEYPAD;
- [self processButton:c x:-1 y:-1];
+ if (c == 26 &&
+ !((NSShiftKeyMask | NSControlKeyMask) & ~[ev modifierFlags]))
+ c = UI_REDO;
+
+ [self processKey:c];
}
}
last_time = now;
}
+- (void)showError:(char *)message
+{
+ NSAlert *alert;
+
+ alert = [[[NSAlert alloc] init] autorelease];
+ [alert addButtonWithTitle:@"Bah"];
+ [alert setInformativeText:[NSString stringWithUTF8String:message]];
+ [alert beginSheetModalForWindow:self modalDelegate:nil
+ didEndSelector:NULL contextInfo:nil];
+}
+
- (void)newGame:(id)sender
{
- [self processButton:'n' x:-1 y:-1];
+ [self processKey:UI_NEWGAME];
}
- (void)restartGame:(id)sender
{
- [self processButton:'r' x:-1 y:-1];
+ midend_restart_game(me);
+}
+- (void)saveGame:(id)sender
+{
+ NSSavePanel *sp = [NSSavePanel savePanel];
+
+ if ([sp runModal] == NSFileHandlingPanelOKButton) {
+ const char *name = [[sp filename] UTF8String];
+
+ FILE *fp = fopen(name, "w");
+
+ if (!fp) {
+ [self showError:"Unable to open save file"];
+ return;
+ }
+
+ midend_serialise(me, savefile_write, fp);
+
+ fclose(fp);
+ }
+}
+- (void)loadSavedGame:(id)sender
+{
+ NSOpenPanel *op = [NSOpenPanel openPanel];
+
+ [op setAllowsMultipleSelection:NO];
+
+ if ([op runModalForTypes:nil] == NSOKButton) {
+ /*
+ * 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");
+
+ if (!fp) {
+ [self showError:"Unable to open saved game file"];
+ return;
+ }
+
+ err = midend_deserialise(me, savefile_read, fp);
+
+ fclose(fp);
+
+ if (err) {
+ [self showError:err];
+ return;
+ }
+
+ [self resizeForNewGameParams];
+ [self updateTypeMenuTick];
+ }
}
- (void)undoMove:(id)sender
{
- [self processButton:'u' x:-1 y:-1];
+ [self processKey:UI_UNDO];
}
- (void)redoMove:(id)sender
{
- [self processButton:'r'&0x1F x:-1 y:-1];
+ [self processKey:UI_REDO];
}
- (void)copy:(id)sender
NSPasteboard *pb = [NSPasteboard generalPasteboard];
NSArray *a = [NSArray arrayWithObject:NSStringPboardType];
[pb declareTypes:a owner:nil];
- [pb setString:[NSString stringWithCString:text]
+ [pb setString:[NSString stringWithUTF8String:text]
forType:NSStringPboardType];
} else
NSBeep();
- (void)solveGame:(id)sender
{
char *msg;
- NSAlert *alert;
msg = midend_solve(me);
- if (msg) {
- alert = [[[NSAlert alloc] init] autorelease];
- [alert addButtonWithTitle:@"Bah"];
- [alert setInformativeText:[NSString stringWithCString:msg]];
- [alert beginSheetModalForWindow:self modalDelegate:nil
- didEndSelector:nil contextInfo:nil];
- }
+ if (msg)
+ [self showError:msg];
}
- (BOOL)validateMenuItem:(NSMenuItem *)item
{
if ([item action] == @selector(copy:))
- return (ourgame->can_format_as_text ? YES : NO);
+ return (ourgame->can_format_as_text_ever &&
+ midend_can_format_as_text_now(me) ? YES : NO);
else if ([item action] == @selector(solveGame:))
return (ourgame->can_solve ? YES : NO);
else
- (void)clearTypeMenu
{
+ int i;
+
while ([typemenu numberOfItems] > 1)
[typemenu removeItemAtIndex:0];
+ [[typemenu itemAtIndex:0] setState:NSOffState];
+
+ for (i = 0; i < n_preset_menu_items; i++)
+ preset_menu_items[i] = NULL;
}
-- (void)becomeKeyWindow
+- (void)updateTypeMenuTick
{
- int n;
+ int i, n;
- [self clearTypeMenu];
+ n = midend_which_preset(me);
- [super becomeKeyWindow];
+ for (i = 0; i < n_preset_menu_items; i++)
+ if (preset_menu_items[i])
+ [preset_menu_items[i] setState:(i == n ? NSOnState : NSOffState)];
+
+ /*
+ * The Custom menu item is always right at the bottom of the
+ * Type menu.
+ */
+ [[typemenu itemAtIndex:[typemenu numberOfItems]-1]
+ setState:(n < 0 ? NSOnState : NSOffState)];
+}
- n = midend_num_presets(me);
+- (void)populateTypeMenu:(NSMenu *)nsmenu from:(struct preset_menu *)menu
+{
+ int i;
- if (n > 0) {
- [typemenu insertItem:[NSMenuItem separatorItem] atIndex:0];
- while (n--) {
- char *name;
- game_params *params;
- DataMenuItem *item;
+ /*
+ * We process the entries in reverse order so that (in the
+ * top-level Type menu at least) we don't disturb the 'Custom'
+ * item which remains fixed even when we change back and forth
+ * between puzzle type windows.
+ */
+ for (i = menu->n_entries; i-- > 0 ;) {
+ struct preset_menu_entry *entry = &menu->entries[i];
+ NSMenuItem *item;
+
+ if (entry->params) {
+ DataMenuItem *ditem;
+ ditem = [[[DataMenuItem alloc]
+ initWithTitle:[NSString stringWithUTF8String:
+ entry->title]
+ action:NULL keyEquivalent:@""]
+ autorelease];
+
+ [ditem setTarget:self];
+ [ditem setAction:@selector(presetGame:)];
+ [ditem setPayload:entry->params];
+
+ preset_menu_items[entry->id] = ditem;
+
+ item = ditem;
+ } else {
+ NSMenu *nssubmenu;
+
+ item = [[[NSMenuItem alloc]
+ initWithTitle:[NSString stringWithUTF8String:
+ entry->title]
+ action:NULL keyEquivalent:@""]
+ autorelease];
+ nssubmenu = newmenu(entry->title);
+ [item setSubmenu:nssubmenu];
+
+ [self populateTypeMenu:nssubmenu from:entry->submenu];
+ }
+
+ [item setEnabled:YES];
+ [nsmenu insertItem:item atIndex:0];
+ }
+}
- midend_fetch_preset(me, n, &name, ¶ms);
+- (void)becomeKeyWindow
+{
+ [self clearTypeMenu];
- item = [[[DataMenuItem alloc]
- initWithTitle:[NSString stringWithCString:name]
- action:NULL keyEquivalent:@""]
- autorelease];
+ [super becomeKeyWindow];
- [item setEnabled:YES];
- [item setTarget:self];
- [item setAction:@selector(presetGame:)];
- [item setPayload:params];
+ if (!preset_menu) {
+ int i;
+ preset_menu = midend_get_presets(me, &n_preset_menu_items);
+ preset_menu_items = snewn(n_preset_menu_items, NSMenuItem *);
+ for (i = 0; i < n_preset_menu_items; i++)
+ preset_menu_items[i] = NULL;
+ }
- [typemenu insertItem:item atIndex:0];
- }
+ if (preset_menu->n_entries > 0) {
+ [typemenu insertItem:[NSMenuItem separatorItem] atIndex:0];
+ [self populateTypeMenu:typemenu from:preset_menu];
}
+
+ [self updateTypeMenuTick];
}
- (void)resignKeyWindow
NSSize size = {0,0};
int w, h;
- midend_size(me, &w, &h);
+ w = h = INT_MAX;
+ midend_size(me, &w, &h, FALSE);
size.width = w;
size.height = h;
+ fe.w = w;
+ fe.h = h;
if (status) {
NSRect frame = [status frame];
[status setFrame:frame];
}
+#ifndef GNUSTEP
NSDisableScreenUpdates();
+#endif
[self setContentSize:size];
[self setupContentView];
+#ifndef GNUSTEP
NSEnableScreenUpdates();
+#endif
}
- (void)presetGame:(id)sender
midend_new_game(me);
[self resizeForNewGameParams];
+ [self updateTypeMenuTick];
}
- (void)startConfigureSheet:(int)which
[tf setSelectable:NO];
[tf setBordered:NO];
[tf setDrawsBackground:NO];
- [[tf cell] setTitle:[NSString stringWithCString:i->name]];
+ [[tf cell] setTitle:[NSString stringWithUTF8String:i->name]];
[tf sizeToFit];
rect = [tf frame];
if (thish < rect.size.height + 1) thish = rect.size.height + 1;
[tf setEditable:YES];
[tf setSelectable:YES];
[tf setBordered:YES];
- [[tf cell] setTitle:[NSString stringWithCString:i->sval]];
+ [[tf cell] setTitle:[NSString stringWithUTF8String:i->sval]];
[tf sizeToFit];
rect = [tf frame];
/*
b = [[NSButton alloc] initWithFrame:tmprect];
[b setBezelStyle:NSRoundedBezelStyle];
[b setButtonType:NSSwitchButton];
- [b setTitle:[NSString stringWithCString:i->name]];
+ [b setTitle:[NSString stringWithUTF8String:i->name]];
[b sizeToFit];
[b setState:(i->ival ? NSOnState : NSOffState)];
rect = [b frame];
[tf setSelectable:NO];
[tf setBordered:NO];
[tf setDrawsBackground:NO];
- [[tf cell] setTitle:[NSString stringWithCString:i->name]];
+ [[tf cell] setTitle:[NSString stringWithUTF8String:i->name]];
[tf sizeToFit];
rect = [tf frame];
if (thish < rect.size.height + 1) thish = rect.size.height + 1;
p = i->sval;
c = *p++;
while (*p) {
- char *q;
+ char *q, *copy;
q = p;
while (*p && *p != c) p++;
- [pb addItemWithTitle:[NSString stringWithCString:q
- length:p-q]];
+ copy = snewn((p-q) + 1, char);
+ memcpy(copy, q, p-q);
+ copy[p-q] = '\0';
+ [pb addItemWithTitle:[NSString stringWithUTF8String:copy]];
+ sfree(copy);
if (*p) p++;
}
for (k = 0; k < cfg_ncontrols; k++)
[[sheet contentView] addSubview:cfg_controls[k]];
- [NSApp beginSheet:sheet modalForWindow:self
- modalDelegate:nil didEndSelector:nil contextInfo:nil];
+ [app beginSheet:sheet modalForWindow:self
+ modalDelegate:nil didEndSelector:NULL contextInfo:nil];
}
- (void)specificGame:(id)sender
- (void)sheetEndWithStatus:(BOOL)update
{
assert(sheet != NULL);
- [NSApp endSheet:sheet];
+ [app endSheet:sheet];
[sheet orderOut:self];
sheet = NULL;
if (update) {
case C_STRING:
sfree(i->sval);
i->sval = dupstr([[[(id)cfg_controls[k+1] cell]
- title] cString]);
+ title] UTF8String]);
k += 2;
break;
case C_BOOLEAN:
if (error) {
NSAlert *alert = [[[NSAlert alloc] init] autorelease];
[alert addButtonWithTitle:@"Bah"];
- [alert setInformativeText:[NSString stringWithCString:error]];
+ [alert setInformativeText:[NSString stringWithUTF8String:error]];
[alert beginSheetModalForWindow:self modalDelegate:nil
- didEndSelector:nil contextInfo:nil];
+ didEndSelector:NULL contextInfo:nil];
} else {
midend_new_game(me);
[self resizeForNewGameParams];
+ [self updateTypeMenuTick];
}
}
sfree(cfg_controls);
[self sheetEndWithStatus:NO];
}
-- (void)setStatusLine:(NSString *)text
+- (void)setStatusLine:(char *)text
{
- [[status cell] setTitle:text];
+ [[status cell] setTitle:[NSString stringWithUTF8String:text]];
}
@end
/*
* Drawing routines called by the midend.
*/
-void draw_polygon(frontend *fe, int *coords, int npoints,
- int fill, int colour)
+static void osx_draw_polygon(void *handle, int *coords, int npoints,
+ int fillcolour, int outlinecolour)
{
+ frontend *fe = (frontend *)handle;
NSBezierPath *path = [NSBezierPath bezierPath];
int i;
[[NSGraphicsContext currentContext] setShouldAntialias:YES];
- assert(colour >= 0 && colour < fe->ncolours);
- [fe->colours[colour] set];
-
for (i = 0; i < npoints; i++) {
- NSPoint p = { coords[i*2] + 0.5, coords[i*2+1] + 0.5 };
+ NSPoint p = { coords[i*2] + 0.5, fe->h - coords[i*2+1] - 0.5 };
if (i == 0)
[path moveToPoint:p];
else
[path closePath];
- if (fill)
+ if (fillcolour >= 0) {
+ assert(fillcolour >= 0 && fillcolour < fe->ncolours);
+ [fe->colours[fillcolour] set];
[path fill];
- else
- [path stroke];
+ }
+
+ assert(outlinecolour >= 0 && outlinecolour < fe->ncolours);
+ [fe->colours[outlinecolour] set];
+ [path stroke];
+}
+static void osx_draw_circle(void *handle, int cx, int cy, int radius,
+ int fillcolour, int outlinecolour)
+{
+ frontend *fe = (frontend *)handle;
+ NSBezierPath *path = [NSBezierPath bezierPath];
+
+ [[NSGraphicsContext currentContext] setShouldAntialias:YES];
+
+ [path appendBezierPathWithArcWithCenter:NSMakePoint(cx+0.5, fe->h-cy-0.5)
+ radius:radius startAngle:0.0 endAngle:360.0];
+
+ [path closePath];
+
+ if (fillcolour >= 0) {
+ assert(fillcolour >= 0 && fillcolour < fe->ncolours);
+ [fe->colours[fillcolour] set];
+ [path fill];
+ }
+
+ assert(outlinecolour >= 0 && outlinecolour < fe->ncolours);
+ [fe->colours[outlinecolour] set];
+ [path stroke];
}
-void draw_line(frontend *fe, int x1, int y1, int x2, int y2, int colour)
+static void osx_draw_line(void *handle, int x1, int y1, int x2, int y2, int colour)
{
+ frontend *fe = (frontend *)handle;
NSBezierPath *path = [NSBezierPath bezierPath];
- NSPoint p1 = { x1 + 0.5, y1 + 0.5 }, p2 = { x2 + 0.5, y2 + 0.5 };
+ NSPoint p1 = { x1 + 0.5, fe->h - y1 - 0.5 };
+ NSPoint p2 = { x2 + 0.5, fe->h - y2 - 0.5 };
[[NSGraphicsContext currentContext] setShouldAntialias:NO];
[path moveToPoint:p1];
[path lineToPoint:p2];
[path stroke];
+ NSRectFill(NSMakeRect(x1, fe->h-y1-1, 1, 1));
+ NSRectFill(NSMakeRect(x2, fe->h-y2-1, 1, 1));
}
-void draw_rect(frontend *fe, int x, int y, int w, int h, int colour)
+
+static void osx_draw_thick_line(
+ void *handle, float thickness,
+ float x1, float y1,
+ float x2, float y2,
+ int colour)
{
- NSRect r = { {x,y}, {w,h} };
+ 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;
+ NSRect r = { {x, fe->h - y - h}, {w,h} };
+
[[NSGraphicsContext currentContext] setShouldAntialias:NO];
assert(colour >= 0 && colour < fe->ncolours);
NSRectFill(r);
}
-void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize,
- int align, int colour, char *text)
+static void osx_draw_text(void *handle, int x, int y, int fonttype,
+ int fontsize, int align, int colour, char *text)
{
- NSString *string = [NSString stringWithCString:text];
+ frontend *fe = (frontend *)handle;
+ NSString *string = [NSString stringWithUTF8String:text];
NSDictionary *attr;
NSFont *font;
NSSize size;
font, NSFontAttributeName, nil];
point.x = x;
- point.y = y;
+ point.y = fe->h - y;
size = [string sizeWithAttributes:attr];
if (align & ALIGN_HRIGHT)
else if (align & ALIGN_HCENTRE)
point.x -= size.width / 2;
if (align & ALIGN_VCENTRE)
- point.y -= size.height / 2;
+ point.y -= size.height / 2;
[string drawAtPoint:point withAttributes:attr];
}
-void draw_update(frontend *fe, int x, int y, int w, int h)
+static char *osx_text_fallback(void *handle, const char *const *strings,
+ int nstrings)
+{
+ /*
+ * We assume OS X can cope with any UTF-8 likely to be emitted
+ * by a puzzle.
+ */
+ return dupstr(strings[0]);
+}
+struct blitter {
+ int w, h;
+ int x, y;
+ NSImage *img;
+};
+static blitter *osx_blitter_new(void *handle, int w, int h)
{
- [fe->view setNeedsDisplayInRect:NSMakeRect(x,y,w,h)];
+ blitter *bl = snew(blitter);
+ bl->x = bl->y = -1;
+ bl->w = w;
+ bl->h = h;
+ bl->img = [[NSImage alloc] initWithSize:NSMakeSize(w, h)];
+ return bl;
}
-void clip(frontend *fe, int x, int y, int w, int h)
+static void osx_blitter_free(void *handle, blitter *bl)
{
- NSRect r = { {x,y}, {w,h} };
+ [bl->img release];
+ sfree(bl);
+}
+static void osx_blitter_save(void *handle, blitter *bl, int x, int y)
+{
+ frontend *fe = (frontend *)handle;
+ int sx, sy, sX, sY, dx, dy, dX, dY;
+ [fe->image unlockFocus];
+ [bl->img lockFocus];
+ /*
+ * Find the intersection of the source and destination rectangles,
+ * so as to avoid trying to copy from outside the source image,
+ * which GNUstep dislikes.
+ *
+ * Lower-case x,y coordinates are bottom left box corners;
+ * upper-case X,Y are the top right.
+ */
+ sx = x; sy = fe->h - y - bl->h;
+ sX = sx + bl->w; sY = sy + bl->h;
+ dx = dy = 0;
+ dX = bl->w; dY = bl->h;
+ if (sx < 0) {
+ dx += -sx;
+ sx = 0;
+ }
+ if (sy < 0) {
+ dy += -sy;
+ sy = 0;
+ }
+ if (sX > fe->w) {
+ dX -= (sX - fe->w);
+ sX = fe->w;
+ }
+ if (sY > fe->h) {
+ dY -= (sY - fe->h);
+ sY = fe->h;
+ }
+
+ [fe->image drawInRect:NSMakeRect(dx, dy, dX-dx, dY-dy)
+ fromRect:NSMakeRect(sx, sy, sX-sx, sY-sy)
+ operation:NSCompositeCopy fraction:1.0];
+ [bl->img unlockFocus];
+ [fe->image lockFocus];
+ bl->x = x;
+ bl->y = y;
+}
+static void osx_blitter_load(void *handle, blitter *bl, int x, int y)
+{
+ frontend *fe = (frontend *)handle;
+ if (x == BLITTER_FROMSAVED && y == BLITTER_FROMSAVED) {
+ x = bl->x;
+ y = bl->y;
+ }
+ [bl->img drawInRect:NSMakeRect(x, fe->h - y - bl->h, bl->w, bl->h)
+ fromRect:NSMakeRect(0, 0, bl->w, bl->h)
+ operation:NSCompositeCopy fraction:1.0];
+}
+static void osx_draw_update(void *handle, int x, int y, int w, int h)
+{
+ frontend *fe = (frontend *)handle;
+ [fe->view setNeedsDisplayInRect:NSMakeRect(x, fe->h - y - h, w, h)];
+}
+static void osx_clip(void *handle, int x, int y, int w, int h)
+{
+ frontend *fe = (frontend *)handle;
+ NSRect r = { {x, fe->h - y - h}, {w, h} };
+
if (!fe->clipped)
[[NSGraphicsContext currentContext] saveGraphicsState];
[NSBezierPath clipRect:r];
fe->clipped = TRUE;
}
-void unclip(frontend *fe)
+static void osx_unclip(void *handle)
{
+ frontend *fe = (frontend *)handle;
if (fe->clipped)
[[NSGraphicsContext currentContext] restoreGraphicsState];
fe->clipped = FALSE;
}
-void start_draw(frontend *fe)
+static void osx_start_draw(void *handle)
{
+ frontend *fe = (frontend *)handle;
[fe->image lockFocus];
fe->clipped = FALSE;
}
-void end_draw(frontend *fe)
+static void osx_end_draw(void *handle)
{
+ frontend *fe = (frontend *)handle;
[fe->image unlockFocus];
}
+static void osx_status_bar(void *handle, char *text)
+{
+ frontend *fe = (frontend *)handle;
+ [fe->window setStatusLine:text];
+}
+
+const struct drawing_api osx_drawing = {
+ osx_draw_text,
+ osx_draw_rect,
+ osx_draw_line,
+ osx_draw_polygon,
+ osx_draw_circle,
+ osx_draw_update,
+ osx_clip,
+ osx_unclip,
+ osx_start_draw,
+ osx_end_draw,
+ osx_status_bar,
+ osx_blitter_new,
+ osx_blitter_free,
+ osx_blitter_save,
+ osx_blitter_load,
+ 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)
{
[fe->window activateTimer];
}
-void status_bar(frontend *fe, char *text)
-{
- [fe->window setStatusLine:[NSString stringWithCString:text]];
-}
-
/* ----------------------------------------------------------------------
* 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;
{
NSAutoreleasePool *pool;
NSMenu *menu;
- NSMenuItem *item;
AppController *controller;
NSImage *icon;
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");
- item = newitem(menu, "About Puzzles", "", NULL, @selector(about:));
+ 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]];
- item = newitem(menu, "Hide Puzzles", "h", NSApp, @selector(hide:));
- item = newitem(menu, "Hide Others", "o-h", NSApp, @selector(hideOtherApplications:));
- item = 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]];
- item = newitem(menu, "Quit", "q", NSApp, @selector(terminate:));
- [NSApp setAppleMenu: menu];
-
- menu = newsubmenu([NSApp mainMenu], "File");
- item = newitem(menu, "New Game", "n", NULL, @selector(newGame:));
- item = newitem(menu, "Restart Game", "r", NULL, @selector(restartGame:));
- item = newitem(menu, "Specific Game", "", NULL, @selector(specificGame:));
- item = newitem(menu, "Specific Random Seed", "", NULL,
+ newitem(menu, "Quit", "q", app, @selector(terminate:));
+ [app setAppleMenu: menu];
+
+ 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:));
+ newitem(menu, "Restart Game", "r", NULL, @selector(restartGame:));
+ newitem(menu, "Specific Game", "", NULL, @selector(specificGame:));
+ newitem(menu, "Specific Random Seed", "", NULL,
@selector(specificRandomGame:));
[menu addItem:[NSMenuItem separatorItem]];
{
}
}
[menu addItem:[NSMenuItem separatorItem]];
- item = newitem(menu, "Close", "w", NULL, @selector(performClose:));
+ newitem(menu, "Close", "w", NULL, @selector(performClose:));
- menu = newsubmenu([NSApp mainMenu], "Edit");
- item = newitem(menu, "Undo", "z", NULL, @selector(undoMove:));
- item = newitem(menu, "Redo", "S-z", NULL, @selector(redoMove:));
+ menu = newsubmenu([app mainMenu], "Edit");
+ newitem(menu, "Undo", "z", NULL, @selector(undoMove:));
+ newitem(menu, "Redo", "S-z", NULL, @selector(redoMove:));
[menu addItem:[NSMenuItem separatorItem]];
- item = newitem(menu, "Cut", "x", NULL, @selector(cut:));
- item = newitem(menu, "Copy", "c", NULL, @selector(copy:));
- item = newitem(menu, "Paste", "v", NULL, @selector(paste:));
+ newitem(menu, "Cut", "x", NULL, @selector(cut:));
+ newitem(menu, "Copy", "c", NULL, @selector(copy:));
+ newitem(menu, "Paste", "v", NULL, @selector(paste:));
[menu addItem:[NSMenuItem separatorItem]];
- item = newitem(menu, "Solve", "S-s", NULL, @selector(solveGame:));
+ newitem(menu, "Solve", "S-s", NULL, @selector(solveGame:));
- menu = newsubmenu([NSApp mainMenu], "Type");
+ menu = newsubmenu([app mainMenu], "Type");
typemenu = menu;
- item = newitem(menu, "Custom", "", NULL, @selector(customGameType:));
+ newitem(menu, "Custom", "", NULL, @selector(customGameType:));
- menu = newsubmenu([NSApp mainMenu], "Window");
- [NSApp setWindowsMenu: menu];
- item = newitem(menu, "Minimise Window", "m", NULL, @selector(performMiniaturize:));
+ menu = newsubmenu([app mainMenu], "Window");
+ [app setWindowsMenu: menu];
+ newitem(menu, "Minimise Window", "m", NULL, @selector(performMiniaturize:));
- menu = newsubmenu([NSApp mainMenu], "Help");
- item = 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;
}