X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/1185e3c5eaf5a0ac405e14939e7ee818914e0701..aa27d4932844e6aa590afba411b1503217f1602d:/osx.m

diff --git a/osx.m b/osx.m
index 337748d..ed33bf6 100644
--- 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
 {