| OLD | NEW |
| 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_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 | 13 |
| 14 namespace ui { | 14 namespace ui { |
| 15 | 15 |
| 16 EVENTS_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev); | 16 EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev); |
| 17 | 17 |
| 18 EVENTS_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym); | 18 EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym); |
| 19 | 19 |
| 20 // Returns a character on a standard US PC keyboard from an XEvent. | 20 // Returns a character on a standard US PC keyboard from an XEvent. |
| 21 EVENTS_EXPORT uint16 GetCharacterFromXEvent(XEvent* xev); | 21 EVENTS_BASE_EXPORT uint16 GetCharacterFromXEvent(XEvent* xev); |
| 22 | 22 |
| 23 // Converts a KeyboardCode into an X KeySym. | 23 // Converts a KeyboardCode into an X KeySym. |
| 24 EVENTS_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift); | 24 EVENTS_BASE_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode, |
| 25 bool shift); |
| 25 | 26 |
| 26 // Converts an X keycode into an X KeySym. | 27 // Converts an X keycode into an X KeySym. |
| 27 unsigned int DefaultXKeysymFromHardwareKeycode(unsigned int keycode); | 28 unsigned int DefaultXKeysymFromHardwareKeycode(unsigned int keycode); |
| 28 | 29 |
| 29 } // namespace ui | 30 } // namespace ui |
| 30 | 31 |
| 31 #endif // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_ | 32 #endif // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_ |
| OLD | NEW |