Fix menu boot command vnc key stroke (#184)

* boot_command: add menu special key * Add menu special key * Add menu special key * vnc_driver: test menu key * vnc_driver: test menu key * Fix formatting generated with 1.20.3
hashicorp · May 25, 2023 · 7c81952 · 7c81952
1 parent 8331daf
commit 7c81952
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 22 deletions.
diff --git a/bootcommand/boot_command.go b/bootcommand/boot_command.go
diff --git a/bootcommand/boot_command.pigeon b/bootcommand/boot_command.pigeon
@@ -68,7 +68,7 @@ SpecialKey = "bs"i / "del"i / "enter"i / "esc"i / "f10"i / "f11"i / "f12"i
         /  "return"i / "tab"i / "up"i / "down"i / "spacebar"i / "insert"i / "home"i
         / "end"i / "pageUp"i / "pageDown"i / "leftAlt"i / "leftCtrl"i / "leftShift"i
         / "rightAlt"i / "rightCtrl"i / "rightShift"i / "leftSuper"i / "rightSuper"i
-        / "left"i / "right"i
+        / "left"i / "right"i / "menu"i
 
 NonZeroDigit = [1-9]
 Digit = [0-9]

diff --git a/bootcommand/boot_command_ast_test.go b/bootcommand/boot_command_ast_test.go
@@ -15,7 +15,7 @@ func Test_parse(t *testing.T) {
 	in := "<wait><wait20><wait3s><wait4m2ns>"
 	in += "foo/bar > one 界"
 	in += "<fon> b<fOff>"
-	in += "<foo><f3><f12><spacebar><leftalt><rightshift><rightsuper>"
+	in += "<foo><f3><f12><spacebar><leftalt><rightshift><rightsuper><menu>"
 	expected := []string{
 		"Wait<1s>",
 		"Wait<20s>",
@@ -51,6 +51,7 @@ func Test_parse(t *testing.T) {
 		"Spec-Press(leftalt)",
 		"Spec-Press(rightshift)",
 		"Spec-Press(rightsuper)",
+		"Spec-Press(menu)",
 	}
 
 	seq, err := GenerateExpressionSequence(in)

diff --git a/bootcommand/vnc_driver_test.go b/bootcommand/vnc_driver_test.go
@@ -26,12 +26,14 @@ func (s *sender) KeyEvent(u uint32, down bool) error {
 }
 
 func Test_vncSpecialLookup(t *testing.T) {
-	in := "<rightShift><rightshiftoff><RIGHTSHIFTON>"
+	in := "<rightShift><rightshiftoff><RIGHTSHIFTON><menu>"
 	expected := []event{
 		{0xFFE2, true},
 		{0xFFE2, false},
 		{0xFFE2, false},
 		{0xFFE2, true},
+		{0xFF67, true},
+		{0xFF67, false},
 	}
 	s := &sender{}
 	d := NewVNCDriver(s, time.Duration(0))