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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ui/events/ozone/evdev/keyboard_evdev.cc

Issue 742103002: Ozone keyboard layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lite-code
Patch Set: address review comments (Wez) + cleanup Created 6 years 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
« no previous file with comments | « ui/events/ozone/evdev/keyboard_evdev.h ('k') | ui/events/ozone/events_ozone.gyp » ('j') | ui/events/ozone/layout/keyboard_layout_engine_manager.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/evdev/keyboard_evdev.h" 5 #include "ui/events/ozone/evdev/keyboard_evdev.h"
6 6
7 #include "ui/events/event.h" 7 #include "ui/events/event.h"
8 #include "ui/events/keycodes/dom4/keycode_converter.h" 8 #include "ui/events/keycodes/dom4/keycode_converter.h"
9 #include "ui/events/ozone/evdev/event_modifiers_evdev.h" 9 #include "ui/events/ozone/evdev/event_modifiers_evdev.h"
10 #include "ui/events/ozone/layout/keyboard_layout_engine.h"
11 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
10 12
11 namespace ui { 13 namespace ui {
12 14
13 namespace { 15 namespace {
14 16
15 const int kXkbKeycodeOffset = 8; 17 const int kXkbKeycodeOffset = 8;
16 18
17 ui::KeyboardCode KeyboardCodeFromEvdevKey(unsigned int code) {
18 static const ui::KeyboardCode kLinuxBaseKeyMap[] = {
19 ui::VKEY_UNKNOWN, // KEY_RESERVED
20 ui::VKEY_ESCAPE, // KEY_ESC
21 ui::VKEY_1, // KEY_1
22 ui::VKEY_2, // KEY_2
23 ui::VKEY_3, // KEY_3
24 ui::VKEY_4, // KEY_4
25 ui::VKEY_5, // KEY_5
26 ui::VKEY_6, // KEY_6
27 ui::VKEY_7, // KEY_7
28 ui::VKEY_8, // KEY_8
29 ui::VKEY_9, // KEY_9
30 ui::VKEY_0, // KEY_0
31 ui::VKEY_OEM_MINUS, // KEY_MINUS
32 ui::VKEY_OEM_PLUS, // KEY_EQUAL
33 ui::VKEY_BACK, // KEY_BACKSPACE
34 ui::VKEY_TAB, // KEY_TAB
35 ui::VKEY_Q, // KEY_Q
36 ui::VKEY_W, // KEY_W
37 ui::VKEY_E, // KEY_E
38 ui::VKEY_R, // KEY_R
39 ui::VKEY_T, // KEY_T
40 ui::VKEY_Y, // KEY_Y
41 ui::VKEY_U, // KEY_U
42 ui::VKEY_I, // KEY_I
43 ui::VKEY_O, // KEY_O
44 ui::VKEY_P, // KEY_P
45 ui::VKEY_OEM_4, // KEY_LEFTBRACE
46 ui::VKEY_OEM_6, // KEY_RIGHTBRACE
47 ui::VKEY_RETURN, // KEY_ENTER
48 ui::VKEY_CONTROL, // KEY_LEFTCTRL
49 ui::VKEY_A, // KEY_A
50 ui::VKEY_S, // KEY_S
51 ui::VKEY_D, // KEY_D
52 ui::VKEY_F, // KEY_F
53 ui::VKEY_G, // KEY_G
54 ui::VKEY_H, // KEY_H
55 ui::VKEY_J, // KEY_J
56 ui::VKEY_K, // KEY_K
57 ui::VKEY_L, // KEY_L
58 ui::VKEY_OEM_1, // KEY_SEMICOLON
59 ui::VKEY_OEM_7, // KEY_APOSTROPHE
60 ui::VKEY_OEM_3, // KEY_GRAVE
61 ui::VKEY_SHIFT, // KEY_LEFTSHIFT
62 ui::VKEY_OEM_5, // KEY_BACKSLASH
63 ui::VKEY_Z, // KEY_Z
64 ui::VKEY_X, // KEY_X
65 ui::VKEY_C, // KEY_C
66 ui::VKEY_V, // KEY_V
67 ui::VKEY_B, // KEY_B
68 ui::VKEY_N, // KEY_N
69 ui::VKEY_M, // KEY_M
70 ui::VKEY_OEM_COMMA, // KEY_COMMA
71 ui::VKEY_OEM_PERIOD, // KEY_DOT
72 ui::VKEY_OEM_2, // KEY_SLASH
73 ui::VKEY_SHIFT, // KEY_RIGHTSHIFT
74 ui::VKEY_MULTIPLY, // KEY_KPASTERISK
75 ui::VKEY_MENU, // KEY_LEFTALT
76 ui::VKEY_SPACE, // KEY_SPACE
77 ui::VKEY_CAPITAL, // KEY_CAPSLOCK
78 ui::VKEY_F1, // KEY_F1
79 ui::VKEY_F2, // KEY_F2
80 ui::VKEY_F3, // KEY_F3
81 ui::VKEY_F4, // KEY_F4
82 ui::VKEY_F5, // KEY_F5
83 ui::VKEY_F6, // KEY_F6
84 ui::VKEY_F7, // KEY_F7
85 ui::VKEY_F8, // KEY_F8
86 ui::VKEY_F9, // KEY_F9
87 ui::VKEY_F10, // KEY_F10
88 ui::VKEY_NUMLOCK, // KEY_NUMLOCK
89 ui::VKEY_SCROLL, // KEY_SCROLLLOCK
90 ui::VKEY_NUMPAD7, // KEY_KP7
91 ui::VKEY_NUMPAD8, // KEY_KP8
92 ui::VKEY_NUMPAD9, // KEY_KP9
93 ui::VKEY_SUBTRACT, // KEY_KPMINUS
94 ui::VKEY_NUMPAD4, // KEY_KP4
95 ui::VKEY_NUMPAD5, // KEY_KP5
96 ui::VKEY_NUMPAD6, // KEY_KP6
97 ui::VKEY_ADD, // KEY_KPPLUS
98 ui::VKEY_NUMPAD1, // KEY_KP1
99 ui::VKEY_NUMPAD2, // KEY_KP2
100 ui::VKEY_NUMPAD3, // KEY_KP3
101 ui::VKEY_NUMPAD0, // KEY_KP0
102 ui::VKEY_DECIMAL, // KEY_KPDOT
103 ui::VKEY_UNKNOWN, // (unassigned)
104 ui::VKEY_DBE_DBCSCHAR, // KEY_ZENKAKUHANKAKU
105 ui::VKEY_OEM_102, // KEY_102ND
106 ui::VKEY_F11, // KEY_F11
107 ui::VKEY_F12, // KEY_F12
108 ui::VKEY_UNKNOWN, // KEY_RO
109 ui::VKEY_UNKNOWN, // KEY_KATAKANA
110 ui::VKEY_UNKNOWN, // KEY_HIRAGANA
111 ui::VKEY_CONVERT, // KEY_HENKAN
112 ui::VKEY_UNKNOWN, // KEY_KATAKANAHIRAGANA
113 ui::VKEY_NONCONVERT, // KEY_MUHENKAN
114 ui::VKEY_UNKNOWN, // KEY_KPJPCOMMA
115 ui::VKEY_RETURN, // KEY_KPENTER
116 ui::VKEY_CONTROL, // KEY_RIGHTCTRL
117 ui::VKEY_DIVIDE, // KEY_KPSLASH
118 ui::VKEY_PRINT, // KEY_SYSRQ
119 ui::VKEY_MENU, // KEY_RIGHTALT
120 ui::VKEY_RETURN, // KEY_LINEFEED
121 ui::VKEY_HOME, // KEY_HOME
122 ui::VKEY_UP, // KEY_UP
123 ui::VKEY_PRIOR, // KEY_PAGEUP
124 ui::VKEY_LEFT, // KEY_LEFT
125 ui::VKEY_RIGHT, // KEY_RIGHT
126 ui::VKEY_END, // KEY_END
127 ui::VKEY_DOWN, // KEY_DOWN
128 ui::VKEY_NEXT, // KEY_PAGEDOWN
129 ui::VKEY_INSERT, // KEY_INSERT
130 ui::VKEY_DELETE, // KEY_DELETE
131 ui::VKEY_UNKNOWN, // KEY_MACRO
132 ui::VKEY_VOLUME_MUTE, // KEY_MUTE
133 ui::VKEY_VOLUME_DOWN, // KEY_VOLUMEDOWN
134 ui::VKEY_VOLUME_UP, // KEY_VOLUMEUP
135 ui::VKEY_POWER, // KEY_POWER
136 ui::VKEY_OEM_PLUS, // KEY_KPEQUAL
137 ui::VKEY_UNKNOWN, // KEY_KPPLUSMINUS
138 ui::VKEY_PAUSE, // KEY_PAUSE
139 ui::VKEY_MEDIA_LAUNCH_APP1, // KEY_SCALE
140 ui::VKEY_DECIMAL, // KEY_KPCOMMA
141 ui::VKEY_HANGUL, // KEY_HANGEUL
142 ui::VKEY_HANJA, // KEY_HANJA
143 ui::VKEY_UNKNOWN, // KEY_YEN
144 ui::VKEY_LWIN, // KEY_LEFTMETA
145 ui::VKEY_RWIN, // KEY_RIGHTMETA
146 ui::VKEY_APPS, // KEY_COMPOSE
147 };
148
149 if (code < arraysize(kLinuxBaseKeyMap))
150 return kLinuxBaseKeyMap[code];
151
152 LOG(ERROR) << "Unknown key code: " << code;
153 return ui::VKEY_UNKNOWN;
154 }
155
156 int ModifierFromEvdevKey(unsigned int code) { 19 int ModifierFromEvdevKey(unsigned int code) {
157 switch (code) { 20 switch (code) {
158 case KEY_CAPSLOCK: 21 case KEY_CAPSLOCK:
159 return EVDEV_MODIFIER_CAPS_LOCK; 22 return EVDEV_MODIFIER_CAPS_LOCK;
160 case KEY_LEFTSHIFT: 23 case KEY_LEFTSHIFT:
161 case KEY_RIGHTSHIFT: 24 case KEY_RIGHTSHIFT:
162 return EVDEV_MODIFIER_SHIFT; 25 return EVDEV_MODIFIER_SHIFT;
163 case KEY_LEFTCTRL: 26 case KEY_LEFTCTRL:
164 case KEY_RIGHTCTRL: 27 case KEY_RIGHTCTRL:
165 return EVDEV_MODIFIER_CONTROL; 28 return EVDEV_MODIFIER_CONTROL;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 if (modifier == EVDEV_MODIFIER_NONE) 81 if (modifier == EVDEV_MODIFIER_NONE)
219 return; 82 return;
220 83
221 if (locking) 84 if (locking)
222 modifiers_->UpdateModifierLock(modifier, down); 85 modifiers_->UpdateModifierLock(modifier, down);
223 else 86 else
224 modifiers_->UpdateModifier(modifier, down); 87 modifiers_->UpdateModifier(modifier, down);
225 } 88 }
226 89
227 void KeyboardEvdev::DispatchKey(unsigned int key, bool down) { 90 void KeyboardEvdev::DispatchKey(unsigned int key, bool down) {
228 ui::KeyboardCode code = KeyboardCodeFromEvdevKey(key); 91 DomCode dom_code =
92 KeycodeConverter::NativeKeycodeToDomCode(key + kXkbKeycodeOffset);
93 // DomCode constants are not included here because of conflicts with
94 // evdev preprocessor macros.
95 if (!static_cast<int>(dom_code))
96 return;
229 int flags = modifiers_->GetModifierFlags(); 97 int flags = modifiers_->GetModifierFlags();
98 DomKey dom_key;
99 KeyboardCode key_code;
100 uint16 character;
101 if (!KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()->Lookup(
spang 2014/12/02 18:38:26 Can you add a KeyboardLayoutEngineManager* member
kpschoedel 2014/12/02 19:34:20 Done.
102 dom_code, flags, &dom_key, &character, &key_code)) {
103 return;
104 }
230 105
231 if (code == VKEY_UNKNOWN) 106 callback_.Run(make_scoped_ptr(
232 return; 107 new KeyEvent(down ? ET_KEY_PRESSED : ET_KEY_RELEASED, key_code, dom_code,
233 108 flags, dom_key, character)));
234 callback_.Run(make_scoped_ptr(new KeyEvent(
235 down ? ET_KEY_PRESSED : ET_KEY_RELEASED,
236 code,
237 KeycodeConverter::NativeKeycodeToDomCode(key + kXkbKeycodeOffset),
238 flags)));
239 } 109 }
240 110
241 } // namespace ui 111 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/ozone/evdev/keyboard_evdev.h ('k') | ui/events/ozone/events_ozone.gyp » ('j') | ui/events/ozone/layout/keyboard_layout_engine_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698