X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/668be019ada6a154bfa60dbebea2774ca84d0b1e..f335fd5185bf40dfcf147826299d04ba84cc083a:/osx.m diff --git a/osx.m b/osx.m index b009cd7..4c3b132 100644 --- a/osx.m +++ b/osx.m @@ -77,6 +77,8 @@ * recreate it. */ +#define COMBINED /* we put all the puzzles in one binary in this port */ + #include #include #import @@ -92,6 +94,11 @@ */ NSMenu *typemenu; +/* + * Forward reference. + */ +extern const struct drawing_api osx_drawing; + /* ---------------------------------------------------------------------- * Miscellaneous support routines that aren't part of any object or * clearly defined subsystem. @@ -153,6 +160,27 @@ static int savefile_read(void *wctx, void *buf, int len) 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 @@ -381,7 +409,7 @@ struct frontend { @interface GameWindow : NSWindow { const game *ourgame; - midend_data *me; + midend *me; struct frontend fe; struct timeval last_time; NSTimer *timer; @@ -393,13 +421,14 @@ struct frontend { NSTextField *status; } - (id)initWithGame:(const game *)g; -- dealloc; +- (void)dealloc; - (void)processButton:(int)b x:(int)x y:(int)y; - (void)keyDown:(NSEvent *)ev; - (void)activateTimer; - (void)deactivateTimer; - (void)setStatusLine:(char *)text; - (void)resizeForNewGameParams; +- (void)updateTypeMenuTick; @end @implementation MyImageView @@ -510,7 +539,7 @@ struct frontend { 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 @@ -526,7 +555,7 @@ struct frontend { /* * 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]; @@ -576,7 +605,7 @@ struct frontend { return self; } -- dealloc +- (void)dealloc { int i; for (i = 0; i < fe.ncolours; i++) { @@ -584,7 +613,7 @@ struct frontend { } sfree(fe.colours); midend_free(me); - return [super dealloc]; + [super dealloc]; } - (void)processButton:(int)b x:(int)x y:(int)y @@ -699,7 +728,7 @@ struct frontend { NSSavePanel *sp = [NSSavePanel savePanel]; if ([sp runModal] == NSFileHandlingPanelOKButton) { - const char *name = [[sp filename] cString]; + const char *name = [[sp filename] UTF8String]; FILE *fp = fopen(name, "w"); @@ -740,6 +769,7 @@ struct frontend { } [self resizeForNewGameParams]; + [self updateTypeMenuTick]; } } - (void)undoMove:(id)sender @@ -778,7 +808,8 @@ struct frontend { - (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 @@ -789,6 +820,19 @@ struct frontend { { while ([typemenu numberOfItems] > 1) [typemenu removeItemAtIndex:0]; + [[typemenu itemAtIndex:0] setState:NSOffState]; +} + +- (void)updateTypeMenuTick +{ + int i, total, n; + + total = [typemenu numberOfItems]; + n = midend_which_preset(me); + if (n < 0) + n = total - 1; /* that's always where "Custom" lives */ + for (i = 0; i < total; i++) + [[typemenu itemAtIndex:i] setState:(i == n ? NSOnState : NSOffState)]; } - (void)becomeKeyWindow @@ -823,6 +867,8 @@ struct frontend { [typemenu insertItem:item atIndex:0]; } } + + [self updateTypeMenuTick]; } - (void)resignKeyWindow @@ -868,6 +914,7 @@ struct frontend { midend_new_game(me); [self resizeForNewGameParams]; + [self updateTypeMenuTick]; } - (void)startConfigureSheet:(int)which @@ -1165,7 +1212,7 @@ struct frontend { 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: @@ -1189,6 +1236,7 @@ struct frontend { } else { midend_new_game(me); [self resizeForNewGameParams]; + [self updateTypeMenuTick]; } } sfree(cfg_controls); @@ -1205,9 +1253,7 @@ struct frontend { - (void)setStatusLine:(char *)text { - char *rewritten = midend_rewrite_statusbar(me, text); - [[status cell] setTitle:[NSString stringWithCString:rewritten]]; - sfree(rewritten); + [[status cell] setTitle:[NSString stringWithCString:text]]; } @end @@ -1215,17 +1261,15 @@ struct frontend { /* * 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 }; if (i == 0) @@ -1236,33 +1280,42 @@ 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 fill, int colour) +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]; - assert(colour >= 0 && colour < fe->ncolours); - [fe->colours[colour] set]; - [path appendBezierPathWithArcWithCenter:NSMakePoint(cx + 0.5, cy + 0.5) radius:radius startAngle:0.0 endAngle:360.0]; [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_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 }; @@ -1275,10 +1328,11 @@ void draw_line(frontend *fe, int x1, int y1, int x2, int y2, int colour) [path lineToPoint:p2]; [path stroke]; } -void draw_rect(frontend *fe, int x, int y, int w, int h, int colour) +static void osx_draw_rect(void *handle, int x, int y, int w, int h, int colour) { + frontend *fe = (frontend *)handle; NSRect r = { {x,y}, {w,h} }; - + [[NSGraphicsContext currentContext] setShouldAntialias:NO]; assert(colour >= 0 && colour < fe->ncolours); @@ -1286,10 +1340,12 @@ void draw_rect(frontend *fe, int x, int y, int w, int h, int colour) 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 stringWithCString:text + encoding:NSUTF8StringEncoding]; NSDictionary *attr; NSFont *font; NSSize size; @@ -1318,15 +1374,26 @@ void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize, point.x -= size.width / 2; if (align & ALIGN_VCENTRE) point.y -= size.height / 2; + else + point.y -= size.height; [string drawAtPoint:point withAttributes:attr]; } +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; }; -blitter *blitter_new(int w, int h) +static blitter *osx_blitter_new(void *handle, int w, int h) { blitter *bl = snew(blitter); bl->x = bl->y = -1; @@ -1336,13 +1403,14 @@ blitter *blitter_new(int w, int h) [bl->img setFlipped:YES]; return bl; } -void blitter_free(blitter *bl) +static void osx_blitter_free(void *handle, blitter *bl) { [bl->img release]; sfree(bl); } -void blitter_save(frontend *fe, blitter *bl, int x, int y) +static void osx_blitter_save(void *handle, blitter *bl, int x, int y) { + frontend *fe = (frontend *)handle; [fe->image unlockFocus]; [bl->img lockFocus]; [fe->image drawInRect:NSMakeRect(0, 0, bl->w, bl->h) @@ -1353,8 +1421,9 @@ void blitter_save(frontend *fe, blitter *bl, int x, int y) bl->x = x; bl->y = y; } -void blitter_load(frontend *fe, blitter *bl, int x, int 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; @@ -1363,34 +1432,65 @@ void blitter_load(frontend *fe, blitter *bl, int x, int y) 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) +static void osx_draw_update(void *handle, int x, int y, int w, int h) { + frontend *fe = (frontend *)handle; [fe->view setNeedsDisplayInRect:NSMakeRect(x,y,w,h)]; } -void clip(frontend *fe, int x, int y, int w, int h) +static void osx_clip(void *handle, int x, int y, int w, int h) { + frontend *fe = (frontend *)handle; NSRect r = { {x,y}, {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, +}; void deactivate_timer(frontend *fe) { @@ -1401,11 +1501,6 @@ void activate_timer(frontend *fe) [fe->window activateTimer]; } -void status_bar(frontend *fe, char *text) -{ - [fe->window setStatusLine:text]; -} - /* ---------------------------------------------------------------------- * AppController: the object which receives the messages from all * menu selections that aren't standard OS X functions. @@ -1536,4 +1631,6 @@ int main(int argc, char **argv) [NSApp run]; [pool release]; + + return 0; }