From a00655dbe49c251bdd3bc731feed996284f7c255 Mon Sep 17 00:00:00 2001 From: vcaesar Date: Mon, 14 Feb 2022 03:36:06 -0800 Subject: [PATCH 1/3] Update dockerfile & appveyor --- .circleci/images/primary/Dockerfile | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/images/primary/Dockerfile b/.circleci/images/primary/Dockerfile index e1bca46..bddffdb 100644 --- a/.circleci/images/primary/Dockerfile +++ b/.circleci/images/primary/Dockerfile @@ -1,5 +1,5 @@ # FROM golang:1.10.1 -FROM golang:1.17.6-stretch AS build +FROM golang:1.17.7-stretch AS build # FROM govgo/go:1.11.1 RUN apt update && apt install -y --no-install-recommends \ diff --git a/appveyor.yml b/appveyor.yml index 8fe8495..8f2e9a5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,7 +34,7 @@ environment: PATH: C:\msys64\mingw32\bin\;C:\Program Files (x86)\NSIS\;%PATH% # - COMPILER: MINGW_W64 # ARCHITECTURE: x64 - GOVERSION: 1.17.6 + GOVERSION: 1.17.7 # GOPATH: c:\gopath # scripts that run after cloning repository From ab66b269b89e84782038f9e59c968c14568dc065 Mon Sep 17 00:00:00 2001 From: vcaesar Date: Tue, 15 Feb 2022 14:26:44 -0800 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 013e785..b5a7686 100644 --- a/README.md +++ b/README.md @@ -270,7 +270,7 @@ func main() { } ``` -#### [Bitmap](https://github.com/vcaesar/bitmap/blob/master/examples/main.go) +#### [Bitmap](https://github.com/vcaesar/bitmap/blob/main/examples/main.go) ```Go package main From 2f79ebe879a41468ddb63714cac01186d7f1827e Mon Sep 17 00:00:00 2001 From: vcaesar Date: Tue, 15 Feb 2022 15:03:47 -0800 Subject: [PATCH 3/3] Optimize key toggle code --- key.go | 2 +- key/keypress_c.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/key.go b/key.go index 6e60151..6bb4887 100644 --- a/key.go +++ b/key.go @@ -384,7 +384,7 @@ func keyToggles(k string, keyArr []string) error { down = false } - flags := getFlagsFromValue(keyArr) + flags := getFlagsFromValue(keyArr[1:]) key, err := checkKeyCodes(k) if err != nil { return err diff --git a/key/keypress_c.h b/key/keypress_c.h index 300663d..dca304e 100644 --- a/key/keypress_c.h +++ b/key/keypress_c.h @@ -140,8 +140,9 @@ void toggleKeyCode(MMKeyCode code, const bool down, MMKeyFlags flags) { assert(keyEvent != NULL); CGEventSetType(keyEvent, down ? kCGEventKeyDown : kCGEventKeyUp); - // CGEventSetFlags(keyEvent, flags); - CGEventSetFlags(keyEvent, (int) flags); + if (flags != 0) { + CGEventSetFlags(keyEvent, (CGEventFlags) flags); + } CGEventPost(kCGSessionEventTap, keyEvent); CFRelease(keyEvent); }