Add a limited-shuffle mode like that added to Sixteen and Twiddle in r5769,

[sgt/puzzles] / osx.m

diff --git a/osx.m b/osx.m
index 337748d..ed33bf6 100644 (file)
--- a/osx.m
+++ b/osx.m
@@ -589,22 +589,34 @@ struct frontend {
         * function key codes.
         */
        if (c >= 0x80) {
+           int mods = FALSE;
            switch (c) {
              case NSUpArrowFunctionKey:
                c = CURSOR_UP;
+               mods = TRUE;
                break;
              case NSDownArrowFunctionKey:
                c = CURSOR_DOWN;
+               mods = TRUE;
                break;
              case NSLeftArrowFunctionKey:
                c = CURSOR_LEFT;
+               mods = TRUE;
                break;
              case NSRightArrowFunctionKey:
                c = CURSOR_RIGHT;
+               mods = TRUE;
                break;
              default:
                continue;
            }
+
+           if (mods) {
+               if ([ev modifierFlags] & NSShiftKeyMask)
+                   c |= MOD_SHFT;
+               if ([ev modifierFlags] & NSControlKeyMask)
+                   c |= MOD_CTRL;
+           }
        }
 
        if (c >= '0' && c <= '9' && ([ev modifierFlags] & NSNumericPadKeyMask))
@@ -651,7 +663,7 @@ struct frontend {
 }
 - (void)restartGame:(id)sender
 {
-    [self processButton:'r' x:-1 y:-1];
+    midend_restart_game(me);
 }
 - (void)undoMove:(id)sender
 {