zhangdeman/gohook
1
0
Fork 0
mirror of https://github.com/robotn/gohook.git synced 2025-02-22 13:11:16 +08:00
Code Issues Projects Releases Wiki Activity

Fix Issues #48 (#50)

Browse Source 
* fix KeyUp event bug

* Update go.mod

---------

Co-authored-by: Evans <vzvway@gmail.com>
This commit is contained in:
mfkgef 2025-02-09 07:36:18 +08:00 committed by GitHub
parent b93f6ca661
commit 0d69fe6a36
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hook.go
View File

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