#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"
*/
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.
p = i->sval;
c = *p++;
while (*p) {
- char cc, *q;
+ char *q, *copy;
q = p;
while (*p && *p != c) p++;
- cc = *p;
- *p = '\0';
- [pb addItemWithTitle:[NSString stringWithUTF8String:q]];
- *p = cc;
+ 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
+ [app beginSheet:sheet modalForWindow:self
modalDelegate:nil didEndSelector:NULL contextInfo:nil];
}
- (void)sheetEndWithStatus:(BOOL)update
{
assert(sheet != NULL);
- [NSApp endSheet:sheet];
+ [app endSheet:sheet];
[sheet orderOut:self];
sheet = NULL;
if (update) {
[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_rect(void *handle, int x, int y, int w, int h, int colour)
{
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, fe->h - y - bl->h, 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;
* 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;
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");
+ 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]];
- newitem(menu, "Hide Puzzles", "h", NSApp, @selector(hide:));
- newitem(menu, "Hide Others", "o-h", NSApp, @selector(hideOtherApplications:));
- 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]];
- newitem(menu, "Quit", "q", NSApp, @selector(terminate:));
- [NSApp setAppleMenu: menu];
+ newitem(menu, "Quit", "q", app, @selector(terminate:));
+ [app setAppleMenu: menu];
- menu = newsubmenu([NSApp mainMenu], "File");
+ 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:));
[menu addItem:[NSMenuItem separatorItem]];
newitem(menu, "Close", "w", NULL, @selector(performClose:));
- menu = newsubmenu([NSApp mainMenu], "Edit");
+ menu = newsubmenu([app mainMenu], "Edit");
newitem(menu, "Undo", "z", NULL, @selector(undoMove:));
newitem(menu, "Redo", "S-z", NULL, @selector(redoMove:));
[menu addItem:[NSMenuItem separatorItem]];
[menu addItem:[NSMenuItem separatorItem]];
newitem(menu, "Solve", "S-s", NULL, @selector(solveGame:));
- menu = newsubmenu([NSApp mainMenu], "Type");
+ menu = newsubmenu([app mainMenu], "Type");
typemenu = menu;
newitem(menu, "Custom", "", NULL, @selector(customGameType:));
- menu = newsubmenu([NSApp mainMenu], "Window");
- [NSApp setWindowsMenu: menu];
+ menu = newsubmenu([app mainMenu], "Window");
+ [app setWindowsMenu: menu];
newitem(menu, "Minimise Window", "m", NULL, @selector(performMiniaturize:));
- menu = newsubmenu([NSApp mainMenu], "Help");
- 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;
~ian / sgt-puzzles.git / blobdiff