ui: Add keys (#339)

genkeys.go

@@ -62,6 +62,15 @@ func init() {
 		"ArrowUp":      "Up",
 		"Escape":       "Escape",
 		"Backspace":    "Backspace",
+		"Quote":        "Apostrophe",
+		"Minus":        "Minus",
+		"Slash":        "Slash",
+		"Semicolon":    "Semicolon",
+		"Equal":        "Equal",
+		"BracketLeft":  "LeftBracket",
+		"Backslash":    "Backslash",
+		"BracketRight": "RightBracket",
+		"Backquote":    "GraveAccent",
 	}
 	// ASCII: 0 - 9
 	for c := '0'; c <= '9'; c++ {
@@ -79,8 +88,8 @@ func init() {
 
 func init() {
 	keyCodeToNameSafari = map[int]string{
-		0xBC: "Comma",
+		0xbc: "Comma",
-		0xBE: "Period",
+		0xbe: "Period",
 		0x12: "Alt",
 		0x14: "CapsLock",
 		0x11: "Control",
@@ -99,7 +108,15 @@ func init() {
 		0x27: "Right",
 		0x26: "Up",
 		0x1B: "Escape",
-		// The keys not listed in the Mozilla site:
+		0xde: "Apostrophe",
+		0xbd: "Minus",
+		0xbf: "Slash",
+		0xba: "Semicolon",
+		0xbb: "Equal",
+		0xdb: "LeftBracket",
+		0xdc: "Backslash",
+		0xdd: "RightBracket",
+		0xc0: "GraveAccent",
 		0x08: "Backspace",
 	}
 	// ASCII: 0 - 9

internal/ui/keys.go

@@ -56,6 +56,8 @@ const (
 	KeyY
 	KeyZ
 	KeyAlt
+	KeyApostrophe
+	KeyBackslash
 	KeyBackspace
 	KeyCapsLock
 	KeyComma
@@ -64,6 +66,7 @@ const (
 	KeyDown
 	KeyEnd
 	KeyEnter
+	KeyEqual
 	KeyEscape
 	KeyF1
 	KeyF2
@@ -77,14 +80,20 @@ const (
 	KeyF10
 	KeyF11
 	KeyF12
+	KeyGraveAccent
 	KeyHome
 	KeyInsert
 	KeyLeft
+	KeyLeftBracket
+	KeyMinus
 	KeyPageDown
 	KeyPageUp
 	KeyPeriod
 	KeyRight
+	KeyRightBracket
+	KeySemicolon
 	KeyShift
+	KeySlash
 	KeySpace
 	KeyTab
 	KeyUp

internal/ui/keys_glfw.go

@@ -62,6 +62,8 @@ var glfwKeyCodeToKey = map[glfw.Key]Key{
 	glfw.KeyX:            KeyX,
 	glfw.KeyY:            KeyY,
 	glfw.KeyZ:            KeyZ,
+	glfw.KeyApostrophe:   KeyApostrophe,
+	glfw.KeyBackslash:    KeyBackslash,
 	glfw.KeyBackspace:    KeyBackspace,
 	glfw.KeyCapsLock:     KeyCapsLock,
 	glfw.KeyComma:        KeyComma,
@@ -69,6 +71,7 @@ var glfwKeyCodeToKey = map[glfw.Key]Key{
 	glfw.KeyDown:         KeyDown,
 	glfw.KeyEnd:          KeyEnd,
 	glfw.KeyEnter:        KeyEnter,
+	glfw.KeyEqual:        KeyEqual,
 	glfw.KeyEscape:       KeyEscape,
 	glfw.KeyF1:           KeyF1,
 	glfw.KeyF2:           KeyF2,
@@ -82,13 +85,19 @@ var glfwKeyCodeToKey = map[glfw.Key]Key{
 	glfw.KeyF10:          KeyF10,
 	glfw.KeyF11:          KeyF11,
 	glfw.KeyF12:          KeyF12,
+	glfw.KeyGraveAccent:  KeyGraveAccent,
 	glfw.KeyHome:         KeyHome,
 	glfw.KeyInsert:       KeyInsert,
 	glfw.KeyLeft:         KeyLeft,
+	glfw.KeyLeftBracket:  KeyLeftBracket,
+	glfw.KeyMinus:        KeyMinus,
 	glfw.KeyPageDown:     KeyPageDown,
 	glfw.KeyPageUp:       KeyPageUp,
 	glfw.KeyPeriod:       KeyPeriod,
 	glfw.KeyRight:        KeyRight,
+	glfw.KeyRightBracket: KeyRightBracket,
+	glfw.KeySemicolon:    KeySemicolon,
+	glfw.KeySlash:        KeySlash,
 	glfw.KeySpace:        KeySpace,
 	glfw.KeyTab:          KeyTab,
 	glfw.KeyUp:           KeyUp,

internal/ui/keys_js.go

@@ -25,7 +25,11 @@ var codeToKey = map[string]Key{
 	"ArrowLeft":    KeyLeft,
 	"ArrowRight":   KeyRight,
 	"ArrowUp":      KeyUp,
+	"Backquote":    KeyGraveAccent,
+	"Backslash":    KeyBackslash,
 	"Backspace":    KeyBackspace,
+	"BracketLeft":  KeyLeftBracket,
+	"BracketRight": KeyRightBracket,
 	"CapsLock":     KeyCapsLock,
 	"Comma":        KeyComma,
 	"ControlLeft":  KeyControl,
@@ -43,6 +47,7 @@ var codeToKey = map[string]Key{
 	"Digit9":       Key9,
 	"End":          KeyEnd,
 	"Enter":        KeyEnter,
+	"Equal":        KeyEqual,
 	"Escape":       KeyEscape,
 	"F1":           KeyF1,
 	"F10":          KeyF10,
@@ -84,11 +89,15 @@ var codeToKey = map[string]Key{
 	"KeyX":         KeyX,
 	"KeyY":         KeyY,
 	"KeyZ":         KeyZ,
+	"Minus":        KeyMinus,
 	"PageDown":     KeyPageDown,
 	"PageUp":       KeyPageUp,
 	"Period":       KeyPeriod,
+	"Quote":        KeyApostrophe,
+	"Semicolon":    KeySemicolon,
 	"ShiftLeft":    KeyShift,
 	"ShiftRight":   KeyShift,
+	"Slash":        KeySlash,
 	"Space":        KeySpace,
 	"Tab":          KeyTab,
 }
@@ -161,6 +170,15 @@ var keyCodeToKeySafari = map[int]Key{
 	121: KeyF10,
 	122: KeyF11,
 	123: KeyF12,
+	186: KeySemicolon,
+	187: KeyEqual,
 	188: KeyComma,
+	189: KeyMinus,
 	190: KeyPeriod,
+	191: KeySlash,
+	192: KeyGraveAccent,
+	219: KeyLeftBracket,
+	220: KeyBackslash,
+	221: KeyRightBracket,
+	222: KeyApostrophe,
 }

keys.go

@@ -64,6 +64,8 @@ const (
 	KeyY            = Key(ui.KeyY)
 	KeyZ            = Key(ui.KeyZ)
 	KeyAlt          = Key(ui.KeyAlt)
+	KeyApostrophe   = Key(ui.KeyApostrophe)
+	KeyBackslash    = Key(ui.KeyBackslash)
 	KeyBackspace    = Key(ui.KeyBackspace)
 	KeyCapsLock     = Key(ui.KeyCapsLock)
 	KeyComma        = Key(ui.KeyComma)
@@ -72,6 +74,7 @@ const (
 	KeyDown         = Key(ui.KeyDown)
 	KeyEnd          = Key(ui.KeyEnd)
 	KeyEnter        = Key(ui.KeyEnter)
+	KeyEqual        = Key(ui.KeyEqual)
 	KeyEscape       = Key(ui.KeyEscape)
 	KeyF1           = Key(ui.KeyF1)
 	KeyF2           = Key(ui.KeyF2)
@@ -85,14 +88,20 @@ const (
 	KeyF10          = Key(ui.KeyF10)
 	KeyF11          = Key(ui.KeyF11)
 	KeyF12          = Key(ui.KeyF12)
+	KeyGraveAccent  = Key(ui.KeyGraveAccent)
 	KeyHome         = Key(ui.KeyHome)
 	KeyInsert       = Key(ui.KeyInsert)
 	KeyLeft         = Key(ui.KeyLeft)
+	KeyLeftBracket  = Key(ui.KeyLeftBracket)
+	KeyMinus        = Key(ui.KeyMinus)
 	KeyPageDown     = Key(ui.KeyPageDown)
 	KeyPageUp       = Key(ui.KeyPageUp)
 	KeyPeriod       = Key(ui.KeyPeriod)
 	KeyRight        = Key(ui.KeyRight)
+	KeyRightBracket = Key(ui.KeyRightBracket)
+	KeySemicolon    = Key(ui.KeySemicolon)
 	KeyShift        = Key(ui.KeyShift)
+	KeySlash        = Key(ui.KeySlash)
 	KeySpace        = Key(ui.KeySpace)
 	KeyTab          = Key(ui.KeyTab)
 	KeyUp           = Key(ui.KeyUp)