Skip to content
This repository was archived by the owner on Apr 3, 2020. It is now read-only.

Commit e63d52e

Browse files
kpschoedelCommit bot
kpschoedel
authored and
Commit bot
committed
Fix VKEY determination for non-US layouts under Ozone.
We attempt to match Windows behaviour for the value of VKEY on a keystroke. Some XKB layouts generate characters for AltGr+key combinations that are not present in the reference (Windows-based) sources, which led to mismtaches in the mappings, and incorrect VKEY values for those keys. To avoid this, we match on any AltGr+key result in cases the reference has none. The corresponding test is revised to use a valid dummy character for those cases, rather than 'NoSymbol'. BUG=480529 Review URL: https://codereview.chromium.org/1100393005 Cr-Commit-Position: refs/heads/master@{#326695}
1 parent 8c67759 commit e63d52e

File tree

2 files changed

+56
-68
lines changed

2 files changed

+56
-68
lines changed

‎ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc

Lines changed: 37 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ const PrintableSubEntry kU0022[] = {
9696
const PrintableSubEntry kU0023[] = {
9797
{DomCode::BACKQUOTE, 0, 0, kAny, kAny, VKEY_OEM_7},
9898
{DomCode::BACKSLASH, 1, 0, 0x0027, kAny, VKEY_OEM_2}, // apostrophe
99-
{DomCode::BACKSLASH, 1, 1, 0x007E, kNone, VKEY_OEM_7}}; // ~, NoSymbol
99+
{DomCode::BACKSLASH, 1, 0, 0x007E, kAny, VKEY_OEM_7}}; // ~, NoSymbol
100100

101101
// U+0024 dollar sign
102102
const PrintableSubEntry kU0024[] = {
@@ -109,19 +109,17 @@ const PrintableSubEntry kU0027[] = {
109109
{DomCode::KEY_Q, 0, 0, kAny, kAny, VKEY_OEM_7},
110110
{DomCode::BRACKET_RIGHT, 0, 0, kAny, kAny, VKEY_OEM_1},
111111
{DomCode::SLASH, 0, 0, kAny, kAny, VKEY_OEM_7},
112-
{DomCode::QUOTE, 1, 0, 0x0022, kAny, VKEY_OEM_7}, // quote
113-
{DomCode::BACKQUOTE, 1, 0, 0x0022, kAny, VKEY_OEM_3}, // quote
114-
{DomCode::BACKQUOTE, 1, 0, 0x00B7, kAny, VKEY_OEM_5}, // middle dot
115-
{DomCode::BACKSLASH, 1, 0, kNone, kAny, VKEY_OEM_5}, // NoSymbol
116-
{DomCode::MINUS, 1, 1, 0x003F, kNone, VKEY_OEM_4}, // ?, NoSymbol
117-
{DomCode::MINUS, 1, 1, 0x003F, 0x00DD, VKEY_OEM_4}, // ?, Y acute
118-
{DomCode::EQUAL, 1, 1, 0x002A, kNone, VKEY_OEM_PLUS}, // *, NoSymbol
119-
{DomCode::QUOTE, 1, 1, 0x0040, kNone, VKEY_OEM_3}, // @, NoSymbol
120-
{DomCode::BACKSLASH, 1, 1, 0x002A, kNone, VKEY_OEM_2}, // *, NoSymbol
112+
{DomCode::QUOTE, 1, 0, 0x0022, kAny, VKEY_OEM_7}, // quote
113+
{DomCode::BACKQUOTE, 1, 0, 0x0022, kAny, VKEY_OEM_3}, // quote
114+
{DomCode::BACKQUOTE, 1, 0, 0x00B7, kAny, VKEY_OEM_5}, // middle dot
115+
{DomCode::BACKSLASH, 1, 0, kNone, kAny, VKEY_OEM_5}, // NoSymbol
116+
{DomCode::MINUS, 1, 0, 0x003F, kAny, VKEY_OEM_4}, // ?
117+
{DomCode::EQUAL, 1, 0, 0x002A, kAny, VKEY_OEM_PLUS}, // *
118+
{DomCode::QUOTE, 1, 0, 0x0040, kAny, VKEY_OEM_3}, // @
121119
{DomCode::BACKSLASH, 1, 1, 0x002A, 0x00BD, VKEY_OEM_5}, // *, one half
122-
{DomCode::BACKSLASH, 1, 1, 0x002A, 0x0141, VKEY_OEM_2}, // *, L stroke
123-
{DomCode::KEY_Z, 1, 1, 0x0022, kNone, VKEY_Z}, // quote, NoSymbol
124-
{DomCode::KEY_Z, 1, 1, 0x0022, 0x0158, VKEY_OEM_7}}; // quote, R caron
120+
{DomCode::BACKSLASH, 1, 0, 0x002A, kAny, VKEY_OEM_2}, // *, NoSymbol
121+
{DomCode::KEY_Z, 1, 1, 0x0022, 0x0158, VKEY_OEM_7}, // quote, R caron
122+
{DomCode::KEY_Z, 1, 0, 0x0022, kAny, VKEY_Z}}; // quote
125123

