*/
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.
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)
+{
+}
+
/* ----------------------------------------------------------------------
* Tiny extension to NSMenuItem which carries a payload of a `void
* *', allowing several menu items to invoke the same message but
@interface GameWindow : NSWindow
{
const game *ourgame;
- midend_data *me;
+ midend *me;
struct frontend fe;
struct timeval last_time;
NSTimer *timer;
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
/*
* 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];
/*
* 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)
[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 };
[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);
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)
{
+ frontend *fe = (frontend *)handle;
NSString *string = [NSString stringWithCString:text];
NSDictionary *attr;
NSFont *font;
point.x -= size.width / 2;
if (align & ALIGN_VCENTRE)
point.y -= size.height / 2;
+ else
+ point.y -= size.height;
[string drawAtPoint:point withAttributes:attr];
}
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;
[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)
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;
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, /* line_width */
+};
void deactivate_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.