improvements related to hotkey help

mitranim · Sep 4, 2023 · c328b5b · c328b5b
1 parent a011645
commit c328b5b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/gow_misc.go b/gow_misc.go
@@ -21,7 +21,7 @@ const (
 	ASCII_DEVICE_CONTROL_2 = 18  // ^R
 	ASCII_DEVICE_CONTROL_4 = 20  // ^T
 	ASCII_UNIT_SEPARATOR   = 31  // ^- or ^?
-	ASCII_DELETE           = 127 // ^H on macOS
+	ASCII_DELETE           = 127 // ^H on MacOS
 
 	// These names reflect our re-interpretation of standard codes.
 	CODE_INTERRUPT        = ASCII_END_OF_TEXT
@@ -31,16 +31,17 @@ const (
 	CODE_PRINT_COMMAND    = ASCII_UNIT_SEPARATOR
 	CODE_PRINT_HELP       = ASCII_BACKSPACE
 	CODE_PRINT_HELP_MACOS = ASCII_DELETE
+)
+
+const HOTKEY_HELP = `Control codes / hotkeys:
 
-	hotkeyHelp = `	3     ^C          Kill subprocess with SIGINT. Repeat within 1s to kill gow.
+	3     ^C          Kill subprocess with SIGINT. Repeat within 1s to kill gow.
 	18    ^R          Kill subprocess with SIGTERM, restart.
 	20    ^T          Kill subprocess with SIGTERM. Repeat within 1s to kill gow.
 	28    ^\          Kill subprocess with SIGQUIT. Repeat within 1s to kill gow.
 	31    ^- or ^?    Print currently running command.
-	8     ^H	  Print this help
-	127   ^H (macOS)  Print this help
-`
-)
+	8     ^H	  Print this help.
+	127   ^H (MacOS)  Print this help.`
 
 var (
 	FD_TERM      = syscall.Stdin

diff --git a/gow_opt.go b/gow_opt.go
@@ -78,10 +78,8 @@ Flags:
 "Multi" flags can be passed multiple times.
 Some also support comma-separated parsing.
 
-Control codes / hotkeys:
-
-%s
-`, gg.FlagHelp[Opt](), hotkeyHelp))
+%v
+`, gg.FlagHelp[Opt](), HOTKEY_HELP))
 }
 
 func (self Opt) LogErr(err error) {

diff --git a/gow_stdio.go b/gow_stdio.go
@@ -80,9 +80,7 @@ func (self *Stdio) OnByte(char byte) {
 	case CODE_STOP:
 		self.OnCodeStop()
 
-	case CODE_PRINT_HELP:
-		fallthrough
-	case CODE_PRINT_HELP_MACOS:
+	case CODE_PRINT_HELP, CODE_PRINT_HELP_MACOS:
 		self.OnCodePrintHelp()
 
 	default:
@@ -103,13 +101,11 @@ func (self *Stdio) OnCodeQuit() {
 	self.OnCodeSig(CODE_QUIT, syscall.SIGQUIT, `^\`)
 }
 
-func (self *Stdio) OnCodePrintCommand() {
+func (*Stdio) OnCodePrintCommand() {
 	log.Printf(`current command: %q`, os.Args)
 }
 
-func (self *Stdio) OnCodePrintHelp() {
-	log.Printf(hotkeyHelp)
-}
+func (*Stdio) OnCodePrintHelp() { log.Println(HOTKEY_HELP) }
 
 func (self *Stdio) OnCodeRestart() {
 	main := self.Main()

diff --git a/readme.md b/readme.md
@@ -91,6 +91,8 @@ Supported control codes with commonly associated hotkeys. Exact keys may vary be
 20    ^T          Kill subprocess with SIGTERM.
 28    ^\          Kill subprocess with SIGQUIT.
 31    ^- or ^?    Print currently running command.
+8     ^H          Print help.
+127   ^H (MacOS)  Print help.
 ```
 
 Other input is forwarded to the subprocess as-is.