#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"
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++;
}
[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;