Make menus accessible from the keyboard in the Gtk front-end.

[sgt/puzzles] / osx.m

diff --git a/osx.m b/osx.m
index 9279c05..c59ff56 100644 (file)
--- 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);