From ea0bb5d3652708987dd3153eba0bff30cea120b7 Mon Sep 17 00:00:00 2001 From: Bel LaPointe Date: Fri, 24 Mar 2023 13:39:17 -0600 Subject: [PATCH] revert back to case sensitive because you cant hold A and a at the same time --- src/device/output/key.go | 73 --------------------- src/device/output/key/char.go | 32 +-------- src/device/output/key/char_test.go | 8 --- src/device/output/key/keys.go | 102 +++++++++++------------------ src/device/output/keyboard.go | 4 +- 5 files changed, 42 insertions(+), 177 deletions(-) delete mode 100644 src/device/output/key.go diff --git a/src/device/output/key.go b/src/device/output/key.go deleted file mode 100644 index 6d54230..0000000 --- a/src/device/output/key.go +++ /dev/null @@ -1,73 +0,0 @@ -package output - -import ( - "mayhem-party/src/device/output/key" - - "github.com/micmonay/keybd_event" -) - -var keyKeyToKeyBD = map[key.Key][]int{ - key.A: []int{keybd_event.VK_A}, - key.B: []int{keybd_event.VK_B}, - key.C: []int{keybd_event.VK_C}, - key.D: []int{keybd_event.VK_D}, - key.E: []int{keybd_event.VK_E}, - key.F: []int{keybd_event.VK_F}, - key.G: []int{keybd_event.VK_G}, - key.H: []int{keybd_event.VK_H}, - key.I: []int{keybd_event.VK_I}, - key.J: []int{keybd_event.VK_J}, - key.K: []int{keybd_event.VK_K}, - key.L: []int{keybd_event.VK_L}, - key.M: []int{keybd_event.VK_M}, - key.N: []int{keybd_event.VK_N}, - key.O: []int{keybd_event.VK_O}, - key.P: []int{keybd_event.VK_P}, - key.Q: []int{keybd_event.VK_Q}, - key.R: []int{keybd_event.VK_R}, - key.S: []int{keybd_event.VK_S}, - key.T: []int{keybd_event.VK_T}, - key.U: []int{keybd_event.VK_U}, - key.V: []int{keybd_event.VK_V}, - key.W: []int{keybd_event.VK_W}, - key.X: []int{keybd_event.VK_X}, - key.Y: []int{keybd_event.VK_Y}, - key.Z: []int{keybd_event.VK_Z}, - key.AUpper: []int{keybd_event.VK_A}, - key.BUpper: []int{keybd_event.VK_B}, - key.CUpper: []int{keybd_event.VK_C}, - key.DUpper: []int{keybd_event.VK_D}, - key.EUpper: []int{keybd_event.VK_E}, - key.FUpper: []int{keybd_event.VK_F}, - key.GUpper: []int{keybd_event.VK_G}, - key.HUpper: []int{keybd_event.VK_H}, - key.IUpper: []int{keybd_event.VK_I}, - key.JUpper: []int{keybd_event.VK_J}, - key.KUpper: []int{keybd_event.VK_K}, - key.LUpper: []int{keybd_event.VK_L}, - key.MUpper: []int{keybd_event.VK_M}, - key.NUpper: []int{keybd_event.VK_N}, - key.OUpper: []int{keybd_event.VK_O}, - key.PUpper: []int{keybd_event.VK_P}, - key.QUpper: []int{keybd_event.VK_Q}, - key.RUpper: []int{keybd_event.VK_R}, - key.SUpper: []int{keybd_event.VK_S}, - key.TUpper: []int{keybd_event.VK_T}, - key.UUpper: []int{keybd_event.VK_U}, - key.VUpper: []int{keybd_event.VK_V}, - key.WUpper: []int{keybd_event.VK_W}, - key.XUpper: []int{keybd_event.VK_X}, - key.YUpper: []int{keybd_event.VK_Y}, - key.ZUpper: []int{keybd_event.VK_Z}, - key.N1: []int{keybd_event.VK_1}, - key.N1: []int{keybd_event.VK_1}, - key.N2: []int{keybd_event.VK_2}, - key.N3: []int{keybd_event.VK_3}, - key.N4: []int{keybd_event.VK_4}, - key.N5: []int{keybd_event.VK_5}, - key.N6: []int{keybd_event.VK_6}, - key.N7: []int{keybd_event.VK_7}, - key.N8: []int{keybd_event.VK_8}, - key.N9: []int{keybd_event.VK_9}, - key.N0: []int{keybd_event.VK_0}, -} diff --git a/src/device/output/key/char.go b/src/device/output/key/char.go index 3c4dfb1..99caff5 100644 --- a/src/device/output/key/char.go +++ b/src/device/output/key/char.go @@ -1,35 +1,7 @@ package key -import "os" - var ( charToKey = map[byte]Key{ - 'A': AUpper, - 'B': BUpper, - 'C': CUpper, - 'D': DUpper, - 'E': EUpper, - 'F': FUpper, - 'G': GUpper, - 'H': HUpper, - 'I': IUpper, - 'J': JUpper, - 'K': KUpper, - 'L': LUpper, - 'M': MUpper, - 'N': NUpper, - 'O': OUpper, - 'P': PUpper, - 'Q': QUpper, - 'R': RUpper, - 'S': SUpper, - 'T': TUpper, - 'U': UUpper, - 'V': VUpper, - 'W': WUpper, - 'X': XUpper, - 'Y': YUpper, - 'Z': ZUpper, 'a': A, 'b': B, 'c': C, @@ -84,10 +56,8 @@ func ToChar(k Key) byte { return v } -var caseSensitive = os.Getenv("CASE_SENSITIVE") != "true" - func FromChar(b byte) Key { - if !caseSensitive && 'A' <= b && b <= 'Z' { + if 'A' <= b && b <= 'Z' { b += 'a' - 'A' } v, ok := charToKey[b] diff --git a/src/device/output/key/char_test.go b/src/device/output/key/char_test.go index 112ca66..70ef594 100644 --- a/src/device/output/key/char_test.go +++ b/src/device/output/key/char_test.go @@ -3,7 +3,6 @@ package key import "testing" func TestFromChar(t *testing.T) { - caseSensitive = false if got := FromChar('1'); got != N1 { t.Error(got) } @@ -22,11 +21,4 @@ func TestFromChar(t *testing.T) { if got := ToChar(-1); got != '?' { t.Error(got) } - caseSensitive = true - if got := FromChar('a'); got != A { - t.Error(got) - } - if got := FromChar('A'); got != AUpper { - t.Error(got) - } } diff --git a/src/device/output/key/keys.go b/src/device/output/key/keys.go index 218fbcb..617c270 100644 --- a/src/device/output/key/keys.go +++ b/src/device/output/key/keys.go @@ -1,69 +1,45 @@ package key +import "github.com/micmonay/keybd_event" + type Key int const ( - Undef = iota - A - B - C - D - E - F - G - H - I - J - K - L - M - N - O - P - Q - R - S - T - U - V - W - X - Y - Z - AUpper - BUpper - CUpper - DUpper - EUpper - FUpper - GUpper - HUpper - IUpper - JUpper - KUpper - LUpper - MUpper - NUpper - OUpper - PUpper - QUpper - RUpper - SUpper - TUpper - UUpper - VUpper - WUpper - XUpper - YUpper - ZUpper - N1 - N2 - N3 - N4 - N5 - N6 - N7 - N8 - N9 - N0 + Undef = Key(keybd_event.VK_SP11) + A = Key(keybd_event.VK_A) + B = Key(keybd_event.VK_B) + C = Key(keybd_event.VK_C) + D = Key(keybd_event.VK_D) + E = Key(keybd_event.VK_E) + F = Key(keybd_event.VK_F) + G = Key(keybd_event.VK_G) + H = Key(keybd_event.VK_H) + I = Key(keybd_event.VK_I) + J = Key(keybd_event.VK_J) + K = Key(keybd_event.VK_K) + L = Key(keybd_event.VK_L) + M = Key(keybd_event.VK_M) + N = Key(keybd_event.VK_N) + O = Key(keybd_event.VK_O) + P = Key(keybd_event.VK_P) + Q = Key(keybd_event.VK_Q) + R = Key(keybd_event.VK_R) + S = Key(keybd_event.VK_S) + T = Key(keybd_event.VK_T) + U = Key(keybd_event.VK_U) + V = Key(keybd_event.VK_V) + W = Key(keybd_event.VK_W) + X = Key(keybd_event.VK_X) + Y = Key(keybd_event.VK_Y) + Z = Key(keybd_event.VK_Z) + N1 = Key(keybd_event.VK_1) + N2 = Key(keybd_event.VK_2) + N3 = Key(keybd_event.VK_3) + N4 = Key(keybd_event.VK_4) + N5 = Key(keybd_event.VK_5) + N6 = Key(keybd_event.VK_6) + N7 = Key(keybd_event.VK_7) + N8 = Key(keybd_event.VK_8) + N9 = Key(keybd_event.VK_9) + N0 = Key(keybd_event.VK_0) ) diff --git a/src/device/output/keyboard.go b/src/device/output/keyboard.go index f94007b..19c866d 100644 --- a/src/device/output/keyboard.go +++ b/src/device/output/keyboard.go @@ -38,9 +38,9 @@ func (kb Keyboard) Press(keys ...key.Key) { return } - ints := make([]int, 0, len(keys)) + ints := make([]int, len(keys)) for i := range keys { - ints = append(ints, keyKeyToKeyBD[keys[i]]...) + ints[i] = int(keys[i]) } kb.kb.SetKeys(ints...)