fix: correctly set none action type

Author: mishamyrt

features/keys/keymap_test.go

@@ -1,16 +1,23 @@
 package keys_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/mishamyrt/nuga-lib/features/keys"
 	"github.com/mishamyrt/nuga-lib/layout"
 )
 
+func ref[T any](v T) *T {
+	return &v
+}
+
 var testTemplate = layout.Template{
 	layout.KeyM:            0,
 	layout.KeyK:            1,
 	layout.KeyBrightnessUp: 2,
+	layout.KeyY:            3,
+	layout.KeyR:            4,
 }
 
 var testKeyMap = keys.KeyMap{
@@ -34,6 +41,13 @@ var testKeyMap = keys.KeyMap{
 			Name: layout.KeyBrightnessUp,
 		},
 	},
+	layout.KeyY: {
+		Type:       keys.ActionMacro,
+		MacroIndex: ref(uint8(1)),
+	},
+	layout.KeyR: {
+		Type: keys.ActionNone,
+	},
 }
 
 func TestApply(t *testing.T) {
@@ -47,6 +61,8 @@ func TestApply(t *testing.T) {
 		)},
 		{layout.KeyK, layout.Keys[layout.KeyK].Code},
 		{layout.KeyBrightnessUp, layout.Keys[layout.KeyBrightnessUp].Code},
+		{layout.KeyY, keys.IndexToMacro(1)},
+		{layout.KeyR, layout.Keys[layout.KeyNone].Code},
 	}
 	source := make([]uint32, len(tests))
 	err := testKeyMap.Apply(source, &testTemplate)
@@ -68,6 +84,8 @@ func TestParseKeyMap(t *testing.T) {
 		keys.ApplyModifiers(layout.Keys[layout.KeyM].Code, &keys.Modifiers{Ctrl: true}),
 		layout.Keys[layout.KeyK].Code,
 		layout.Keys[layout.KeyBrightnessUp].Code,
+		keys.IndexToMacro(1),
+		layout.Keys[layout.KeyNone].Code,
 	}
 	keyMap, err := keys.ParseKeyMap(values, &testTemplate)
 	if err != nil {
@@ -77,29 +95,40 @@ func TestParseKeyMap(t *testing.T) {
 	if len(*keyMap) != len(testKeyMap) {
 		t.Errorf("Expected keyMap length to be %d, got %d", len(testKeyMap), len(*keyMap))
 	}
-
 	for k, v := range testKeyMap {
-		if (*keyMap)[k].Keystroke.Name != v.Keystroke.Name {
-			t.Errorf("Expected keyMap[%s].Name to be %#v, got %#v", k, v.Keystroke.Name, (*keyMap)[k].Keystroke.Name)
-		}
-		if v.Keystroke.Modifiers == nil || (*keyMap)[k].Keystroke.Modifiers == nil {
-			if v.Keystroke.Modifiers == nil && (*keyMap)[k].Keystroke.Modifiers == nil {
-				continue
+		switch v.Type {
+		case keys.ActionKeystroke:
+			if (*keyMap)[k].Keystroke.Name != v.Keystroke.Name {
+				t.Errorf("Expected keyMap[%s].Name to be %#v, got %#v", k, v.Keystroke.Name, (*keyMap)[k].Keystroke.Name)
+			}
+			if v.Keystroke.Modifiers == nil || (*keyMap)[k].Keystroke.Modifiers == nil {
+				if v.Keystroke.Modifiers == nil && (*keyMap)[k].Keystroke.Modifiers == nil {
+					continue
+				} else {
+					t.Errorf(
+						"Unexpected one modifier to be nil: %v, %v",
+						v.Keystroke.Modifiers,
+						(*keyMap)[k].Keystroke.Modifiers,
+					)
+				}
+			}
+			if v.Keystroke.Modifiers == nil && (*keyMap)[k].Keystroke.Modifiers != nil {
+				t.Errorf("Expected keyMap[%s].Modifiers to be nil, got %#v", k, (*keyMap)[k].Keystroke.Modifiers)
 			} else {
-				t.Errorf(
-					"Unexpected one modifier to be nil: %v, %v",
-					v.Keystroke.Modifiers,
-					(*keyMap)[k].Keystroke.Modifiers,
-				)
+				expectedModifiers := *v.Keystroke.Modifiers
+				gotModifiers := *((*keyMap)[k].Keystroke.Modifiers)
+				if expectedModifiers != gotModifiers {
+					t.Errorf("Expected keyMap[%s].Modifiers to be %#v, got %#v", k, expectedModifiers, gotModifiers)
+				}
 			}
-		}
-		if v.Keystroke.Modifiers == nil && (*keyMap)[k].Keystroke.Modifiers != nil {
-			t.Errorf("Expected keyMap[%s].Modifiers to be nil, got %#v", k, (*keyMap)[k].Keystroke.Modifiers)
-		} else {
-			expectedModifiers := *v.Keystroke.Modifiers
-			gotModifiers := *((*keyMap)[k].Keystroke.Modifiers)
-			if expectedModifiers != gotModifiers {
-				t.Errorf("Expected keyMap[%s].Modifiers to be %#v, got %#v", k, expectedModifiers, gotModifiers)
+		case keys.ActionMacro:
+			if (*keyMap)[k].MacroIndex == nil || *(*keyMap)[k].MacroIndex != 1 {
+				t.Errorf("Expected keyMap[%s].MacroIndex to be 1, got %#v", k, (*keyMap)[k].MacroIndex)
+			}
+		case keys.ActionNone:
+			if (*keyMap)[k].Type != keys.ActionNone {
+				fmt.Println(*(*keyMap)[k].Keystroke)
+				t.Errorf("Expected keyMap[%s].Type to be ActionNone, got %#v", k, (*keyMap)[k].Type)
 			}
 		}
 

features/keys/keys.go

@@ -7,7 +7,7 @@ func IsMacroKey(code uint32) bool {
 
 // IsRegularKey checks if code is regular
 func IsRegularKey(code uint32) bool {
-	return byte(code&0xFF) == 0x00
+	return code != 0 && byte(code&0xFF) == 0x00
 }
 
 // IndexToMacro converts index to macro

features/keys/keys_test.go

@@ -53,7 +53,7 @@ func TestIsRegularKey(t *testing.T) {
 		code     uint32
 		expected bool
 	}{
-		{"Empty", 0x0000, true},
+		{"None", 0x0000, false},
 		{"Regular large value", 0x9900, true},
 		{"Empty not regular", 0x0001, false},
 		{"Large not regular", 0x101b, false},