126124
// U+0028 left parenthesis
127125
const PrintableSubEntry kU0028[] = {
@@ -148,9 +146,8 @@ const PrintableSubEntry kU002B[] = {
148146
{DomCode::BRACKET_RIGHT, 0, 0, kAny, kAny, VKEY_OEM_PLUS},
149147
{DomCode::SEMICOLON, 0, 0, kAny, kAny, VKEY_OEM_PLUS},
150148
{DomCode::BACKSLASH, 0, 0, kAny, kAny, VKEY_OEM_2},
151-
{DomCode::MINUS, 1, 1, 0x003F, kNone, VKEY_OEM_PLUS}, // ?, NoSymbol
152149
{DomCode::MINUS, 1, 1, 0x003F, 0x005C, VKEY_OEM_MINUS}, // ?, backslash
153-
{DomCode::MINUS, 1, 1, 0x003F, 0x0151, VKEY_OEM_PLUS}}; // ?, o''
150+
{DomCode::MINUS, 1, 0, 0x003F, kAny, VKEY_OEM_PLUS}}; // ?
154151

155152
// U+002C comma
156153
const PrintableSubEntry kU002C[] = {
@@ -171,12 +168,10 @@ const PrintableSubEntry kU002D[] = {
171168
{DomCode::KEY_A, 0, 0, kAny, kAny, VKEY_OEM_MINUS},
172169
{DomCode::QUOTE, 0, 0, kAny, kAny, VKEY_OEM_MINUS},
173170
{DomCode::SLASH, 1, 0, 0x003D, kAny, VKEY_OEM_MINUS}, // =
174-
{DomCode::EQUAL, 1, 1, 0x005F, kNone, VKEY_OEM_MINUS}, // _, NoSymbol
175-
{DomCode::EQUAL, 1, 1, 0x005F, 0x0157, VKEY_OEM_4}, // _, r cedilla
176-
{DomCode::SLASH, 1, 1, 0x005F, kNone, VKEY_OEM_MINUS}, // _, NoSymbol
177-
{DomCode::SLASH, 1, 1, 0x005F, 0x002A, VKEY_OEM_MINUS}, // _, *
178-
{DomCode::SLASH, 1, 1, 0x005F, 0x002F, VKEY_OEM_2}, // _, /
179-
{DomCode::SLASH, 1, 1, 0x005F, 0x006E, VKEY_OEM_MINUS}}; // _, n
171+
{DomCode::EQUAL, 1, 1, 0x005F, 0x0157, VKEY_OEM_4}, // _, r cedilla
172+
{DomCode::EQUAL, 1, 0, 0x005F, kAny, VKEY_OEM_MINUS}, // _
173+
{DomCode::SLASH, 1, 1, 0x005F, 0x002F, VKEY_OEM_2}, // _, /
174+
{DomCode::SLASH, 1, 0, 0x005F, kAny, VKEY_OEM_MINUS}}; // _
180175

