| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/views/events/event.h" | 5 #include "ui/views/events/event.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/win/win_util.h" | 8 #include "base/win/win_util.h" |
| 9 #include "ui/base/keycodes/keyboard_code_conversion.h" | 9 #include "ui/base/keycodes/keyboard_code_conversion.h" |
| 10 | 10 |
| 11 namespace views { | 11 namespace views { |
| 12 | 12 |
| 13 //////////////////////////////////////////////////////////////////////////////// | |
| 14 // KeyEvent, public: | |
| 15 | |
| 16 uint16 KeyEvent::GetCharacter() const { | |
| 17 if (character_) | |
| 18 return character_; | |
| 19 return (native_event().message == WM_CHAR) ? key_code_ : | |
| 20 ui::GetCharacterFromKeyCode(key_code_, flags()); | |
| 21 } | |
| 22 | |
| 23 uint16 KeyEvent::GetUnmodifiedCharacter() const { | |
| 24 if (unmodified_character_) | |
| 25 return unmodified_character_; | |
| 26 // Looks like there is no way to get unmodified character on Windows. | |
| 27 return (native_event().message == WM_CHAR) ? key_code_ : | |
| 28 ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN); | |
| 29 } | |
| 30 | |
| 31 int GetModifiersFromKeyState() { | 13 int GetModifiersFromKeyState() { |
| 32 int modifiers = ui::EF_NONE; | 14 int modifiers = ui::EF_NONE; |
| 33 if (base::win::IsShiftPressed()) | 15 if (base::win::IsShiftPressed()) |
| 34 modifiers |= ui::EF_SHIFT_DOWN; | 16 modifiers |= ui::EF_SHIFT_DOWN; |
| 35 if (base::win::IsCtrlPressed()) | 17 if (base::win::IsCtrlPressed()) |
| 36 modifiers |= ui::EF_CONTROL_DOWN; | 18 modifiers |= ui::EF_CONTROL_DOWN; |
| 37 if (base::win::IsAltPressed()) | 19 if (base::win::IsAltPressed()) |
| 38 modifiers |= ui::EF_ALT_DOWN; | 20 modifiers |= ui::EF_ALT_DOWN; |
| 39 return modifiers; | 21 return modifiers; |
| 40 } | 22 } |
| 41 | 23 |
| 42 } // namespace views | 24 } // namespace views |
| OLD | NEW |