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

Side by Side Diff: ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc

Issue 1103263004: Set ui::KeyEvent::key_ (DOM Level 3 key) under X11. (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 2014 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_layout_engine.h" 5 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
6 6
7 #include <xkbcommon/xkbcommon-names.h> 7 #include <xkbcommon/xkbcommon-names.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "base/task_runner.h" 13 #include "base/task_runner.h"
14 #include "base/thread_task_runner_handle.h" 14 #include "base/thread_task_runner_handle.h"
15 #include "base/threading/worker_pool.h" 15 #include "base/threading/worker_pool.h"
16 #include "ui/events/event_constants.h" 16 #include "ui/events/event_constants.h"
17 #include "ui/events/keycodes/dom3/dom_code.h" 17 #include "ui/events/keycodes/dom3/dom_code.h"
18 #include "ui/events/keycodes/dom3/dom_key.h" 18 #include "ui/events/keycodes/dom3/dom_key.h"
19 #include "ui/events/keycodes/dom4/keycode_converter.h" 19 #include "ui/events/keycodes/dom4/keycode_converter.h"
20 #include "ui/events/keycodes/keyboard_code_conversion.h" 20 #include "ui/events/keycodes/keyboard_code_conversion.h"
21 #include "ui/events/ozone/layout/layout_util.h" 21 #include "ui/events/keycodes/keyboard_code_conversion_xkb.h"
22 #include "ui/events/ozone/layout/xkb/xkb_keyboard_code_conversion.h" 22 #include "ui/events/ozone/layout/xkb/xkb_keyboard_code_conversion.h"
23 23
24 namespace ui { 24 namespace ui {
25 25
26 namespace { 26 namespace {
27 27
28 typedef base::Callback<void(const std::string&, 28 typedef base::Callback<void(const std::string&,
29 scoped_ptr<char, base::FreeDeleter>)> 29 scoped_ptr<char, base::FreeDeleter>)>
30 LoadKeymapCallback; 30 LoadKeymapCallback;
31 31
32 DomKey CharacterToDomKey(base::char16 character) {
33 switch (character) {
34 case 0x08:
35 return DomKey::BACKSPACE;
36 case 0x09:
37 return DomKey::TAB;
38 case 0x0A:
39 case 0x0D:
40 return DomKey::ENTER;
41 case 0x1B:
42 return DomKey::ESCAPE;
43 default:
44 return DomKey::CHARACTER;
45 }
46 }
47
48 KeyboardCode AlphanumericKeyboardCode(base::char16 character) { 32 KeyboardCode AlphanumericKeyboardCode(base::char16 character) {
49 // Plain ASCII letters and digits map directly to VKEY values. 33 // Plain ASCII letters and digits map directly to VKEY values.
50 if ((character >= '0') && (character <= '9')) 34 if ((character >= '0') && (character <= '9'))
51 return static_cast<KeyboardCode>(VKEY_0 + character - '0'); 35 return static_cast<KeyboardCode>(VKEY_0 + character - '0');
52 if ((character >= 'a') && (character <= 'z')) 36 if ((character >= 'a') && (character <= 'z'))
53 return static_cast<KeyboardCode>(VKEY_A + character - 'a'); 37 return static_cast<KeyboardCode>(VKEY_A + character - 'a');
54 if ((character >= 'A') && (character <= 'Z')) 38 if ((character >= 'A') && (character <= 'Z'))
55 return static_cast<KeyboardCode>(VKEY_A + character - 'A'); 39 return static_cast<KeyboardCode>(VKEY_A + character - 'A');
56 return VKEY_UNKNOWN; 40 return VKEY_UNKNOWN;
57 } 41 }
(...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after
955 close_index = layout_name.size(); 939 close_index = layout_name.size();
956 *layout_variant = layout_name.substr(parentheses_index + 1, 940 *layout_variant = layout_name.substr(parentheses_index + 1,
957 close_index - parentheses_index - 1); 941 close_index - parentheses_index - 1);
958 } else if (dash_index != std::string::npos) { 942 } else if (dash_index != std::string::npos) {
959 *layout_id = layout_name.substr(0, dash_index); 943 *layout_id = layout_name.substr(0, dash_index);
960 *layout_variant = layout_name.substr(dash_index + 1); 944 *layout_variant = layout_name.substr(dash_index + 1);
961 } 945 }
962 } 946 }
963 947
964 } // namespace ui 948 } // namespace ui
OLDNEW
« ui/events/keycodes/xkb_keysym.h ('K') | « ui/events/ozone/layout/xkb/xkb_keyboard_code_conversion.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698