X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/ae2cfcdd19fc4176af899f87c486e20541061761..496b5dfb3053d5ecc0d260d3d4e8fa8689282725:/osx.m diff --git a/osx.m b/osx.m index ec9b6f9..d61779a 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 @@ -123,7 +125,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); @@ -209,7 +211,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]; } @@ -219,7 +221,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]; @@ -249,9 +251,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) @@ -325,7 +327,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; @@ -576,7 +578,7 @@ struct frontend { NSClosableWindowMask) backing:NSBackingStoreBuffered defer:YES]; - [self setTitle:[NSString stringWithCString:ourgame->name]]; + [self setTitle:[NSString stringWithUTF8String:ourgame->name]]; { float *colours; @@ -708,9 +710,9 @@ 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 @@ -787,7 +789,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(); @@ -806,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 @@ -852,7 +855,7 @@ struct frontend { midend_fetch_preset(me, n, &name, ¶ms); item = [[[DataMenuItem alloc] - initWithTitle:[NSString stringWithCString:name] + initWithTitle:[NSString stringWithUTF8String:name] action:NULL keyEquivalent:@""] autorelease]; @@ -897,10 +900,14 @@ struct frontend { [status setFrame:frame]; } +#ifndef GNUSTEP NSDisableScreenUpdates(); +#endif [self setContentSize:size]; [self setupContentView]; +#ifndef GNUSTEP NSEnableScreenUpdates(); +#endif } - (void)presetGame:(id)sender @@ -999,7 +1006,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; @@ -1010,7 +1017,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]; /* @@ -1037,7 +1044,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]; @@ -1058,7 +1065,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; @@ -1073,13 +1080,15 @@ struct frontend { p = i->sval; c = *p++; while (*p) { - char *q; + char cc, *q; q = p; while (*p && *p != c) p++; - [pb addItemWithTitle:[NSString stringWithCString:q - length:p-q]]; + cc = *p; + *p = '\0'; + [pb addItemWithTitle:[NSString stringWithUTF8String:q]]; + *p = cc; if (*p) p++; } @@ -1174,7 +1183,7 @@ struct frontend { [[sheet contentView] addSubview:cfg_controls[k]]; [NSApp beginSheet:sheet modalForWindow:self - modalDelegate:nil didEndSelector:nil contextInfo:nil]; + modalDelegate:nil didEndSelector:NULL contextInfo:nil]; } - (void)specificGame:(id)sender @@ -1227,9 +1236,9 @@ 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]; @@ -1250,7 +1259,7 @@ struct frontend { - (void)setStatusLine:(char *)text { - [[status cell] setTitle:[NSString stringWithCString:text]]; + [[status cell] setTitle:[NSString stringWithUTF8String:text]]; } @end @@ -1341,7 +1350,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; @@ -1375,6 +1384,15 @@ static void osx_draw_text(void *handle, int x, int y, int fonttype, [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; @@ -1475,7 +1493,8 @@ 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, }; void deactivate_timer(frontend *fe) @@ -1543,7 +1562,6 @@ int main(int argc, char **argv) { NSAutoreleasePool *pool; NSMenu *menu; - NSMenuItem *item; AppController *controller; NSImage *icon; @@ -1559,24 +1577,24 @@ int main(int argc, char **argv) [NSApp setMainMenu: newmenu("Main Menu")]; menu = newsubmenu([NSApp mainMenu], "Apple Menu"); - item = newitem(menu, "About Puzzles", "", NULL, @selector(about:)); + newitem(menu, "About Puzzles", "", NULL, @selector(about:)); [menu addItem:[NSMenuItem separatorItem]]; [NSApp 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", NSApp, @selector(hide:)); + newitem(menu, "Hide Others", "o-h", NSApp, @selector(hideOtherApplications:)); + newitem(menu, "Show All", "", NSApp, @selector(unhideAllApplications:)); [menu addItem:[NSMenuItem separatorItem]]; - item = newitem(menu, "Quit", "q", NSApp, @selector(terminate:)); + 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, "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]]; { @@ -1592,28 +1610,28 @@ 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:)); + 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"); 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:)); + newitem(menu, "Minimise Window", "m", NULL, @selector(performMiniaturize:)); menu = newsubmenu([NSApp mainMenu], "Help"); - item = newitem(menu, "Puzzles Help", "?", NSApp, @selector(showHelp:)); + newitem(menu, "Puzzles Help", "?", NSApp, @selector(showHelp:)); [NSApp run]; [pool release];