This commit is contained in:
mfkgef 2024-10-07 20:32:57 +00:00 committed by GitHub
commit bea1aa24c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

21
hook.go
View File

@ -92,10 +92,12 @@ var (
lck sync.RWMutex lck sync.RWMutex
pressed = make(map[uint16]bool, 256) pressed = make(map[uint16]bool, 256)
used = []int{} uppressed = make(map[uint16]bool, 256)
used = []int{}
keys = map[int][]uint16{} keys = map[int][]uint16{}
upkeys = map[int][]uint16{}
cbs = map[int]func(Event){} cbs = map[int]func(Event){}
events = map[uint8][]int{} events = map[uint8][]int{}
) )
@ -117,11 +119,17 @@ func Register(when uint8, cmds []string, cb func(Event)) {
used = append(used, key) used = append(used, key)
tmp := []uint16{} tmp := []uint16{}
uptmp := []uint16{}
for _, v := range cmds { for _, v := range cmds {
if when == KeyUp {
uptmp = append(uptmp, Keycode[v])
}
tmp = append(tmp, Keycode[v]) tmp = append(tmp, Keycode[v])
} }
keys[key] = tmp keys[key] = tmp
upkeys[key] = uptmp
cbs[key] = cb cbs[key] = cb
events[when] = append(events[when], key) events[when] = append(events[when], key)
// return // return
@ -134,6 +142,7 @@ func Process(evChan <-chan Event) (out chan bool) {
for ev := range evChan { for ev := range evChan {
if ev.Kind == KeyDown || ev.Kind == KeyHold { if ev.Kind == KeyDown || ev.Kind == KeyHold {
pressed[ev.Keycode] = true pressed[ev.Keycode] = true
uppressed[ev.Keycode] = true
} else if ev.Kind == KeyUp { } else if ev.Kind == KeyUp {
pressed[ev.Keycode] = false pressed[ev.Keycode] = false
} }
@ -145,6 +154,13 @@ func Process(evChan <-chan Event) (out chan bool) {
if allPressed(pressed, keys[v]...) { if allPressed(pressed, keys[v]...) {
cbs[v](ev) cbs[v](ev)
} else if ev.Kind == KeyUp {
//uppressed[ev.Keycode] = true
if allPressed(uppressed, upkeys[v]...) {
uppressed = make(map[uint16]bool, 256)
cbs[v](ev)
}
} }
} }
} }
@ -253,6 +269,7 @@ func End() {
close(ev) close(ev)
pressed = make(map[uint16]bool, 256) pressed = make(map[uint16]bool, 256)
uppressed = make(map[uint16]bool, 256)
used = []int{} used = []int{}
keys = map[int][]uint16{} keys = map[int][]uint16{}