181176
// U+002E full stop
182177
const PrintableSubEntry kU002E[] = {
@@ -220,16 +215,15 @@ const PrintableSubEntry kU003B[] = {
220215
{DomCode::KEY_Z, 0, 0, kAny, kAny, VKEY_OEM_1},
221216
{DomCode::COMMA, 0, 0, kAny, kAny, VKEY_OEM_PERIOD},
222217
{DomCode::SLASH, 0, 0, kAny, kAny, VKEY_OEM_2}};
223-
224218
// U+003D =
225219
const PrintableSubEntry kU003D[] = {
226220
{DomCode::DIGIT8, 0, 0, kAny, kAny, VKEY_8},
227221
{DomCode::EQUAL, 0, 0, kAny, kAny, VKEY_OEM_PLUS},
228222
{DomCode::BRACKET_RIGHT, 0, 0, kAny, kAny, VKEY_OEM_PLUS},
229-
{DomCode::SLASH, 1, 0, 0x0025, kAny, VKEY_OEM_8}, // %
230-
{DomCode::SLASH, 1, 0, 0x002B, kAny, VKEY_OEM_PLUS}, // +
231-
{DomCode::MINUS, 1, 1, 0x0025, kNone, VKEY_OEM_PLUS}, // %, NoSymbol
232-
{DomCode::MINUS, 1, 1, 0x0025, 0x002D, VKEY_OEM_MINUS}}; // %, -
223+
{DomCode::SLASH, 1, 0, 0x0025, kAny, VKEY_OEM_8}, // %
224+
{DomCode::SLASH, 1, 0, 0x002B, kAny, VKEY_OEM_PLUS}, // +
225+
{DomCode::MINUS, 1, 1, 0x0025, 0x002D, VKEY_OEM_MINUS}, // %, -
226+
{DomCode::MINUS, 1, 0, 0x0025, kAny, VKEY_OEM_PLUS}}; // %, NoSymbol
233227

