add shift keyboard shortcut when using rr cs01#201

cs01 · cs01 · commit 717cba8e1f74 · 2018-07-15T20:48:29.000-07:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -5,6 +5,7 @@
         "jquery": true
     },
     "globals":{
+        "initial_data": true,
         "module": true,
         "_": true,
         "moment": true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,17 +1,17 @@
 # gdbgui release history
 
 ## 0.13.0.0
-* Add ability to map source file paths. Added flags `--remap-sources` and `-m` to replace compile-time source paths to local source paths. i.e. `gdbgui --remap-sources='{"/buildmachine":"/home/chad"}'` (#158)
+* Add ability to re-map source file paths. Added flags `--remap-sources` and `-m` to replace compile-time source paths to local source paths. i.e. `gdbgui --remap-sources='{"/buildmachine": "/home/chad"}'` (#158)
+* Add shift keyboard shortcut to go in reverse when using rr (#201)
 * Pass arbitrary gdb arguments directly to gdb: added `--gdb-args` flag
 * Removed `-x` CLI option, which caused major version to change. New way to pass is `gdbgui --gdb-args='-x=FILE'` (#205)
-* Fix typo in tour (@nkirkby)
 * Add "name" to Threads (new gdb 8.1 feature) (@P4Cu)
 * Fix crash/black screen from "Python Exception <class NameError> name long is not defined" #212
 * Fix bug when debugging filenames with spaces (Fix Cannot create breakpoint: -break-insert: Garbage following <location> #211")
 * Fix empty frame causes the ui to crash/black screen #216
-* Update tour text
-* update npm packages; update react to 16.4
-* update prettier rules
+* Update npm packages; update react to 16.4
+* Update prettier rules
+* Update tour text + fix typo in tour (@nkirkby)
 
 ## 0.12.0.0
 * Add pause button
diff --git a/gdbgui/backend.py b/gdbgui/backend.py
@@ -542,6 +542,7 @@ def gdbgui():
         else "",
         "project_home": app.config["project_home"],
         "remap_sources": app.config["remap_sources"],
+        "rr": app.config["rr"],
         "show_gdbgui_upgrades": app.config["show_gdbgui_upgrades"],
         "themes": THEMES,
         "signals": SIGNAL_NAME_TO_OBJ,
diff --git a/gdbgui/src/js/ControlButtons.jsx b/gdbgui/src/js/ControlButtons.jsx
@@ -16,19 +16,22 @@ class ControlButtons extends React.Component {
       <React.Fragment>
         <button
           id="run_button"
-          onClick={GdbApi.click_run_button}
+          onClick={()=>GdbApi.click_run_button()}
           type="button"
-          title="Start inferior program from the beginning (keyboard shortcut: r)"
+          title="Start inferior program from the beginning keyboard shortcut: r"
           className={btn_class}
         >
           <span className="glyphicon glyphicon-repeat" />
         </button>
 
         <button
           id="continue_button"
-          onClick={GdbApi.click_continue_button}
+          onClick={()=>GdbApi.click_continue_button()}
           type="button"
-          title="Continue until breakpoint is hit or inferior program exits (keyboard shortcut: c)"
+          title={
+            "Continue until breakpoint is hit or inferior program exits keyboard shortcut: c" +
+            (initial_data.rr ? ". shift + c for reverse." : "")
+          }
           className={btn_class}
         >
           <span className="glyphicon glyphicon-play" />
@@ -45,48 +48,60 @@ class ControlButtons extends React.Component {
 
         <button
           id="next_button"
-          onClick={GdbApi.click_next_button}
+          onClick={()=>GdbApi.click_next_button()}
           type="button"
-          title="Step over next function call (keyboard shortcut: n or right arrow)"
+          title={
+            "Step over next function call keyboard shortcut: n or right arrow" +
+            (initial_data.rr ? ". shift + n for reverse." : "")
+          }
           className={btn_class}
         >
           <span className="glyphicon glyphicon-step-forward" />
         </button>
 
         <button
           id="step_button"
-          onClick={GdbApi.click_step_button}
+          onClick={()=>GdbApi.click_step_button()}
           type="button"
-          title="Step into next function call (keyboard shortcut: s or down arrow)"
+          title={
+            "Step into next function call keyboard shortcut: s or down arrow" +
+            (initial_data.rr ? ". shift + s for reverse." : "")
+          }
           className={btn_class}
         >
           <span className="glyphicon glyphicon-arrow-down" />
         </button>
 
         <button
           id="return_button"
-          onClick={GdbApi.click_return_button}
+          onClick={()=>GdbApi.click_return_button()}
           type="button"
-          title="Step out of current function (keyboard shortcut: u or up arrow)"
+          title="Step out of current function keyboard shortcut: u or up arrow"
           className={btn_class}
         >
           <span className="glyphicon glyphicon-arrow-up" />
         </button>
         <div role="group" className="btn-group btn-group-xs">
           <button
             id="next_instruction_button"
-            onClick={GdbApi.click_next_instruction_button}
+            onClick={()=>GdbApi.click_next_instruction_button()}
             type="button"
-            title="Next Instruction: Execute one machine instruction, stepping over function calls (keyboard shortcut: m)"
+            title={
+              "Next Instruction: Execute one machine instruction, stepping over function calls keyboard shortcut: m" +
+              (initial_data.rr ? ". shift + m for reverse." : "")
+            }
             className="btn btn-default"
           >
             NI
           </button>
           <button
             id="step_instruction_button"
-            onClick={GdbApi.click_step_instruction_button}
+            onClick={()=>GdbApi.click_step_instruction_button()}
             type="button"
-            title="Step Instruction: Execute one machine instruction, stepping into function calls (keyboard shortcut: ,)"
+            title={
+              "Step Instruction: Execute one machine instruction, stepping into function calls keyboard shortcut: ','" +
+              (initial_data.rr ? ". shift + , for reverse." : "")
+            }
             className="btn btn-default"
           >
             SI
diff --git a/gdbgui/src/js/GdbApi.jsx b/gdbgui/src/js/GdbApi.jsx
@@ -114,10 +114,10 @@ const GdbApi = {
     GdbApi.run_gdb_command("-exec-run");
   },
   run_initial_commands: function() {
-    const cmds = ["set breakpoint pending on"]
-    for(const src in initial_data.remap_sources){
-      const dst = initial_data.remap_sources[src]
-      cmds.push(`set substitute-path "${src}" "${dst}"`)
+    const cmds = ["set breakpoint pending on"];
+    for (const src in initial_data.remap_sources) {
+      const dst = initial_data.remap_sources[src];
+      cmds.push(`set substitute-path "${src}" "${dst}"`);
     }
     GdbApi.run_gdb_command(cmds);
   },
@@ -128,22 +128,22 @@ const GdbApi = {
       ) !== -1
     );
   },
-  click_continue_button: function() {
+  click_continue_button: function(reverse = false) {
     Actions.inferior_program_running();
     GdbApi.run_gdb_command(
-      "-exec-continue" + (store.get("debug_in_reverse") ? " --reverse" : "")
+      "-exec-continue" + (store.get("debug_in_reverse") || reverse ? " --reverse" : "")
     );
   },
-  click_next_button: function() {
+  click_next_button: function(reverse = false) {
     Actions.inferior_program_running();
     GdbApi.run_gdb_command(
-      "-exec-next" + (store.get("debug_in_reverse") ? " --reverse" : "")
+      "-exec-next" + (store.get("debug_in_reverse") || reverse ? " --reverse" : "")
     );
   },
-  click_step_button: function() {
+  click_step_button: function(reverse = false) {
     Actions.inferior_program_running();
     GdbApi.run_gdb_command(
-      "-exec-step" + (store.get("debug_in_reverse") ? " --reverse" : "")
+      "-exec-step" + (store.get("debug_in_reverse") || reverse ? " --reverse" : "")
     );
   },
   click_return_button: function() {
@@ -154,16 +154,18 @@ const GdbApi = {
     GdbApi.run_gdb_command("-exec-return");
     Actions.inferior_program_paused();
   },
-  click_next_instruction_button: function() {
+  click_next_instruction_button: function(reverse = false) {
     Actions.inferior_program_running();
     GdbApi.run_gdb_command(
-      "-exec-next-instruction" + (store.get("debug_in_reverse") ? " --reverse" : "")
+      "-exec-next-instruction" +
+        (store.get("debug_in_reverse") || reverse ? " --reverse" : "")
     );
   },
-  click_step_instruction_button: function() {
+  click_step_instruction_button: function(reverse = false) {
     Actions.inferior_program_running();
     GdbApi.run_gdb_command(
-      "-exec-step-instruction" + (store.get("debug_in_reverse") ? " --reverse" : "")
+      "-exec-step-instruction" +
+        (store.get("debug_in_reverse") || reverse ? " --reverse" : "")
     );
   },
   click_send_interrupt_button: function() {
diff --git a/gdbgui/src/js/GlobalEvents.js b/gdbgui/src/js/GlobalEvents.js
@@ -24,24 +24,29 @@ const GlobalEvents = {
    * enabled only when key is depressed on a target that is NOT an input.
    */
   body_keydown: function(e) {
-    let modifier = e.altKey || e.ctrlKey || e.shiftKey || e.metaKey;
+    let modifier = e.altKey || e.ctrlKey || e.metaKey;
 
     if (e.target.nodeName !== "INPUT" && !modifier) {
       let char = String.fromCharCode(e.keyCode).toLowerCase();
       if (e.keyCode === constants.DOWN_BUTTON_NUM || char === "s") {
         GdbApi.click_step_button();
-      } else if (e.keyCode === constants.RIGHT_BUTTON_NUM || char === "n") {
+      } else if (e.keyCode === constants.RIGHT_BUTTON_NUM) {
         GdbApi.click_next_button();
+      } else if (char === "n") {
+        GdbApi.click_next_button(e.shiftKey);
       } else if (char === "c") {
-        GdbApi.click_continue_button();
+        GdbApi.click_continue_button(e.shiftKey);
       } else if (e.keyCode === constants.UP_BUTTON_NUM || char === "u") {
         GdbApi.click_return_button();
       } else if (char === "r") {
         GdbApi.click_run_button();
       } else if (char === "m") {
-        GdbApi.click_next_instruction_button();
+        GdbApi.click_next_instruction_button(e.shiftKey);
       } else if (e.keyCode === constants.COMMA_BUTTON_NUM) {
-        GdbApi.click_step_instruction_button();
+        GdbApi.click_step_instruction_button(e.shiftKey);
+      } else if (initial_data.rr && e.keyCode === constants.LEFT_BUTTON_NUM) {
+        // reverse
+        GdbApi.click_next_button(true);
       }
     }
   }
diff --git a/gdbgui/src/js/TopBar.jsx b/gdbgui/src/js/TopBar.jsx
@@ -344,6 +344,30 @@ class TopBar extends React.Component {
       );
     }
 
+    let reverse_checkbox = null;
+    if (initial_data.rr) {
+      reverse_checkbox = (
+        <label
+          title={
+            "when clicking buttons to the right, pass the `--reverse` " +
+            "flag to gdb in an attempt to debug in reverse. This is not always supported. " +
+            "rr is known to support reverse debugging. Keyboard shortcuts go in " +
+            "reverse when pressed with the shift key."
+          }
+          style={{ fontWeight: "normal", fontSize: "0.9em", margin: "5px" }}
+        >
+          <input
+            type="checkbox"
+            checked={store.get("debug_in_reverse")}
+            onChange={e => {
+              store.set("debug_in_reverse", e.target.checked);
+            }}
+          />
+          reverse
+        </label>
+      );
+    }
+
     return (
       <div
         id="top"
@@ -352,19 +376,7 @@ class TopBar extends React.Component {
         <div className="flexrow">
           <BinaryLoader initial_user_input={this.props.initial_user_input} />
           {spinner}
-          <label
-            title="when clicking buttons to the right, pass the `--reverse` flag to gdb in an attempt to debug in reverse. This is not always supported. rr is known to support reverse debugging."
-            style={{ fontWeight: "normal", fontSize: "0.9em", margin: "5px" }}
-          >
-            <input
-              type="checkbox"
-              checked={store.get("debug_in_reverse")}
-              onChange={e => {
-                store.set("debug_in_reverse", e.target.checked);
-              }}
-            />
-            reverse
-          </label>
+          {reverse_checkbox}
 
           {this.get_controls()}
 
diff --git a/gdbgui/static/js/build.js b/gdbgui/static/js/build.js
diff --git a/yarn.lock b/yarn.lock
@@ -2203,8 +2203,8 @@ eslint-loader@^2.0.0:
     rimraf "^2.6.1"
 
 eslint-plugin-prettier@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.1.tgz#de902b4a66b7bca24296429a59a1cc04020ccbbd"
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.2.tgz#71998c60aedfa2141f7bfcbf9d1c459bf98b4fad"
   dependencies:
     fast-diff "^1.1.1"
     jest-docblock "^21.0.0"
@@ -3160,8 +3160,8 @@ is-builtin-module@^1.0.0:
     builtin-modules "^1.0.0"
 
 is-callable@^1.1.1, is-callable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
 
 is-ci@^1.0.10:
   version "1.1.0"
@@ -3724,6 +3724,10 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
+"js-tokens@^3.0.0 || ^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+
 js-yaml@^3.7.0, js-yaml@^3.9.1:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
@@ -4055,12 +4059,18 @@ longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
+loose-envify@^1.0.0, loose-envify@^1.1.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   dependencies:
     js-tokens "^3.0.0"
 
+loose-envify@^1.3.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
 lowercase-keys@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
@@ -4850,7 +4860,11 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^1.12.0, prettier@^1.12.1:
+prettier@^1.12.0:
+  version "1.13.7"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"
+
+prettier@^1.12.1:
   version "1.13.6"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.6.tgz#00ae0b777ad92f81a9e7a1df2f0470b6dab0cb44"
 
