diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-05 13:16:07 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-05 13:16:07 +0000 |
| commit | 236b631391f65636d39689f253a770ac02d95ed1 (patch) | |
| tree | 3c5ee0a5c02d81b605f6d09a3f7214a64275ab22 /chrome/browser/chromeos/input_method/xkeyboard.h | |
| parent | 223c517f670d117ec0eb131afa59d87ed4f1661a (diff) | |
| download | chromium_src-236b631391f65636d39689f253a770ac02d95ed1.zip chromium_src-236b631391f65636d39689f253a770ac02d95ed1.tar.gz chromium_src-236b631391f65636d39689f253a770ac02d95ed1.tar.bz2 | |
Merge 87756 - Listen to XI_HierarchyChanged events and call setxkbmap when needed.
BUG=chromium-os:15851
BUG=chromium-os:15516
BUG=84694
TEST=manually done: Log in, change the layout from US Qwerty (US) to US Extended (EXTD), focus Omnibox, press AltGr+a, confirm á is shown, plug a USB keyboard, press AltGr+a, confirm the character again, press ctrl+alt+f2 to show VT2, press ctrl+alt+f1 to go back to X, press AltGr+a, confirm the char again, close lid, open lid, press AltGr+a, confirm the char again.
TEST=On login screen, change the keyboard layout to EXTD, add "sleep 30" to /etc/init/udev-*.conf files, reboot, on login screen, wait for ~30 seconds, press AltGr+a, confirm á is shown.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=87585
Review URL: http://codereview.chromium.org/6975057
TBR=yusukes@google.com
Review URL: http://codereview.chromium.org/7056064
git-svn-id: svn://svn.chromium.org/chrome/branches/782/src@87945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/input_method/xkeyboard.h')
| -rw-r--r-- | chrome/browser/chromeos/input_method/xkeyboard.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/input_method/xkeyboard.h b/chrome/browser/chromeos/input_method/xkeyboard.h index df938c5..79c7dd5 100644 --- a/chrome/browser/chromeos/input_method/xkeyboard.h +++ b/chrome/browser/chromeos/input_method/xkeyboard.h @@ -46,6 +46,11 @@ typedef std::vector<ModifierKeyPair> ModifierMap; // change the current mapping of the modifier keys. Returns true on success. bool SetCurrentKeyboardLayoutByName(const std::string& layout_name); +// Sets the current keyboard layout again. We have to call the function every +// time when "XI_HierarchyChanged" XInput2 event is sent to Chrome. See +// xinput_hierarchy_changed_event_listener.h for details. +bool ReapplyCurrentKeyboardLayout(); + // Remaps modifier keys. This function does not change the current keyboard // layout. Returns true on success. // Notice: For now, you can't remap Left Control and Left Alt keys to CapsLock. |