~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minimal (i.e., lame) update to Loopy documentation to match reality -- it's
[sgt/puzzles]
/
osx.m
diff --git
a/osx.m
b/osx.m
index
e7da743
..
ccfdbaa
100644
(file)
--- a/
osx.m
+++ b/
osx.m
@@
-524,7
+524,7
@@
struct frontend {
fe.window = self;
fe.window = self;
- me = midend_new(&fe, ourgame, osx_drawing, &fe);
+ 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
/*
* 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
@@
-540,7
+540,7
@@
struct frontend {
/*
* Create the status bar, which will just be an NSTextField.
*/
/*
* 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];
status = [[NSTextField alloc] initWithFrame:NSMakeRect(0,0,100,50)];
[status setEditable:NO];
[status setSelectable:NO];
@@
-1219,9
+1219,7
@@
struct frontend {
- (void)setStatusLine:(char *)text
{
- (void)setStatusLine:(char *)text
{
- char *rewritten = midend_rewrite_statusbar(me, text);
- [[status cell] setTitle:[NSString stringWithCString:rewritten]];
- sfree(rewritten);
+ [[status cell] setTitle:[NSString stringWithCString:text]];
}
@end
}
@end
@@
-1341,6
+1339,8
@@
static void osx_draw_text(void *handle, int x, int y, int fonttype,
point.x -= size.width / 2;
if (align & ALIGN_VCENTRE)
point.y -= size.height / 2;
point.x -= size.width / 2;
if (align & ALIGN_VCENTRE)
point.y -= size.height / 2;
+ else
+ point.y -= size.height;
[string drawAtPoint:point withAttributes:attr];
}
[string drawAtPoint:point withAttributes:attr];
}
@@
-1379,7
+1379,7
@@
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)
{
}
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;
if (x == BLITTER_FROMSAVED && y == BLITTER_FROMSAVED) {
x = bl->x;
y = bl->y;
@@
-1431,7
+1431,7
@@
const struct drawing_api osx_drawing = {
osx_draw_text,
osx_draw_rect,
osx_draw_line,
osx_draw_text,
osx_draw_rect,
osx_draw_line,
- osx_draw_poly,
+ osx_draw_poly
gon
,
osx_draw_circle,
osx_draw_update,
osx_clip,
osx_draw_circle,
osx_draw_update,
osx_clip,