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

Side by Side Diff: ui/events/keycodes/keyboard_code_conversion_x.h

Issue 378503007: Fix some surprising reverse key mappings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments (derat) Created 6 years, 5 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_ 5 #ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
6 #define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_ 6 #define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "ui/events/events_base_export.h" 9 #include "ui/events/events_base_export.h"
10 #include "ui/events/keycodes/keyboard_codes_posix.h" 10 #include "ui/events/keycodes/keyboard_codes_posix.h"
11 11
12 typedef union _XEvent XEvent; 12 typedef union _XEvent XEvent;
13 typedef struct _XDisplay XDisplay;
13 14
14 namespace ui { 15 namespace ui {
15 16
16 EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev); 17 EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev);
17 18
18 EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym); 19 EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym);
19 20
20 EVENTS_BASE_EXPORT const char* CodeFromXEvent(XEvent* xev); 21 EVENTS_BASE_EXPORT const char* CodeFromXEvent(XEvent* xev);
21 22
22 // Returns a character on a standard US PC keyboard from an XEvent. 23 // Returns a character on a standard US PC keyboard from an XEvent.
23 EVENTS_BASE_EXPORT uint16 GetCharacterFromXEvent(XEvent* xev); 24 EVENTS_BASE_EXPORT uint16 GetCharacterFromXEvent(XEvent* xev);
24 25
25 // Converts a KeyboardCode into an X KeySym. 26 // Converts a KeyboardCode into an X KeySym.
26 EVENTS_BASE_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode, 27 EVENTS_BASE_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode,
27 bool shift); 28 bool shift);
28 29
30 // Returns a XKeyEvent keycode (scancode) for a KeyboardCode. Keyboard layouts
31 // are usually not injective, so inverse mapping should be avoided when
32 // practical. A round-trip keycode -> KeyboardCode -> keycode will not
33 // necessarily return the original keycode.
34 EVENTS_BASE_EXPORT unsigned int XKeysymForWindowsKeyCode(KeyboardCode key_code,
Daniel Erat 2014/07/08 14:49:31 s/XKeysym/XKeyCode/
35 int flags,
36 XDisplay* display);
37
29 // Converts an X keycode into ui::KeyboardCode. 38 // Converts an X keycode into ui::KeyboardCode.
30 EVENTS_BASE_EXPORT KeyboardCode 39 EVENTS_BASE_EXPORT KeyboardCode
31 DefaultKeyboardCodeFromHardwareKeycode(unsigned int hardware_code); 40 DefaultKeyboardCodeFromHardwareKeycode(unsigned int hardware_code);
32 41
33 } // namespace ui 42 } // namespace ui
34 43
35 #endif // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_ 44 #endif // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698