Use -1 for unknown button value, shared by mouse and keyboard inputs

gopxl · Oct 13, 2023 · 2a03061 · 2a03061
1 parent 34b47dc
commit 2a03061
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/backends/opengl/input.go b/backends/opengl/input.go
@@ -83,7 +83,7 @@ var mouseButtonMapping = map[glfw.MouseButton]pixel.Button{
 }
 
 var keyButtonMapping = map[glfw.Key]pixel.Button{
-	glfw.KeyUnknown:      pixel.KeyUnknown,
+	glfw.KeyUnknown:      pixel.ButtonUnknown,
 	glfw.KeySpace:        pixel.KeySpace,
 	glfw.KeyApostrophe:   pixel.KeyApostrophe,
 	glfw.KeyComma:        pixel.KeyComma,

diff --git a/input.go b/input.go
@@ -11,6 +11,8 @@ func (b Button) String() string {
 	return name
 }
 
+const ButtonUnknown Button = -1
+
 const (
 	// List of all mouse buttons.
 	MouseButton1 Button = iota
@@ -34,8 +36,7 @@ const (
 
 const (
 	// List of all keyboard buttons.
-	KeyUnknown Button = iota + Button(NumMouseButtons)
-	KeySpace
+	KeySpace = iota + Button(NumMouseButtons)
 	KeyApostrophe
 	KeyComma
 	KeyMinus
@@ -162,6 +163,7 @@ const (
 )
 
 var buttonNames = map[Button]string{
+	ButtonUnknown:     "Unknown",
 	MouseButton4:      "MouseButton4",
 	MouseButton5:      "MouseButton5",
 	MouseButton6:      "MouseButton6",
@@ -170,7 +172,6 @@ var buttonNames = map[Button]string{
 	MouseButtonLeft:   "MouseButtonLeft",
 	MouseButtonRight:  "MouseButtonRight",
 	MouseButtonMiddle: "MouseButtonMiddle",
-	KeyUnknown:        "Unknown",
 	KeySpace:          "Space",
 	KeyApostrophe:     "Apostrophe",
 	KeyComma:          "Comma",