about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-04-29 23:58:52 -0700
committerKartik K. Agaram <vc@akkartik.com>2021-04-30 00:00:55 -0700
commitbf4c19f0531a29dd514280581eeb1b88c9b13af1 (patch)
tree0218d568849a66ae6b1ebb1004d4516ae5b5799d
parent3385febc11dbe76ac86ef00992e7fdded19c58fc (diff)
downloadmu-bf4c19f0531a29dd514280581eeb1b88c9b13af1.tar.gz
shell: squeeze menu
-rw-r--r--shell/sandbox.mu24
1 files changed, 13 insertions, 11 deletions
diff --git a/shell/sandbox.mu b/shell/sandbox.mu
index 03474926..a699e8bd 100644
--- a/shell/sandbox.mu
+++ b/shell/sandbox.mu
@@ -516,9 +516,10 @@ fn render-sandbox-menu screen: (addr screen), _self: (addr sandbox) {
   height <- increment
   clear-rect screen, 0/x, y, width, height, 0/bg=black
   set-cursor-position screen, 0/x, y
-  draw-text-rightward-from-cursor screen, " ctrl-r ", width, 0/fg, 7/bg=grey
+  draw-text-rightward-from-cursor screen, " ctrl+... ", width, 0xf/fg, 0/bg
+  draw-text-rightward-from-cursor screen, " r ", width, 0/fg, 7/bg=grey
   draw-text-rightward-from-cursor screen, " run main  ", width, 7/fg, 0/bg
-  draw-text-rightward-from-cursor screen, " ctrl-s ", width, 0/fg, 7/bg=grey
+  draw-text-rightward-from-cursor screen, " s ", width, 0/fg, 7/bg=grey
   draw-text-rightward-from-cursor screen, " run sandbox  ", width, 7/fg, 0/bg
   $render-sandbox-menu:render-ctrl-m: {
     var self/eax: (addr sandbox) <- copy _self
@@ -526,20 +527,20 @@ fn render-sandbox-menu screen: (addr screen), _self: (addr sandbox) {
     compare has-trace?, 0/false
     {
       break-if-=
-      draw-text-rightward-from-cursor screen, " ctrl-m ", width, 0/fg, 9/bg=blue
+      draw-text-rightward-from-cursor screen, " m ", width, 0/fg, 9/bg=blue
       draw-text-rightward-from-cursor screen, " to trace  ", width, 7/fg, 0/bg
       break $render-sandbox-menu:render-ctrl-m
     }
-    draw-text-rightward-from-cursor screen, " ctrl-m ", width, 0/fg, 0x18/bg=keyboard
+    draw-text-rightward-from-cursor screen, " m ", width, 0/fg, 0x18/bg=keyboard
     draw-text-rightward-from-cursor screen, " to keyboard  ", width, 7/fg, 0/bg
   }
-  draw-text-rightward-from-cursor screen, " ctrl-a ", width, 0/fg, 7/bg=grey
+  draw-text-rightward-from-cursor screen, " a ", width, 0/fg, 7/bg=grey
   draw-text-rightward-from-cursor screen, " <<  ", width, 7/fg, 0/bg
-  draw-text-rightward-from-cursor screen, " ctrl-b ", width, 0/fg, 7/bg=grey
+  draw-text-rightward-from-cursor screen, " b ", width, 0/fg, 7/bg=grey
   draw-text-rightward-from-cursor screen, " <word  ", width, 7/fg, 0/bg
-  draw-text-rightward-from-cursor screen, " ctrl-f ", width, 0/fg, 7/bg=grey
+  draw-text-rightward-from-cursor screen, " f ", width, 0/fg, 7/bg=grey
   draw-text-rightward-from-cursor screen, " word>  ", width, 7/fg, 0/bg
-  draw-text-rightward-from-cursor screen, " ctrl-e ", width, 0/fg, 7/bg=grey
+  draw-text-rightward-from-cursor screen, " e ", width, 0/fg, 7/bg=grey
   draw-text-rightward-from-cursor screen, " >>  ", width, 7/fg, 0/bg
 }
 
@@ -553,11 +554,12 @@ fn render-keyboard-menu screen: (addr screen) {
   height <- increment
   clear-rect screen, 0/x, y, width, height, 0/bg=black
   set-cursor-position screen, 0/x, y
-  draw-text-rightward-from-cursor screen, " ctrl-r ", width, 0/fg, 7/bg=grey
+  draw-text-rightward-from-cursor screen, " ctrl+... ", width, 0xf/fg, 0/bg
+  draw-text-rightward-from-cursor screen, " r ", width, 0/fg, 7/bg=grey
   draw-text-rightward-from-cursor screen, " run main  ", width, 7/fg, 0/bg
-  draw-text-rightward-from-cursor screen, " ctrl-s ", width, 0/fg, 7/bg=grey
+  draw-text-rightward-from-cursor screen, " s ", width, 0/fg, 7/bg=grey
   draw-text-rightward-from-cursor screen, " run sandbox  ", width, 7/fg, 0/bg
-  draw-text-rightward-from-cursor screen, " ctrl-m ", width, 0/fg, 3/bg=cyan
+  draw-text-rightward-from-cursor screen, " m ", width, 0/fg, 3/bg=cyan
   draw-text-rightward-from-cursor screen, " to sandbox  ", width, 7/fg, 0/bg
 }