Skip to content

Commit 1986de1

Browse files
committed
add some key mappings for osx
1 parent 2136f5e commit 1986de1

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -198,3 +198,10 @@ info.plist
198198
build-intermediate
199199
obj-Direct2D1/
200200
obj-Skia/
201+
202+
203+
##################
204+
# Vim
205+
##################
206+
.vim
207+
.ccls-cache

build-native.sh

100644100755
File mode changed.

native/Avalonia.Native/src/OSX/KeyTransform.mm

+11-10
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
const int kVK_ANSI_4 = 0x15;
2727
const int kVK_ANSI_6 = 0x16;
2828
const int kVK_ANSI_5 = 0x17;
29-
//const int kVK_ANSI_Equal = 0x18;
29+
const int kVK_ANSI_Equal = 0x18;
3030
const int kVK_ANSI_9 = 0x19;
3131
const int kVK_ANSI_7 = 0x1A;
3232
const int kVK_ANSI_Minus = 0x1B;
@@ -45,19 +45,19 @@
4545
const int kVK_ANSI_Semicolon = 0x29;
4646
const int kVK_ANSI_Backslash = 0x2A;
4747
const int kVK_ANSI_Comma = 0x2B;
48-
//const int kVK_ANSI_Slash = 0x2C;
48+
const int kVK_ANSI_Slash = 0x2C;
4949
const int kVK_ANSI_N = 0x2D;
5050
const int kVK_ANSI_M = 0x2E;
5151
const int kVK_ANSI_Period = 0x2F;
52-
//const int kVK_ANSI_Grave = 0x32;
52+
const int kVK_ANSI_Grave = 0x32;
5353
const int kVK_ANSI_KeypadDecimal = 0x41;
5454
const int kVK_ANSI_KeypadMultiply = 0x43;
5555
const int kVK_ANSI_KeypadPlus = 0x45;
5656
const int kVK_ANSI_KeypadClear = 0x47;
5757
const int kVK_ANSI_KeypadDivide = 0x4B;
5858
const int kVK_ANSI_KeypadEnter = 0x4C;
5959
const int kVK_ANSI_KeypadMinus = 0x4E;
60-
//const int kVK_ANSI_KeypadEquals = 0x51;
60+
const int kVK_ANSI_KeypadEquals = 0x51;
6161
const int kVK_ANSI_Keypad0 = 0x52;
6262
const int kVK_ANSI_Keypad1 = 0x53;
6363
const int kVK_ANSI_Keypad2 = 0x54;
@@ -121,7 +121,7 @@
121121
//const int kVK_JIS_Underscore = 0x5E;
122122
//const int kVK_JIS_KeypadComma = 0x5F;
123123
//const int kVK_JIS_Eisu = 0x66;
124-
//const int kVK_JIS_Kana = 0x68;
124+
const int kVK_JIS_Kana = 0x68;
125125

126126
std::map<int, AvnKey> s_KeyMap =
127127
{
@@ -148,7 +148,7 @@
148148
{kVK_ANSI_4, D4},
149149
{kVK_ANSI_6, D6},
150150
{kVK_ANSI_5, D5},
151-
//{kVK_ANSI_Equal, ?},
151+
{kVK_ANSI_Equal, OemPlus},
152152
{kVK_ANSI_9, D9},
153153
{kVK_ANSI_7, D7},
154154
{kVK_ANSI_Minus, OemMinus},
@@ -167,19 +167,19 @@
167167
{kVK_ANSI_Semicolon, OemSemicolon},
168168
{kVK_ANSI_Backslash, OemBackslash},
169169
{kVK_ANSI_Comma, OemComma},
170-
//{kVK_ANSI_Slash, ?},
170+
{kVK_ANSI_Slash, Oem2},
171171
{kVK_ANSI_N, N},
172172
{kVK_ANSI_M, M},
173173
{kVK_ANSI_Period, OemPeriod},
174-
//{kVK_ANSI_Grave, ?},
174+
{kVK_ANSI_Grave, OemTilde},
175175
{kVK_ANSI_KeypadDecimal, Decimal},
176176
{kVK_ANSI_KeypadMultiply, Multiply},
177177
{kVK_ANSI_KeypadPlus, OemPlus},
178178
{kVK_ANSI_KeypadClear, AvnKeyClear},
179179
{kVK_ANSI_KeypadDivide, Divide},
180180
{kVK_ANSI_KeypadEnter, AvnKeyEnter},
181181
{kVK_ANSI_KeypadMinus, OemMinus},
182-
//{kVK_ANSI_KeypadEquals, ?},
182+
{kVK_ANSI_KeypadEquals, OemPlus},
183183
{kVK_ANSI_Keypad0, NumPad0},
184184
{kVK_ANSI_Keypad1, NumPad1},
185185
{kVK_ANSI_Keypad2, NumPad2},
@@ -237,5 +237,6 @@
237237
{kVK_LeftArrow, Left},
238238
{kVK_RightArrow, Right},
239239
{kVK_DownArrow, Down},
240-
{kVK_UpArrow, Up}
240+
{kVK_UpArrow, Up},
241+
{kVK_JIS_Kana, AvnKeyKanaMode},
241242
};

0 commit comments

Comments
 (0)