about summary refs log tree commit diff stats
path: root/shell/sandbox.mu
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-05-23 22:18:51 -0700
committerKartik K. Agaram <vc@akkartik.com>2021-05-23 22:18:51 -0700
commit7fa01639419f244f2f7387967ab72aa6c52bd2fe (patch)
tree9b7c99c51845eed37c6d68179b628603429ac857 /shell/sandbox.mu
parentd3103378c5f4d52f7f5833583defe1a76bccac4d (diff)
downloadmu-7fa01639419f244f2f7387967ab72aa6c52bd2fe.tar.gz
disable ctrl-s when browsing trace
We're soon going to be dynamically rerunning the sandbox in other ways
when browsing the trace.
Diffstat (limited to 'shell/sandbox.mu')
-rw-r--r--shell/sandbox.mu8
1 files changed, 6 insertions, 2 deletions
diff --git a/shell/sandbox.mu b/shell/sandbox.mu
index 5addec61..bc05ee13 100644
--- a/shell/sandbox.mu
+++ b/shell/sandbox.mu
@@ -413,8 +413,6 @@ fn render-sandbox-menu screen: (addr screen), _self: (addr sandbox) {
   draw-text-rightward-from-cursor screen, " ctrl+... ", width, 0xf/fg, 0xc5/bg=blue-bg
   draw-text-rightward-from-cursor screen, " r ", width, 0/fg, 0x5c/bg=black
   draw-text-rightward-from-cursor screen, " run main  ", width, 7/fg, 0xc5/bg=blue-bg
-  draw-text-rightward-from-cursor screen, " s ", width, 0/fg, 0x5c/bg=black
-  draw-text-rightward-from-cursor screen, " run sandbox  ", width, 7/fg, 0xc5/bg=blue-bg
   $render-sandbox-menu:render-ctrl-m: {
     var self/eax: (addr sandbox) <- copy _self
     var has-trace?/eax: boolean <- has-trace? self
@@ -428,6 +426,8 @@ fn render-sandbox-menu screen: (addr screen), _self: (addr sandbox) {
     draw-text-rightward-from-cursor screen, " m ", width, 0/fg, 3/bg=keyboard
     draw-text-rightward-from-cursor screen, " to keyboard  ", width, 7/fg, 0xc5/bg=blue-bg
   }
+  draw-text-rightward-from-cursor screen, " s ", width, 0/fg, 0x5c/bg=black
+  draw-text-rightward-from-cursor screen, " run sandbox  ", width, 7/fg, 0xc5/bg=blue-bg
   draw-text-rightward-from-cursor screen, " a ", width, 0/fg, 0x5c/bg=black
   draw-text-rightward-from-cursor screen, " <<  ", width, 7/fg, 0xc5/bg=blue-bg
   draw-text-rightward-from-cursor screen, " b ", width, 0/fg, 0x5c/bg=black
@@ -464,6 +464,10 @@ fn edit-sandbox _self: (addr sandbox), key: byte, globals: (addr global-table),
   {
     compare g, 0x13/ctrl-s
     break-if-!=
+    # if cursor is in trace, skip
+    var cursor-in-trace?/eax: (addr boolean) <- get self, cursor-in-trace?
+    compare *cursor-in-trace?, 0/false
+    break-if-!=
     # minor gotcha here: any bindings created later in this iteration won't be
     # persisted until the next call to ctrl-s.
     store-state data-disk, self, globals