From cb15a6dc17e909581470345a2b6a2c40472e7993 Mon Sep 17 00:00:00 2001
From: Patrick Surry <patrick@hopper.com>
Date: Wed, 10 Dec 2014 20:21:30 -0500
Subject: [PATCH] use shortcut modifier for command-arrow vs control-arrow on
 OS X; added a quick key reference to help

---
 README.md                              | 27 ++++++++++++++++++++++++++
 src/com/droidquest/avatars/Player.java | 18 ++++++++---------
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 71927b5..27f02d4 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,33 @@ Run with:
 
    java -jar target/dq-1.1-SNAPSHOT.jar
 
+Controls:
+
+    / - help
+    arrows - normal movement
+    control + arrows - fine-grained movement [OS X: command + arrows]
+    space - pickup/drop
+    C - game cursor
+    H - hot cursor
+    S - solder pen
+    R - toggle radio
+    P - paintbrush
+    T - toolbox
+    [, ] - rotate
+    F - flip
+    L - load small chip
+    E - enter room
+    X - exit room
+
+    Cheat/debug:
+
+    shift + arrows - move rooms
+    M - dump memory usage
+
+Note: On OS X, control + arrow-keys are bound to Apple's "Mission Control".  I switched to the 'shortcut' modifier which is control on windows and command on OS X.  Alternatively, you can disable
+built in OS X shortcuts via System Preferences -> Keyboard -> Shorcuts.
+
+
 Copyright (c) 2000 Thomas Foote
 
 Permission is hereby granted, free of charge, to any person obtaining
diff --git a/src/com/droidquest/avatars/Player.java b/src/com/droidquest/avatars/Player.java
index a145678..fc1788a 100644
--- a/src/com/droidquest/avatars/Player.java
+++ b/src/com/droidquest/avatars/Player.java
@@ -15,7 +15,7 @@ import java.awt.event.KeyEvent;
 public class Player extends Item implements Avatar {
 
     private int keyRepeatRate = 5;
-
+    private int shortcut_modifier = Toolkit.getDefaultToolkit ().getMenuShortcutKeyMask();
 
     protected boolean handleSaveSmallChip() {
         return false;
@@ -362,16 +362,16 @@ public class Player extends Item implements Avatar {
         else if (e.getKeyCode() == KeyEvent.VK_SLASH && handleHelp()) {
             return false;
         }
-        else if (e.getKeyCode() == KeyEvent.VK_RIGHT && handleMoveRight(e.isShiftDown(), e.isControlDown())) {
+        else if (e.getKeyCode() == KeyEvent.VK_RIGHT && handleMoveRight(e.isShiftDown(), (e.getModifiers() & shortcut_modifier) > 0)) {
             return true;
         }
-        else if (e.getKeyCode() == KeyEvent.VK_LEFT && handleMoveLeft(e.isShiftDown(), e.isControlDown())) {
+        else if (e.getKeyCode() == KeyEvent.VK_LEFT && handleMoveLeft(e.isShiftDown(), (e.getModifiers() & shortcut_modifier) > 0)) {
             return true;
         }
-        else if (e.getKeyCode() == KeyEvent.VK_UP && handleMoveUp(e.isShiftDown(), e.isControlDown())) {
+        else if (e.getKeyCode() == KeyEvent.VK_UP && handleMoveUp(e.isShiftDown(), (e.getModifiers() & shortcut_modifier) > 0)) {
             return true;
         }
-        else if (e.getKeyCode() == KeyEvent.VK_DOWN && handleMoveDown(e.isShiftDown(), e.isControlDown())) {
+        else if (e.getKeyCode() == KeyEvent.VK_DOWN && handleMoveDown(e.isShiftDown(), (e.getModifiers() & shortcut_modifier) > 0)) {
             return true;
         }
         else if (e.getKeyCode() == KeyEvent.VK_SPACE && handlePickupDrop()) {
@@ -455,22 +455,22 @@ public class Player extends Item implements Avatar {
 
     public boolean KeyDown(KeyEvent e) {
         if (e.getKeyCode() == KeyEvent.VK_RIGHT) {
-            if (handleRepeatRight(e.isControlDown())) {
+            if (handleRepeatRight((e.getModifiers() & shortcut_modifier) > 0)) {
                 return true;
             }
         }
         else if (e.getKeyCode() == KeyEvent.VK_LEFT) {
-            if (handleRepeatLeft(e.isControlDown())) {
+            if (handleRepeatLeft((e.getModifiers() & shortcut_modifier) > 0)) {
                 return true;
             }
         }
         else if (e.getKeyCode() == KeyEvent.VK_UP) {
-            if (handleRepeatUp(e.isControlDown())) {
+            if (handleRepeatUp((e.getModifiers() & shortcut_modifier) > 0)) {
                 return true;
             }
         }
         else if (e.getKeyCode() == KeyEvent.VK_DOWN) {
-            if (handleRepeatDown(e.isControlDown())) {
+            if (handleRepeatDown((e.getModifiers() & shortcut_modifier) > 0)) {
                 return true;
             }
         }