Changed debugger shortcuts to Control-combos to match the old

Alt-comboes, as these are easier to remember than function keys.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3009 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

Changes.txt

@@ -19,8 +19,8 @@
     entered using a native layout.
 
   * Related to the text input changes, the debugger Alt-combo shortcuts
-    have been changed.  These are now mapped to F4 - F8 (see documentation
+    have been changed; they now use the same key but with Control instead
-    for more information).
+    of Alt (Control-F for frame advance, etc).
 
   * Controllers are now detected dynamically by Stella.  This means that
     you can plug/unplug joysticks/paddles/etc while Stella is running,

docs/debugger.html

@@ -771,7 +771,7 @@ system would alternate between drawing frames (and hence produce
 flicker).</p>
 
 <p>You can use the "Scan+1" button, the prompt "scan" command, or the
-F7 key to watch the TIA draw the frame one scanline at a time.</p>
+Control-L key to watch the TIA draw the frame one scanline at a time.</p>
 
 <p>You can also right-click anywhere in this window to show a context menu,
 as illustrated:</p>
@@ -1163,17 +1163,18 @@ the RAM in the DPC scheme is not viewable by the 6507, so its addresses start fr
 <h2>Global Buttons</h2>
 
 <p>There are also buttons on the right that always show up no matter which
-tab you're looking at. These are always active.  The larger button to the left (labeled '&lt;') performs the rewind operation, which will undo the previous Step/Trace/Scan/Frame
+tab you're looking at. These are always active.  The larger button to the left
-advance.  The rewind buffer is currently 100 levels deep.  The others are Step, Trace,
+(labeled '&lt;') performs the rewind operation, which will undo the previous
-Scan+1, Frame+1 and Exit.</p>
+Step/Trace/Scan/Frame advance.  The rewind buffer is currently 100 levels deep.
+The others are Step, Trace, Scan+1, Frame+1 and Exit.</p>
 <p><img src="graphics/debugger_globalbuttons.png"></p>
 
 <p>When you use these buttons, the prompt doesn't change. This means the
 status lines with the registers and disassembly will be "stale". You
 can update them just by re-running the relevant commands in the prompt.</p>
 
-<p>You can also use the Rewind, Step, Trace, Scan+1, Frame+1 and Rewind buttons from
+<p>You can also use the Step, Trace, Scan+1, Frame+1 and Rewind buttons from anywhere
-anywhere in the GUI via the keyboard, with F4 to F8, respectively.</p>
+in the GUI via the keyboard, with Control-S, Control-T, Control-L, Control-F and Control-R.</p>
 
 
 <!-- /////////////////////////////////////////////////////////////////////////  -->

src/debugger/gui/DebuggerDialog.cxx

@@ -89,26 +89,30 @@ void DebuggerDialog::loadConfig()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void DebuggerDialog::handleKeyDown(StellaKey key, StellaMod mod)
 {
-  switch(key)
+  if(instance().eventHandler().kbdControl(mod))
   {
-    case KBDK_F4:
+    switch(key)
-      doRewind();
+    {
-      break;
+      case KBDK_R:
-    case KBDK_F5:
+        doRewind();
-      doStep();
+        break;
-      break;
+      case KBDK_S:
-    case KBDK_F6:
+        doStep();
-      doTrace();
+        break;
-      break;
+      case KBDK_T:
-    case KBDK_F7:
+        doTrace();
-      doScanlineAdvance();
+        break;
-      break;
+      case KBDK_L:
-    case KBDK_F8:
+        doScanlineAdvance();
-      doAdvance();
+        break;
-      break;
+      case KBDK_F:
-    default:
+        doAdvance();
-      Dialog::handleKeyDown(key, mod);
+        break;
+      default:
+        break;
+    }
   }
+  Dialog::handleKeyDown(key, mod);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -