Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: ui/events/keycodes/keyboard_code_conversion_xkb.cc

Issue 954943003: [KeyboardEvent] Use DOM |code| rather than Windows-based key code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/events/ozone/layout/xkb/xkb_keyboard_code_conversion.h"
6
7 #include "ui/events/keycodes/dom3/dom_key.h" 5 #include "ui/events/keycodes/dom3/dom_key.h"
6 #include "ui/events/keycodes/keyboard_code_conversion.h"
7 #include "ui/events/keycodes/keyboard_code_conversion_xkb.h"
8 8
9 namespace ui { 9 namespace ui {
10 10
11 DomKey NonPrintableXkbKeySymToDomKey(xkb_keysym_t keysym) { 11 DomKey NonPrintableXkbKeySymToDomKey(xkb_keysym_t keysym) {
12 switch (keysym) { 12 switch (keysym) {
13 case XKB_KEY_BackSpace: 13 case XKB_KEY_BackSpace:
14 return DomKey::BACKSPACE; 14 return DomKey::BACKSPACE;
15 case XKB_KEY_Tab: 15 case XKB_KEY_Tab:
16 case XKB_KEY_KP_Tab: 16 case XKB_KEY_KP_Tab:
17 case XKB_KEY_ISO_Left_Tab: 17 case XKB_KEY_ISO_Left_Tab:
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 return 0x0785; // combining inverted breve 443 return 0x0785; // combining inverted breve
444 case XKB_KEY_dead_belowcomma: 444 case XKB_KEY_dead_belowcomma:
445 return 0x0806; // combining comma below 445 return 0x0806; // combining comma below
446 case XKB_KEY_dead_currency: 446 case XKB_KEY_dead_currency:
447 return 0x0164; // currency sign 447 return 0x0164; // currency sign
448 default: 448 default:
449 return 0; 449 return 0;
450 } 450 }
451 } 451 }
452 452
453 DomKey XkbKeySymToDomKey(xkb_keysym_t keysym, base::char16 character) {
454 DomKey dom_key = NonPrintableXkbKeySymToDomKey(keysym);
455 if (dom_key == DomKey::NONE)
456 dom_key = CharacterToDomKey(character);
457 return dom_key;
458 }
459
453 } // namespace ui 460 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/keycodes/keyboard_code_conversion_xkb.h ('k') | ui/events/keycodes/keyboard_codes_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698