disable ctrl-s when browsing trace
We're soon going to be dynamically rerunning the sandbox in other ways when browsing the trace.
This commit is contained in:
parent
d3103378c5
commit
7fa0163941
|
@ -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, " 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, " 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, " 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: {
|
$render-sandbox-menu:render-ctrl-m: {
|
||||||
var self/eax: (addr sandbox) <- copy _self
|
var self/eax: (addr sandbox) <- copy _self
|
||||||
var has-trace?/eax: boolean <- has-trace? 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, " 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, " 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, " 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, " << ", width, 7/fg, 0xc5/bg=blue-bg
|
||||||
draw-text-rightward-from-cursor screen, " b ", width, 0/fg, 0x5c/bg=black
|
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
|
compare g, 0x13/ctrl-s
|
||||||
break-if-!=
|
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
|
# minor gotcha here: any bindings created later in this iteration won't be
|
||||||
# persisted until the next call to ctrl-s.
|
# persisted until the next call to ctrl-s.
|
||||||
store-state data-disk, self, globals
|
store-state data-disk, self, globals
|
||||||
|
|
|
@ -791,14 +791,16 @@ fn render-trace-menu screen: (addr screen) {
|
||||||
width, height <- screen-size screen
|
width, height <- screen-size screen
|
||||||
var y/ecx: int <- copy height
|
var y/ecx: int <- copy height
|
||||||
y <- decrement
|
y <- decrement
|
||||||
|
var height/edx: int <- copy y
|
||||||
|
height <- increment
|
||||||
|
clear-rect screen, 0/x, y, width, height, 0xc5/bg=blue-bg
|
||||||
set-cursor-position screen, 0/x, y
|
set-cursor-position screen, 0/x, y
|
||||||
draw-text-rightward-from-cursor screen, " enter/bksp ", width, 0/fg, 0x5c/bg=black
|
draw-text-rightward-from-cursor screen, " enter/bksp ", width, 0/fg, 0x5c/bg=black
|
||||||
draw-text-rightward-from-cursor screen, " expand/collapse ", width, 7/fg, 0xc5/bg=blue-bg
|
draw-text-rightward-from-cursor screen, " expand/collapse ", width, 7/fg, 0xc5/bg=blue-bg
|
||||||
draw-text-rightward-from-cursor screen, " ctrl-r ", width, 0/fg, 0x5c/bg=black
|
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, " run main ", width, 7/fg, 0xc5/bg=blue-bg
|
||||||
draw-text-rightward-from-cursor screen, " ctrl-s ", width, 0/fg, 0x5c/bg=black
|
draw-text-rightward-from-cursor screen, " m ", width, 0/fg, 3/bg=keyboard
|
||||||
draw-text-rightward-from-cursor screen, " run sandbox ", width, 7/fg, 0xc5/bg=blue-bg
|
|
||||||
draw-text-rightward-from-cursor screen, " ctrl-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, " to keyboard ", width, 7/fg, 0xc5/bg=blue-bg
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user