X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=osx.m;h=9d74da15742f7f4f43fc1fde4d78780fdd47cc73;hb=a0a581c8b5422bf0c5ed3fde6aa25811e4eb89fc;hp=e19db27da4a4d2f79fa22f20d2f830c492fd7802;hpb=669bb81f084191d0163de43c8e1631e30d913b00;p=sgt-puzzles.git diff --git a/osx.m b/osx.m index e19db27..9d74da1 100644 --- a/osx.m +++ b/osx.m @@ -77,7 +77,10 @@ * recreate it. */ +#define COMBINED /* we put all the puzzles in one binary in this port */ + #include +#include #include #import #include "puzzles.h" @@ -97,6 +100,12 @@ NSMenu *typemenu; */ 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. @@ -123,7 +132,7 @@ void fatal(char *fmt, ...) } else { alert = [[alert init] autorelease]; [alert addButtonWithTitle:@"Oh dear"]; - [alert setInformativeText:[NSString stringWithCString:errorbuf]]; + [alert setInformativeText:[NSString stringWithUTF8String:errorbuf]]; [alert runModal]; } exit(1); @@ -167,6 +176,18 @@ void document_add_puzzle(document *doc, const game *game, game_params *par, { } +/* + * 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 @@ -197,7 +218,7 @@ void document_add_puzzle(document *doc, const game *game, game_params *par, NSMenu *newmenu(const char *title) { return [[[NSMenu allocWithZone:[NSMenu menuZone]] - initWithTitle:[NSString stringWithCString:title]] + initWithTitle:[NSString stringWithUTF8String:title]] autorelease]; } @@ -207,7 +228,7 @@ NSMenu *newsubmenu(NSMenu *parent, const char *title) NSMenu *child; item = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] - initWithTitle:[NSString stringWithCString:title] + initWithTitle:[NSString stringWithUTF8String:title] action:NULL keyEquivalent:@""] autorelease]; @@ -237,9 +258,9 @@ id initnewitem(NSMenuItem *item, NSMenu *parent, const char *title, 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) @@ -313,7 +334,7 @@ NSMenuItem *newitem(NSMenu *parent, char *title, char *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; @@ -372,6 +393,7 @@ struct frontend { NSColor **colours; int ncolours; int clipped; + int w, h; }; @interface MyImageView : NSImageView @@ -379,7 +401,6 @@ struct frontend { GameWindow *ourwin; } - (void)setWindow:(GameWindow *)win; -- (BOOL)isFlipped; - (void)mouseEvent:(NSEvent *)ev button:(int)b; - (void)mouseDown:(NSEvent *)ev; - (void)mouseDragged:(NSEvent *)ev; @@ -405,15 +426,20 @@ struct frontend { 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:(char *)text; - (void)resizeForNewGameParams; +- (void)updateTypeMenuTick; @end @implementation MyImageView @@ -423,11 +449,6 @@ struct frontend { ourwin = win; } -- (BOOL)isFlipped -{ - return YES; -} - - (void)mouseEvent:(NSEvent *)ev button:(int)b { NSPoint point = [self convertPoint:[ev locationInWindow] fromView:nil]; @@ -504,9 +525,10 @@ struct frontend { 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]; @@ -521,6 +543,8 @@ struct frontend { int w, h; ourgame = g; + preset_menu = NULL; + preset_menu_items = NULL; fe.window = self; @@ -536,11 +560,13 @@ struct frontend { 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]; @@ -548,7 +574,7 @@ struct frontend { [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; @@ -563,7 +589,7 @@ struct frontend { NSClosableWindowMask) backing:NSBackingStoreBuffered defer:YES]; - [self setTitle:[NSString stringWithCString:ourgame->name]]; + [self setTitle:[NSString stringWithUTF8String:ourgame->name]]; { float *colours; @@ -590,20 +616,27 @@ struct frontend { 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]; } @@ -654,7 +687,7 @@ struct frontend { if (c >= '0' && c <= '9' && ([ev modifierFlags] & NSNumericPadKeyMask)) c |= MOD_NUM_KEYPAD; - [self processButton:c x:-1 y:-1]; + [self processKey:c]; } } @@ -695,14 +728,14 @@ struct frontend { alert = [[[NSAlert alloc] init] autorelease]; [alert addButtonWithTitle:@"Bah"]; - [alert setInformativeText:[NSString stringWithCString:message]]; + [alert setInformativeText:[NSString stringWithUTF8String:message]]; [alert beginSheetModalForWindow:self modalDelegate:nil - didEndSelector:nil contextInfo:nil]; + didEndSelector:NULL contextInfo:nil]; } - (void)newGame:(id)sender { - [self processButton:'n' x:-1 y:-1]; + [self processKey:'n']; } - (void)restartGame:(id)sender { @@ -713,7 +746,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"); @@ -734,7 +767,24 @@ struct frontend { [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"); @@ -754,15 +804,16 @@ struct frontend { } [self resizeForNewGameParams]; + [self updateTypeMenuTick]; } } - (void)undoMove:(id)sender { - [self processButton:'u' x:-1 y:-1]; + [self processKey:'u']; } - (void)redoMove:(id)sender { - [self processButton:'r'&0x1F x:-1 y:-1]; + [self processKey:'r'&0x1F]; } - (void)copy:(id)sender @@ -773,7 +824,7 @@ struct frontend { 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(); @@ -792,7 +843,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 @@ -801,42 +853,102 @@ struct frontend { - (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)]; - n = midend_num_presets(me); + /* + * The Custom menu item is always right at the bottom of the + * Type menu. + */ + [[typemenu itemAtIndex:[typemenu numberOfItems]-1] + setState:(n < 0 ? NSOnState : NSOffState)]; +} - if (n > 0) { - [typemenu insertItem:[NSMenuItem separatorItem] atIndex:0]; - while (n--) { - char *name; - game_params *params; - DataMenuItem *item; +- (void)populateTypeMenu:(NSMenu *)nsmenu from:(struct preset_menu *)menu +{ + int i; + + /* + * 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 @@ -860,6 +972,8 @@ struct frontend { midend_size(me, &w, &h, FALSE); size.width = w; size.height = h; + fe.w = w; + fe.h = h; if (status) { NSRect frame = [status frame]; @@ -868,10 +982,14 @@ struct frontend { [status setFrame:frame]; } +#ifndef GNUSTEP NSDisableScreenUpdates(); +#endif [self setContentSize:size]; [self setupContentView]; +#ifndef GNUSTEP NSEnableScreenUpdates(); +#endif } - (void)presetGame:(id)sender @@ -882,6 +1000,7 @@ struct frontend { midend_new_game(me); [self resizeForNewGameParams]; + [self updateTypeMenuTick]; } - (void)startConfigureSheet:(int)which @@ -969,7 +1088,7 @@ struct frontend { [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; @@ -980,7 +1099,7 @@ struct frontend { [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]; /* @@ -1007,7 +1126,7 @@ struct frontend { 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]; @@ -1028,7 +1147,7 @@ struct frontend { [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; @@ -1043,13 +1162,16 @@ struct frontend { 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++; } @@ -1143,8 +1265,8 @@ struct frontend { 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 @@ -1165,7 +1287,7 @@ struct frontend { - (void)sheetEndWithStatus:(BOOL)update { assert(sheet != NULL); - [NSApp endSheet:sheet]; + [app endSheet:sheet]; [sheet orderOut:self]; sheet = NULL; if (update) { @@ -1179,7 +1301,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: @@ -1197,12 +1319,13 @@ struct frontend { 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); @@ -1219,9 +1342,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 stringWithUTF8String:text]]; } @end @@ -1239,7 +1360,7 @@ static void osx_draw_polygon(void *handle, int *coords, int npoints, [[NSGraphicsContext currentContext] setShouldAntialias:YES]; 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 @@ -1266,7 +1387,7 @@ static void osx_draw_circle(void *handle, int cx, int cy, int radius, [[NSGraphicsContext currentContext] setShouldAntialias:YES]; - [path appendBezierPathWithArcWithCenter:NSMakePoint(cx + 0.5, cy + 0.5) + [path appendBezierPathWithArcWithCenter:NSMakePoint(cx+0.5, fe->h-cy-0.5) radius:radius startAngle:0.0 endAngle:360.0]; [path closePath]; @@ -1285,7 +1406,8 @@ static void osx_draw_line(void *handle, int x1, int y1, int x2, int y2, int colo { 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]; @@ -1295,11 +1417,33 @@ static void osx_draw_line(void *handle, int x1, int y1, int x2, int y2, int colo [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)); +} + +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; - NSRect r = { {x,y}, {w,h} }; + NSRect r = { {x, fe->h - y - h}, {w,h} }; [[NSGraphicsContext currentContext] setShouldAntialias:NO]; @@ -1312,7 +1456,7 @@ static void osx_draw_text(void *handle, int x, int y, int fonttype, int fontsize, int align, int colour, char *text) { frontend *fe = (frontend *)handle; - NSString *string = [NSString stringWithCString:text]; + NSString *string = [NSString stringWithUTF8String:text]; NSDictionary *attr; NSFont *font; NSSize size; @@ -1332,7 +1476,7 @@ static void osx_draw_text(void *handle, int x, int y, int fonttype, font, NSFontAttributeName, nil]; point.x = x; - point.y = y; + point.y = fe->h - y; size = [string sizeWithAttributes:attr]; if (align & ALIGN_HRIGHT) @@ -1340,12 +1484,19 @@ static void osx_draw_text(void *handle, int x, int y, int fonttype, else if (align & ALIGN_HCENTRE) point.x -= size.width / 2; if (align & ALIGN_VCENTRE) - point.y -= size.height / 2; - else - point.y -= size.height; + point.y -= size.height / 2; [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; @@ -1358,7 +1509,6 @@ static blitter *osx_blitter_new(void *handle, int w, int h) bl->w = w; bl->h = h; bl->img = [[NSImage alloc] initWithSize:NSMakeSize(w, h)]; - [bl->img setFlipped:YES]; return bl; } static void osx_blitter_free(void *handle, blitter *bl) @@ -1369,11 +1519,42 @@ static void osx_blitter_free(void *handle, blitter *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]; - [fe->image drawInRect:NSMakeRect(0, 0, bl->w, bl->h) - fromRect:NSMakeRect(x, y, bl->w, bl->h) - operation:NSCompositeCopy fraction:1.0]; + + /* + * 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; @@ -1381,24 +1562,24 @@ static void osx_blitter_save(void *handle, blitter *bl, int x, int y) } static void osx_blitter_load(void *handle, blitter *bl, int x, int y) { - /* frontend *fe = (frontend *)handle; */ + frontend *fe = (frontend *)handle; if (x == BLITTER_FROMSAVED && y == BLITTER_FROMSAVED) { x = bl->x; y = bl->y; } - [bl->img drawInRect:NSMakeRect(x, y, bl->w, bl->h) + [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,y,w,h)]; + [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,y}, {w,h} }; + NSRect r = { {x, fe->h - y - h}, {w, h} }; if (!fe->clipped) [[NSGraphicsContext currentContext] saveGraphicsState]; @@ -1446,7 +1627,9 @@ const struct drawing_api osx_drawing = { osx_blitter_save, osx_blitter_load, NULL, NULL, NULL, NULL, NULL, NULL, /* {begin,end}_{doc,page,puzzle} */ - NULL, /* line_width */ + NULL, NULL, /* line_width, line_dotted */ + osx_text_fallback, + osx_draw_thick_line, }; void deactivate_timer(frontend *fe) @@ -1462,7 +1645,7 @@ void activate_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 { } - (void)newGameWindow:(id)sender; @@ -1514,40 +1697,39 @@ int main(int argc, char **argv) { 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, "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, + 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]]; { @@ -1563,29 +1745,31 @@ int main(int argc, char **argv) } } [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; }