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

Unified Diff: ui/events/keycodes/keyboard_code_conversion_x.h

Issue 336403005: Use XInput2 events for keyboard events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Post rebase, make KeyboardCodeFromXKeyEvent() not modify its argument. 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 side-by-side diff with in-line comments
Download patch
Index: ui/events/keycodes/keyboard_code_conversion_x.h
diff --git a/ui/events/keycodes/keyboard_code_conversion_x.h b/ui/events/keycodes/keyboard_code_conversion_x.h
index f9186ca0c885701107feb19f746d54bcc88a3993..a10498465f549791133fd36782834dddcdad6de1 100644
--- a/ui/events/keycodes/keyboard_code_conversion_x.h
+++ b/ui/events/keycodes/keyboard_code_conversion_x.h
@@ -13,14 +13,14 @@ typedef union _XEvent XEvent;
namespace ui {
-EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev);
+EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(const XEvent* xev);
EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym);
-EVENTS_BASE_EXPORT const char* CodeFromXEvent(XEvent* xev);
+EVENTS_BASE_EXPORT const char* CodeFromXEvent(const XEvent* xev);
// Returns a character on a standard US PC keyboard from an XEvent.
-EVENTS_BASE_EXPORT uint16 GetCharacterFromXEvent(XEvent* xev);
+EVENTS_BASE_EXPORT uint16 GetCharacterFromXEvent(const XEvent* xev);
// Converts a KeyboardCode into an X KeySym.
EVENTS_BASE_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode,
@@ -30,6 +30,9 @@ EVENTS_BASE_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode,
EVENTS_BASE_EXPORT KeyboardCode
DefaultKeyboardCodeFromHardwareKeycode(unsigned int hardware_code);
+// Initializes a core XKeyEvent from an XI2 key event.
+void InitXKeyEventFromXIDeviceEvent(const XEvent& src, XEvent* dst);
sadrul 2014/07/10 16:03:06 You likely need to EXPORT this?
kpschoedel 2014/07/10 17:22:39 Done.
+
} // namespace ui
#endif // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_

Powered by Google App Engine
This is Rietveld 408576698