From 4acc98a729e2545cb7285fbf262f6268ac162b25 Mon Sep 17 00:00:00 2001
From: Andrew Pennebaker <andrew.pennebaker@gmail.com>
Date: Thu, 7 Dec 2017 23:15:56 -0600
Subject: [PATCH 1/2] add super key (vmware builder)

---
 .../vmware/common/step_type_boot_command.go   | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/builder/vmware/common/step_type_boot_command.go b/builder/vmware/common/step_type_boot_command.go
index 28db3c72e8f..b100b609ecf 100644
--- a/builder/vmware/common/step_type_boot_command.go
+++ b/builder/vmware/common/step_type_boot_command.go
@@ -183,6 +183,8 @@ func vncSendString(c *vnc.ClientConn, original string) {
 	special["<rightAlt>"] = 0xFFEA
 	special["<rightCtrl>"] = 0xFFE4
 	special["<rightShift>"] = 0xFFE2
+	special["<leftSuper>"] = 0xFFEB
+	special["<rightSuper>"] = 0xFFEC
 
 	shiftedChars := "~!@#$%^&*()_+{}|:\"<>?"
 
@@ -231,6 +233,17 @@ func vncSendString(c *vnc.ClientConn, original string) {
 			continue
 		}
 
+		if strings.HasPrefix(original, "<leftSuperOn>") {
+			keyCode = special["<leftSuper>"]
+			original = original[len("<leftSuperOn>"):]
+			log.Printf("Special code '<leftSuperOn>' found, replacing with: %d", keyCode)
+
+			c.KeyEvent(keyCode, true)
+			time.Sleep(keyInterval)
+
+			continue
+		}
+
 		if strings.HasPrefix(original, "<leftAltOff>") {
 			keyCode = special["<leftAlt>"]
 			original = original[len("<leftAltOff>"):]
@@ -264,6 +277,17 @@ func vncSendString(c *vnc.ClientConn, original string) {
 			continue
 		}
 
+		if strings.HasPrefix(original, "<leftSuperOff>") {
+			keyCode = special["<leftSuper>"]
+			original = original[len("<leftSuperOff>"):]
+			log.Printf("Special code '<leftSuperOff>' found, replacing with: %d", keyCode)
+
+			c.KeyEvent(keyCode, false)
+			time.Sleep(keyInterval)
+
+			continue
+		}
+
 		if strings.HasPrefix(original, "<rightAltOn>") {
 			keyCode = special["<rightAlt>"]
 			original = original[len("<rightAltOn>"):]
@@ -297,6 +321,17 @@ func vncSendString(c *vnc.ClientConn, original string) {
 			continue
 		}
 
+		if strings.HasPrefix(original, "<rightSuperOn>") {
+			keyCode = special["<rightSuper>"]
+			original = original[len("<rightSuperOn>"):]
+			log.Printf("Special code '<rightSuperOn>' found, replacing with: %d", keyCode)
+
+			c.KeyEvent(keyCode, true)
+			time.Sleep(keyInterval)
+
+			continue
+		}
+
 		if strings.HasPrefix(original, "<rightAltOff>") {
 			keyCode = special["<rightAlt>"]
 			original = original[len("<rightAltOff>"):]
@@ -330,6 +365,17 @@ func vncSendString(c *vnc.ClientConn, original string) {
 			continue
 		}
 
+		if strings.HasPrefix(original, "<rightSuperOff>") {
+			keyCode = special["<rightSuper>"]
+			original = original[len("<rightSuperOff>"):]
+			log.Printf("Special code '<rightSuperOff>' found, replacing with: %d", keyCode)
+
+			c.KeyEvent(keyCode, false)
+			time.Sleep(keyInterval)
+
+			continue
+		}
+
 		if strings.HasPrefix(original, "<wait>") {
 			log.Printf("Special code '<wait>' found, sleeping one second")
 			time.Sleep(1 * time.Second)

From d069dc5b7c18e39ac332ab12566cdf801b14bd32 Mon Sep 17 00:00:00 2001
From: Andrew Pennebaker <andrew.pennebaker@gmail.com>
Date: Sat, 9 Dec 2017 12:02:20 -0600
Subject: [PATCH 2/2] handle holding a-z keys, such as for boot options (vmware
 builder)

---
 .../vmware/common/step_type_boot_command.go   | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/builder/vmware/common/step_type_boot_command.go b/builder/vmware/common/step_type_boot_command.go
index b100b609ecf..520ed43206b 100644
--- a/builder/vmware/common/step_type_boot_command.go
+++ b/builder/vmware/common/step_type_boot_command.go
@@ -5,6 +5,7 @@ import (
 	"log"
 	"net"
 	"os"
+	"regexp"
 	"runtime"
 	"strings"
 	"time"
@@ -195,6 +196,9 @@ func vncSendString(c *vnc.ClientConn, original string) {
 		keyInterval = delay
 	}
 
+	azOnRegex := regexp.MustCompile("^<(?P<ordinary>[a-zA-Z])On>")
+	azOffRegex := regexp.MustCompile("^<(?P<ordinary>[a-zA-Z])Off>")
+
 	// TODO(mitchellh): Ripe for optimizations of some point, perhaps.
 	for len(original) > 0 {
 		var keyCode uint32
@@ -244,6 +248,25 @@ func vncSendString(c *vnc.ClientConn, original string) {
 			continue
 		}
 
+		if azOnRegex.MatchString(original) {
+			m := azOnRegex.FindStringSubmatch(original)
+			r, _ := utf8.DecodeRuneInString(m[1])
+			original = original[len("<aOn>"):]
+			keyCode = uint32(r)
+			keyShift = unicode.IsUpper(r) || strings.ContainsRune(shiftedChars, r)
+
+			log.Printf("Special code '%s' found, replacing with %d, shift %v", m[0], keyCode, keyShift)
+
+			if keyShift {
+				c.KeyEvent(KeyLeftShift, true)
+			}
+
+			c.KeyEvent(keyCode, true)
+			time.Sleep(keyInterval)
+
+			continue
+		}
+
 		if strings.HasPrefix(original, "<leftAltOff>") {
 			keyCode = special["<leftAlt>"]
 			original = original[len("<leftAltOff>"):]
@@ -288,6 +311,25 @@ func vncSendString(c *vnc.ClientConn, original string) {
 			continue
 		}
 
+		if azOffRegex.MatchString(original) {
+			m := azOffRegex.FindStringSubmatch(original)
+			r, _ := utf8.DecodeRuneInString(m[1])
+			original = original[len("<aOff>"):]
+			keyCode = uint32(r)
+			keyShift = unicode.IsUpper(r) || strings.ContainsRune(shiftedChars, r)
+
+			log.Printf("Special code '%s' found, replacing with %d, shift %v", m[0], keyCode, keyShift)
+
+			if keyShift {
+				c.KeyEvent(KeyLeftShift, false)
+			}
+
+			c.KeyEvent(keyCode, false)
+			time.Sleep(keyInterval)
+
+			continue
+		}
+
 		if strings.HasPrefix(original, "<rightAltOn>") {
 			keyCode = special["<rightAlt>"]
 			original = original[len("<rightAltOn>"):]