X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/9709875736518ec7ae58ea474ac5130ae320158a..4c02061d05c4d4047bb5a6ea064a95ec341b4bbe:/osx.m diff --git a/osx.m b/osx.m index 11436a8..c3f6d1b 100644 --- a/osx.m +++ b/osx.m @@ -138,6 +138,21 @@ void get_random_seed(void **randseed, int *randseedsize) *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); +} + /* ---------------------------------------------------------------------- * Tiny extension to NSMenuItem which carries a payload of a `void * *', allowing several menu items to invoke the same message but @@ -383,7 +398,8 @@ struct frontend { - (void)keyDown:(NSEvent *)ev; - (void)activateTimer; - (void)deactivateTimer; -- (void)setStatusLine:(NSString *)text; +- (void)setStatusLine:(char *)text; +- (void)resizeForNewGameParams; @end @implementation MyImageView @@ -470,7 +486,8 @@ struct frontend { 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; @@ -501,7 +518,8 @@ struct frontend { * 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; @@ -589,22 +607,34 @@ struct frontend { * 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)) @@ -645,13 +675,72 @@ struct frontend { last_time = now; } +- (void)showError:(char *)message +{ + NSAlert *alert; + + alert = [[[NSAlert alloc] init] autorelease]; + [alert addButtonWithTitle:@"Bah"]; + [alert setInformativeText:[NSString stringWithCString:message]]; + [alert beginSheetModalForWindow:self modalDelegate:nil + didEndSelector:nil contextInfo:nil]; +} + - (void)newGame:(id)sender { [self processButton:'n' x:-1 y:-1]; } - (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] cString]; + + 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) { + const char *name = [[[op filenames] objectAtIndex:0] cString]; + 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]; + } } - (void)undoMove:(id)sender { @@ -679,17 +768,11 @@ struct frontend { - (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 @@ -759,7 +842,8 @@ struct frontend { 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; @@ -1051,6 +1135,11 @@ struct frontend { - (void)specificGame:(id)sender { + [self startConfigureSheet:CFG_DESC]; +} + +- (void)specificRandomGame:(id)sender +{ [self startConfigureSheet:CFG_SEED]; } @@ -1114,9 +1203,11 @@ struct frontend { [self sheetEndWithStatus:NO]; } -- (void)setStatusLine:(NSString *)text +- (void)setStatusLine:(char *)text { - [[status cell] setTitle:text]; + char *rewritten = midend_rewrite_statusbar(me, text); + [[status cell] setTitle:[NSString stringWithCString:rewritten]]; + sfree(rewritten); } @end @@ -1125,16 +1216,13 @@ struct frontend { * Drawing routines called by the midend. */ void draw_polygon(frontend *fe, int *coords, int npoints, - int fill, int colour) + int fillcolour, int outlinecolour) { 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 }; if (i == 0) @@ -1145,10 +1233,37 @@ void draw_polygon(frontend *fe, int *coords, int npoints, [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]; +} +void draw_circle(frontend *fe, int cx, int cy, int radius, + int fillcolour, int outlinecolour) +{ + NSBezierPath *path = [NSBezierPath bezierPath]; + + [[NSGraphicsContext currentContext] setShouldAntialias:YES]; + + [path appendBezierPathWithArcWithCenter:NSMakePoint(cx + 0.5, 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) { @@ -1210,6 +1325,48 @@ void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize, [string drawAtPoint:point withAttributes:attr]; } +struct blitter { + int w, h; + int x, y; + NSImage *img; +}; +blitter *blitter_new(int w, int h) +{ + blitter *bl = snew(blitter); + bl->x = bl->y = -1; + bl->w = w; + bl->h = h; + bl->img = [[NSImage alloc] initWithSize:NSMakeSize(w, h)]; + [bl->img setFlipped:YES]; + return bl; +} +void blitter_free(blitter *bl) +{ + [bl->img release]; + sfree(bl); +} +void blitter_save(frontend *fe, blitter *bl, int x, int y) +{ + [fe->image unlockFocus]; + [bl->img lockFocus]; + [fe->image drawInRect:NSMakeRect(0, 0, bl->w, bl->h) + fromRect:NSMakeRect(x, y, bl->w, bl->h) + operation:NSCompositeCopy fraction:1.0]; + [bl->img unlockFocus]; + [fe->image lockFocus]; + bl->x = x; + bl->y = y; +} +void blitter_load(frontend *fe, blitter *bl, int x, int y) +{ + if (x == BLITTER_FROMSAVED && y == BLITTER_FROMSAVED) { + x = bl->x; + y = bl->y; + } + [bl->img drawInRect:NSMakeRect(x, y, bl->w, bl->h) + fromRect:NSMakeRect(0, 0, bl->w, bl->h) + operation:NSCompositeCopy fraction:1.0]; +} void draw_update(frontend *fe, int x, int y, int w, int h) { [fe->view setNeedsDisplayInRect:NSMakeRect(x,y,w,h)]; @@ -1250,7 +1407,7 @@ void activate_timer(frontend *fe) void status_bar(frontend *fe, char *text) { - [fe->window setStatusLine:[NSString stringWithCString:text]]; + [fe->window setStatusLine:text]; } /* ---------------------------------------------------------------------- @@ -1337,9 +1494,13 @@ int main(int argc, char **argv) [NSApp setAppleMenu: menu]; menu = newsubmenu([NSApp mainMenu], "File"); + item = newitem(menu, "Open", "o", NULL, @selector(loadSavedGame:)); + item = newitem(menu, "Save As", "s", NULL, @selector(saveGame:)); 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, + @selector(specificRandomGame:)); [menu addItem:[NSMenuItem separatorItem]]; { NSMenu *submenu = newsubmenu(menu, "New Window");