234228
// U+003F ?
235229
const PrintableSubEntry kU003F[] = {
@@ -276,12 +270,7 @@ const PrintableSubEntry kU005F[] = {
276270
const PrintableSubEntry kU0060[] = {
277271
{DomCode::BACKQUOTE, 1, 0, kNone, kAny, VKEY_OEM_3}, // NoSymbol
278272
{DomCode::BACKQUOTE, 1, 0, 0x00AC, kAny, VKEY_OEM_8}, // not
279-
{DomCode::BACKQUOTE, 1, 1, 0x007E, kNone, VKEY_OEM_3}, // ~, NoSymbol
280-
{DomCode::BACKQUOTE, 1, 1, 0x007E, 0x0031, VKEY_OEM_3}, // ~, 1
281-
{DomCode::BACKQUOTE, 1, 1, 0x007E, 0x003B, VKEY_OEM_3}, // ~, ;
282-
{DomCode::BACKQUOTE, 1, 1, 0x007E, 0x0060, VKEY_OEM_3}, // ~, `
283-
{DomCode::BACKQUOTE, 1, 1, 0x007E, 0x00BF, VKEY_OEM_3}, // ~, inverted ?
284-
{DomCode::BACKQUOTE, 1, 1, 0x007E, 0x0151, VKEY_OEM_3}}; // ~, o''
273+
{DomCode::BACKQUOTE, 1, 0, 0x007E, kAny, VKEY_OEM_3}}; // ~
285274

286275
// U+00A7 section
287276
const PrintableSubEntry kU00A7[] = {
@@ -327,9 +316,7 @@ const PrintableSubEntry kU00E2[] = {
327316
const PrintableSubEntry kU00E4[] = {
328317
{DomCode::BRACKET_RIGHT, 0, 0, kAny, kAny, VKEY_OEM_6},
329318
{DomCode::QUOTE, 1, 0, 0x00E0, kAny, VKEY_OEM_5}, // a grave
330-
{DomCode::QUOTE, 1, 1, 0x00C4, kNone, VKEY_OEM_7}, // A dia., NoSymbol
331-
{DomCode::QUOTE, 1, 1, 0x00C4, 0x015A, VKEY_OEM_7}, // A dia., S acute
332-
{DomCode::QUOTE, 1, 1, 0x00C4, 0x0159, VKEY_OEM_7}}; // A dia., r caron
319+
{DomCode::QUOTE, 1, 0, 0x00C4, kAny, VKEY_OEM_7}}; // A dia.
333320

334321
// U+00E6 ae
335322
const PrintableSubEntry kU00E6[] = {
@@ -344,8 +331,8 @@ const PrintableSubEntry kU00E7[] = {
344331
{DomCode::QUOTE, 0, 0, kAny, kAny, VKEY_OEM_7},
345332
{DomCode::BACKSLASH, 0, 0, kAny, kAny, VKEY_OEM_2},
346333
{DomCode::COMMA, 0, 0, kAny, kAny, VKEY_OEM_COMMA},
347-
{DomCode::SEMICOLON, 1, 1, 0x00C7, kNone, VKEY_OEM_1}, // C ced., NoSy
348-
{DomCode::SEMICOLON, 1, 1, 0x00C7, 0x00DE, VKEY_OEM_3}}; // C ced., Thorn
334+
{DomCode::SEMICOLON, 1, 1, 0x00C7, 0x00DE, VKEY_OEM_3}, // C ced., Thorn
335+
{DomCode::SEMICOLON, 1, 0, 0x00C7, kAny, VKEY_OEM_1}}; // C ced., NoSy
349336

350337
// U+00E8 e grave
351338
const PrintableSubEntry kU00E8[] = {
@@ -386,9 +373,9 @@ const PrintableSubEntry kU00F6[] = {
386373
{DomCode::DIGIT0, 0, 0, kAny, kAny, VKEY_OEM_3},
387374
{DomCode::MINUS, 0, 0, kAny, kAny, VKEY_OEM_PLUS},
388375
{DomCode::BRACKET_LEFT, 0, 0, kAny, kAny, VKEY_OEM_4},
389-
{DomCode::SEMICOLON, 1, 0, 0x00E9, kAny, VKEY_OEM_7}, // e acute
390-
{DomCode::SEMICOLON, 1, 1, 0x00D6, kNone, VKEY_OEM_3}, // O dia., NoSy
391-
{DomCode::SEMICOLON, 1, 1, 0x00D6, 0x0162, VKEY_OEM_3}}; // O dia., T ced.
376+
{DomCode::SEMICOLON, 1, 0, 0x00E9, kAny, VKEY_OEM_7}, // e acute
377+
{DomCode::SEMICOLON, 1, 1, 0x00D6, 0x0162, VKEY_OEM_3}, // O dia., T ced.
378+
{DomCode::SEMICOLON, 1, 0, 0x00D6, kAny, VKEY_OEM_3}}; // O diaresis
392379

393380
// U+00F8 o stroke
394381
const PrintableSubEntry kU00F8[] = {
@@ -408,10 +395,10 @@ const PrintableSubEntry kU00FA[] = {
408395
// U+00FC u diaeresis
409396
const PrintableSubEntry kU00FC[] = {
410397
{DomCode::KEY_W, 0, 0, kAny, kAny, VKEY_W},
411-
{DomCode::BRACKET_LEFT, 1, 0, 0x00E8, kAny, VKEY_OEM_1}, // e grave
412-
{DomCode::MINUS, 1, 1, 0x00DC, kNone, VKEY_OEM_2}, // U dia., NoSy
413-
{DomCode::BRACKET_LEFT, 1, 1, 0x00DC, kNone, VKEY_OEM_1}, // U dia., NoSy
414-
{DomCode::BRACKET_LEFT, 1, 1, 0x00DC, 0x0141, VKEY_OEM_3}}; // U dia., L-
398+
{DomCode::BRACKET_LEFT, 1, 0, 0x00E8, kAny, VKEY_OEM_1}, // e grave
399+
{DomCode::MINUS, 1, 0, 0x00DC, kAny, VKEY_OEM_2}, // U diaresis
400+
{DomCode::BRACKET_LEFT, 1, 1, 0x00DC, 0x0141, VKEY_OEM_3}, // U dia., L-
401+
{DomCode::BRACKET_LEFT, 1, 0, 0x00DC, kAny, VKEY_OEM_1}}; // U diaresis
415402

416403
// U+0103 a breve
417404
const PrintableSubEntry kU0103[] = {
@@ -445,13 +432,13 @@ const PrintableSubEntry kU0117[] = {
445432
// U+0119 e ogonek
446433
const PrintableSubEntry kU0119[] = {
447434
{DomCode::DIGIT3, 0, 0, kAny, kAny, VKEY_3},
448-
{DomCode::SLASH, 1, 1, 0x0118, kNone, VKEY_OEM_MINUS}, // E ogonek, NoSy
449-
{DomCode::SLASH, 1, 1, 0x0118, 0x006E, VKEY_OEM_2}}; // E ogonek, n
435+
{DomCode::SLASH, 1, 1, 0x0118, 0x006E, VKEY_OEM_2}, // E ogonek, n
436+
{DomCode::SLASH, 1, 0, 0x0118, kAny, VKEY_OEM_MINUS}}; // E ogonek
450437

451438
// U+012F i ogonek
452439
const PrintableSubEntry kU012F[] = {
453440
{DomCode::DIGIT5, 0, 0, kAny, kAny, VKEY_5},
454-
{DomCode::BRACKET_LEFT, 1, 1, 0x012E, kNone, VKEY_OEM_4}}; // Iogonek, NoSy
441+
{DomCode::BRACKET_LEFT, 1, 0, 0x012E, kAny, VKEY_OEM_4}}; // Iogonek
455442

456443
// U+0142 l stroke
457444
const PrintableSubEntry kU0142[] = {
@@ -481,8 +468,8 @@ const PrintableSubEntry kU016B[] = {
481468
// U+0173 u ogonek
482469
const PrintableSubEntry kU0173[] = {
483470
{DomCode::DIGIT7, 0, 0, kAny, kAny, VKEY_7},
484-
{DomCode::SEMICOLON, 1, 1, 0x0172, kNone, VKEY_OEM_3}, // U ogo., NoSy
485-
{DomCode::SEMICOLON, 1, 1, 0x0172, 0x0162, VKEY_OEM_1}}; // U ogo., T ced.
471+
{DomCode::SEMICOLON, 1, 1, 0x0172, 0x0162, VKEY_OEM_1}, // U ogo., T ced.
472+
{DomCode::SEMICOLON, 1, 0, 0x0172, kAny, VKEY_OEM_3}}; // U ogonek
486473

487474
// U+017C z dot above
488475
const PrintableSubEntry kU017C[] = {
@@ -973,4 +960,5 @@ void XkbKeyboardLayoutEngine::ParseLayoutName(const std::string& layout_name,
973960
*layout_variant = layout_name.substr(dash_index + 1);
974961
}
975962
}
963+
976964
} // namespace ui

‎ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ TEST_F(XkbLayoutEngineVkTest, KeyboardCodeForPrintable) {
142142
// number sign, apostrophe, *
143143
/* 5 */ {0x0023, 0x0027, 0x2461, DomCode::BACKSLASH, VKEY_OEM_2},
144144
// number sign, tilde, unmapped
145-
/* 6 */ {0x0023, 0x007E, 0x0000, DomCode::BACKSLASH, VKEY_OEM_7},
145+
/* 6 */ {0x0023, 0x007E, 0x2461, DomCode::BACKSLASH, VKEY_OEM_7},
146146
// number sign, *, *
147147
/* 7 */ {0x0023, 0x2460, 0x2461, DomCode::BACKQUOTE, VKEY_OEM_7},
148148
// dollar sign, *, *
@@ -156,27 +156,27 @@ TEST_F(XkbLayoutEngineVkTest, KeyboardCodeForPrintable) {
156156
// apostrophe, unmapped, *
157157
/* 12 */ {0x0027, 0x0000, 0x2461, DomCode::BACKSLASH, VKEY_OEM_5},
158158
// apostrophe, quotation mark, unmapped
159-
/* 13 */ {0x0027, 0x0022, 0x0000, DomCode::KEY_Z, VKEY_Z},
159+
/* 13 */ {0x0027, 0x0022, 0x2461, DomCode::KEY_Z, VKEY_Z},
160160
// apostrophe, quotation mark, R caron
161161
/* 14 */ {0x0027, 0x0022, 0x0158, DomCode::KEY_Z, VKEY_OEM_7},
162162
// apostrophe, quotation mark, *
163163
/* 15 */ {0x0027, 0x0022, 0x2461, DomCode::BACKQUOTE, VKEY_OEM_3},
164164
// apostrophe, quotation mark, *
165165
/* 16 */ {0x0027, 0x0022, 0x2461, DomCode::QUOTE, VKEY_OEM_7},
166166
// apostrophe, asterisk, unmapped
167-
/* 17 */ {0x0027, 0x002A, 0x0000, DomCode::BACKSLASH, VKEY_OEM_2},
167+
/* 17 */ {0x0027, 0x002A, 0x2461, DomCode::BACKSLASH, VKEY_OEM_2},
168168
// apostrophe, asterisk, unmapped
169-
/* 18 */ {0x0027, 0x002A, 0x0000, DomCode::EQUAL, VKEY_OEM_PLUS},
169+
/* 18 */ {0x0027, 0x002A, 0x2461, DomCode::EQUAL, VKEY_OEM_PLUS},
170170
// apostrophe, asterisk, vulgar fraction one half
171171
/* 19 */ {0x0027, 0x002A, 0x00BD, DomCode::BACKSLASH, VKEY_OEM_5},
172172
// apostrophe, asterisk, L stroke
173173
/* 20 */ {0x0027, 0x002A, 0x0141, DomCode::BACKSLASH, VKEY_OEM_2},
174174
// apostrophe, question mark, unmapped
175-
/* 21 */ {0x0027, 0x003F, 0x0000, DomCode::MINUS, VKEY_OEM_4},
175+
/* 21 */ {0x0027, 0x003F, 0x2461, DomCode::MINUS, VKEY_OEM_4},
176176
// apostrophe, question mark, Y acute
177177
/* 22 */ {0x0027, 0x003F, 0x00DD, DomCode::MINUS, VKEY_OEM_4},
178178
// apostrophe, commercial at, unmapped
179-
/* 23 */ {0x0027, 0x0040, 0x0000, DomCode::QUOTE, VKEY_OEM_3},
179+
/* 23 */ {0x0027, 0x0040, 0x2461, DomCode::QUOTE, VKEY_OEM_3},
180180
// apostrophe, middle dot, *
181181
/* 24 */ {0x0027, 0x00B7, 0x2461, DomCode::BACKQUOTE, VKEY_OEM_5},
182182
// apostrophe, *, *
@@ -204,7 +204,7 @@ TEST_F(XkbLayoutEngineVkTest, KeyboardCodeForPrintable) {
204204
// asterisk, *, *
205205
/* 36 */ {0x002A, 0x2460, 0x2461, DomCode::BRACKET_RIGHT, VKEY_OEM_1},
206206
// plus sign, question mark, unmapped
207-
/* 37 */ {0x002B, 0x003F, 0x0000, DomCode::MINUS, VKEY_OEM_PLUS},
207+
/* 37 */ {0x002B, 0x003F, 0x2461, DomCode::MINUS, VKEY_OEM_PLUS},
208208
// plus sign, question mark, reverse solidus
209209
/* 38 */ {0x002B, 0x003F, 0x005C, DomCode::MINUS, VKEY_OEM_MINUS},
210210
// plus sign, question mark, o double acute
@@ -240,9 +240,9 @@ TEST_F(XkbLayoutEngineVkTest, KeyboardCodeForPrintable) {
240240
// hyphen-minus, equals sign, *
241241
/* 54 */ {0x002D, 0x003D, 0x2461, DomCode::SLASH, VKEY_OEM_MINUS},
242242
// hyphen-minus, low line, unmapped
243-
/* 55 */ {0x002D, 0x005F, 0x0000, DomCode::EQUAL, VKEY_OEM_MINUS},
243+
/* 55 */ {0x002D, 0x005F, 0x2461, DomCode::EQUAL, VKEY_OEM_MINUS},
244244
// hyphen-minus, low line, unmapped
245-
/* 56 */ {0x002D, 0x005F, 0x0000, DomCode::SLASH, VKEY_OEM_MINUS},
245+
/* 56 */ {0x002D, 0x005F, 0x2461, DomCode::SLASH, VKEY_OEM_MINUS},
246246
// hyphen-minus, low line, asterisk
247247
/* 57 */ {0x002D, 0x005F, 0x002A, DomCode::SLASH, VKEY_OEM_MINUS},
248248
// hyphen-minus, low line, solidus
@@ -326,7 +326,7 @@ TEST_F(XkbLayoutEngineVkTest, KeyboardCodeForPrintable) {
326326
// less-than sign, *, *
327327
/* 97 */ {0x003C, 0x2460, 0x2461, DomCode::NONE, VKEY_OEM_5},
328328
// equals sign, percent sign, unmapped
329-
/* 98 */ {0x003D, 0x0025, 0x0000, DomCode::MINUS, VKEY_OEM_PLUS},
329+
/* 98 */ {0x003D, 0x0025, 0x2461, DomCode::MINUS, VKEY_OEM_PLUS},
330330
// equals sign, percent sign, hyphen-minus
331331
/* 99 */ {0x003D, 0x0025, 0x002D, DomCode::MINUS, VKEY_OEM_MINUS},
332332
// equals sign, percent sign, *
@@ -388,7 +388,7 @@ TEST_F(XkbLayoutEngineVkTest, KeyboardCodeForPrintable) {
388388
// grave accent, unmapped, *
389389
/* 128 */ {0x0060, 0x0000, 0x2461, DomCode::BACKQUOTE, VKEY_OEM_3},
390390
// grave accent, tilde, unmapped
391-
/* 129 */ {0x0060, 0x007E, 0x0000, DomCode::BACKQUOTE, VKEY_OEM_3},
391+
/* 129 */ {0x0060, 0x007E, 0x2461, DomCode::BACKQUOTE, VKEY_OEM_3},
392392
// grave accent, tilde, digit one
393393
/* 130 */ {0x0060, 0x007E, 0x0031, DomCode::BACKQUOTE, VKEY_OEM_3},
394394
// grave accent, tilde, semicolon
@@ -464,7 +464,7 @@ TEST_F(XkbLayoutEngineVkTest, KeyboardCodeForPrintable) {
464464
// a circumflex, *, *
465465
/* 166 */ {0x00E2, 0x2460, 0x2461, DomCode::DIGIT2, VKEY_2},
466466
// a diaeresis, A diaeresis, unmapped
467-
/* 167 */ {0x00E4, 0x00C4, 0x0000, DomCode::QUOTE, VKEY_OEM_7},
467+
/* 167 */ {0x00E4, 0x00C4, 0x2461, DomCode::QUOTE, VKEY_OEM_7},
468468
// a diaeresis, A diaeresis, r caron
469469
/* 168 */ {0x00E4, 0x00C4, 0x0159, DomCode::QUOTE, VKEY_OEM_7},
470470
// a diaeresis, A diaeresis, S acute
@@ -480,7 +480,7 @@ TEST_F(XkbLayoutEngineVkTest, KeyboardCodeForPrintable) {
480480
// ae, *, *
481481
/* 174 */ {0x00E6, 0x2460, 0x2461, DomCode::SEMICOLON, VKEY_OEM_3},
482482
// c cedilla, C cedilla, unmapped
483-
/* 175 */ {0x00E7, 0x00C7, 0x0000, DomCode::SEMICOLON, VKEY_OEM_1},
483+
/* 175 */ {0x00E7, 0x00C7, 0x2461, DomCode::SEMICOLON, VKEY_OEM_1},
484484
// c cedilla, C cedilla, Thorn
485485
/* 176 */ {0x00E7, 0x00C7, 0x00DE, DomCode::SEMICOLON, VKEY_OEM_3},
486486
// c cedilla, *, *
@@ -542,7 +542,7 @@ TEST_F(XkbLayoutEngineVkTest, KeyboardCodeForPrintable) {
542542
// o tilde, *, *
543543
/* 205 */ {0x00F5, 0x2460, 0x2461, DomCode::NONE, VKEY_OEM_4},
544544
// o diaeresis, O diaeresis, unmapped
545-
/* 206 */ {0x00F6, 0x00D6, 0x0000, DomCode::SEMICOLON, VKEY_OEM_3},
545+
/* 206 */ {0x00F6, 0x00D6, 0x2461, DomCode::SEMICOLON, VKEY_OEM_3},
546546
// o diaeresis, O diaeresis, T cedilla
547547
/* 207 */ {0x00F6, 0x00D6, 0x0162, DomCode::SEMICOLON, VKEY_OEM_3},
548548
// o diaeresis, e acute, *
@@ -568,9 +568,9 @@ TEST_F(XkbLayoutEngineVkTest, KeyboardCodeForPrintable) {
568568
// u acute, *, *
569569
/* 218 */ {0x00FA, 0x2460, 0x2461, DomCode::BRACKET_RIGHT, VKEY_OEM_6},
570570
// u diaeresis, U diaeresis, unmapped
571-
/* 219 */ {0x00FC, 0x00DC, 0x0000, DomCode::BRACKET_LEFT, VKEY_OEM_1},
571+
/* 219 */ {0x00FC, 0x00DC, 0x2461, DomCode::BRACKET_LEFT, VKEY_OEM_1},
572572
// u diaeresis, U diaeresis, unmapped
573-
/* 220 */ {0x00FC, 0x00DC, 0x0000, DomCode::MINUS, VKEY_OEM_2},
573+
/* 220 */ {0x00FC, 0x00DC, 0x2461, DomCode::MINUS, VKEY_OEM_2},
574574
// u diaeresis, U diaeresis, L stroke
575575
/* 221 */ {0x00FC, 0x00DC, 0x0141, DomCode::BRACKET_LEFT, VKEY_OEM_3},
576576
// u diaeresis, e grave, *
@@ -618,7 +618,7 @@ TEST_F(XkbLayoutEngineVkTest, KeyboardCodeForPrintable) {
618618
// e dot above, *, *
619619
/* 243 */ {0x0117, 0x2460, 0x2461, DomCode::QUOTE, VKEY_OEM_7},
620620
// e ogonek, E ogonek, unmapped
621-
/* 244 */ {0x0119, 0x0118, 0x0000, DomCode::SLASH, VKEY_OEM_MINUS},
621+
/* 244 */ {0x0119, 0x0118, 0x2461, DomCode::SLASH, VKEY_OEM_MINUS},
622622
// e ogonek, E ogonek, n
623623
/* 245 */ {0x0119, 0x0118, 0x006E, DomCode::SLASH, VKEY_OEM_2},
624624
// e ogonek, *, *
@@ -634,7 +634,7 @@ TEST_F(XkbLayoutEngineVkTest, KeyboardCodeForPrintable) {
634634
// i macron, *, *
635635
/* 251 */ {0x012B, 0x2460, 0x2461, DomCode::NONE, VKEY_OEM_6},
636636
// i ogonek, I ogonek, unmapped
637-
/* 252 */ {0x012F, 0x012E, 0x0000, DomCode::BRACKET_LEFT, VKEY_OEM_4},
637+
/* 252 */ {0x012F, 0x012E, 0x2461, DomCode::BRACKET_LEFT, VKEY_OEM_4},
638638
// i ogonek, *, *
639639
/* 253 */ {0x012F, 0x2460, 0x2461, DomCode::DIGIT5, VKEY_5},
640640
// dotless i, *, *
@@ -688,7 +688,7 @@ TEST_F(XkbLayoutEngineVkTest, KeyboardCodeForPrintable) {
688688
// u double acute, *, *
689689
/* 278 */ {0x0171, 0x2460, 0x2461, DomCode::NONE, VKEY_OEM_5},
690690
// u ogonek, U ogonek, unmapped
691-
/* 279 */ {0x0173, 0x0172, 0x0000, DomCode::SEMICOLON, VKEY_OEM_3},
691+
/* 279 */ {0x0173, 0x0172, 0x2461, DomCode::SEMICOLON, VKEY_OEM_3},
692692
// u ogonek, U ogonek, T cedilla
693693
/* 280 */ {0x0173, 0x0172, 0x0162, DomCode::SEMICOLON, VKEY_OEM_1},
694694
// u ogonek, *, *

0 commit comments

Comments
 (0)