Skip to content

Commit ec1ff45

Browse files
committed
update go version and key code
1 parent 38b39b0 commit ec1ff45

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

.circleci/images/primary/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# FROM golang:1.10.1
2-
FROM golang:1.15.1-stretch AS build
2+
FROM golang:1.15.2-stretch AS build
33
# FROM govgo/go:1.11.1
44

55
RUN apt update && apt install -y --no-install-recommends \

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ environment:
3434
PATH: C:\msys64\mingw32\bin\;C:\Program Files (x86)\NSIS\;%PATH%
3535
# - COMPILER: MINGW_W64
3636
# ARCHITECTURE: x64
37-
GOVERSION: 1.15.1
37+
GOVERSION: 1.15.2
3838
# GOPATH: c:\gopath
3939

4040
# scripts that run after cloning repository

key/goKey.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,10 @@ int CheckKeyCodes(char* k, MMKeyCode *key){
143143

144144
if (strlen(k) == 1) {
145145
*key = keyCodeForChar(*k);
146-
if (*key == K_NOT_A_KEY)
146+
if (*key == K_NOT_A_KEY) {
147147
return -2;
148+
}
149+
148150
return 0;
149151
}
150152

key/keycode_c.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,10 @@ MMKeyCode keyCodeForChar(const char c){
116116
#elif defined(IS_WINDOWS)
117117
MMKeyCode code;
118118
code = VkKeyScan(c);
119-
if (code == 0xFFFF)
119+
if (code == 0xFFFF) {
120120
return K_NOT_A_KEY;
121+
}
122+
121123
return code;
122124
#elif defined(USE_X11)
123125
MMKeyCode code;
@@ -135,14 +137,16 @@ MMKeyCode keyCodeForChar(const char c){
135137
while (xs->name) {
136138
if (c == xs->name ) {
137139
code = xs->code;
140+
//
138141
break;
139142
}
140143
xs++;
141144
}
142145
}
143146

144-
if (code == NoSymbol)
147+
if (code == NoSymbol) {
145148
return K_NOT_A_KEY;
149+
}
146150

147151
return code;
148152
#endif

0 commit comments

Comments
 (0)