X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/eed62081069d3d1cc35379925eb96028d4d6d87a..77dcb2a600afa28bd8a197bf63ff6a0898e59436:/osx.m

diff --git a/osx.m b/osx.m
index 9279c05..4c3b132 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 <ctype.h>
 #include <sys/time.h>
 #import <Cocoa/Cocoa.h>
@@ -426,6 +428,7 @@ struct frontend {
 - (void)deactivateTimer;
 - (void)setStatusLine:(char *)text;
 - (void)resizeForNewGameParams;
+- (void)updateTypeMenuTick;
 @end
 
 @implementation MyImageView
@@ -766,6 +769,7 @@ struct frontend {
         }
 
 	[self resizeForNewGameParams];
+	[self updateTypeMenuTick];
     }
 }
 - (void)undoMove:(id)sender
@@ -804,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
@@ -815,6 +820,19 @@ struct frontend {
 {
     while ([typemenu numberOfItems] > 1)
 	[typemenu removeItemAtIndex:0];
+    [[typemenu itemAtIndex:0] setState:NSOffState];
+}
+
+- (void)updateTypeMenuTick
+{
+    int i, total, n;
+
+    total = [typemenu numberOfItems];
+    n = midend_which_preset(me);
+    if (n < 0)
+	n = total - 1;		       /* that's always where "Custom" lives */
+    for (i = 0; i < total; i++)
+	[[typemenu itemAtIndex:i] setState:(i == n ? NSOnState : NSOffState)];
 }
 
 - (void)becomeKeyWindow
@@ -849,6 +867,8 @@ struct frontend {
 	    [typemenu insertItem:item atIndex:0];
 	}
     }
+
+    [self updateTypeMenuTick];
 }
 
 - (void)resignKeyWindow
@@ -894,6 +914,7 @@ struct frontend {
     midend_new_game(me);
 
     [self resizeForNewGameParams];
+    [self updateTypeMenuTick];
 }
 
 - (void)startConfigureSheet:(int)which
@@ -1215,6 +1236,7 @@ struct frontend {
 	} else {
 	    midend_new_game(me);
 	    [self resizeForNewGameParams];
+	    [self updateTypeMenuTick];
 	}
     }
     sfree(cfg_controls);
@@ -1322,7 +1344,8 @@ 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 stringWithCString:text
+			encoding:NSUTF8StringEncoding];
     NSDictionary *attr;
     NSFont *font;
     NSSize size;
@@ -1356,6 +1379,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;
@@ -1456,7 +1488,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)