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/base/ime/input_method_win.h" | 5 #include "ui/base/ime/input_method_win.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/profiler/scoped_tracker.h" | 9 #include "base/profiler/scoped_tracker.h" |
10 #include "ui/base/ime/text_input_client.h" | 10 #include "ui/base/ime/text_input_client.h" |
(...skipping 14 matching lines...) Expand all Loading... | |
25 | 25 |
26 } // namespace | 26 } // namespace |
27 | 27 |
28 InputMethodWin::InputMethodWin(internal::InputMethodDelegate* delegate, | 28 InputMethodWin::InputMethodWin(internal::InputMethodDelegate* delegate, |
29 HWND toplevel_window_handle) | 29 HWND toplevel_window_handle) |
30 : toplevel_window_handle_(toplevel_window_handle), | 30 : toplevel_window_handle_(toplevel_window_handle), |
31 pending_requested_direction_(base::i18n::UNKNOWN_DIRECTION), | 31 pending_requested_direction_(base::i18n::UNKNOWN_DIRECTION), |
32 accept_carriage_return_(false), | 32 accept_carriage_return_(false), |
33 enabled_(false), | 33 enabled_(false), |
34 is_candidate_popup_open_(false), | 34 is_candidate_popup_open_(false), |
35 composing_window_handle_(NULL), | 35 composing_window_handle_(NULL) { |
36 suppress_next_char_(false) { | |
37 SetDelegate(delegate); | 36 SetDelegate(delegate); |
38 } | 37 } |
39 | 38 |
40 void InputMethodWin::OnFocus() { | 39 void InputMethodWin::OnFocus() { |
41 InputMethodBase::OnFocus(); | 40 InputMethodBase::OnFocus(); |
42 if (GetTextInputClient()) | 41 if (GetTextInputClient()) |
43 UpdateIMEState(); | 42 UpdateIMEState(); |
44 } | 43 } |
45 | 44 |
46 void InputMethodWin::OnBlur() { | 45 void InputMethodWin::OnBlur() { |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
97 *result = original_result; | 96 *result = original_result; |
98 return !!handled; | 97 return !!handled; |
99 } | 98 } |
100 | 99 |
101 void InputMethodWin::DispatchKeyEvent(ui::KeyEvent* event) { | 100 void InputMethodWin::DispatchKeyEvent(ui::KeyEvent* event) { |
102 if (!event->HasNativeEvent()) { | 101 if (!event->HasNativeEvent()) { |
103 DispatchFabricatedKeyEvent(event); | 102 DispatchFabricatedKeyEvent(event); |
104 return; | 103 return; |
105 } | 104 } |
106 | 105 |
106 MSG msg; | |
107 std::vector<MSG> char_msgs; | |
107 const base::NativeEvent& native_key_event = event->native_event(); | 108 const base::NativeEvent& native_key_event = event->native_event(); |
109 ::TranslateMessage(&native_key_event); | |
110 while (::PeekMessage(&msg, native_key_event.hwnd, WM_CHAR, WM_SYSCHAR, | |
James Su
2015/08/03 07:31:18
is it necessary to handle WM_DEADCHAR and WM_SYSDE
Shu Chen
2015/08/03 07:39:59
No, chrome nevers handles WM_DEADCHAR & WM_SYSDEAD
yukawa
2015/08/03 08:09:46
The fact that Chrome has never handled WM_DEADCHAR
Shu Chen
2015/08/04 08:18:42
What do you mean by removing WM_DEADCHAR?
If you m
yukawa
2015/08/04 08:35:07
Ah, sorry I misunderstood this code.
Can you leave
Shu Chen
2015/08/05 01:36:45
Done.
| |
111 PM_REMOVE)) { | |
112 char_msgs.push_back(msg); | |
113 } | |
114 | |
115 BOOL handled = FALSE; | |
108 if (native_key_event.message == WM_CHAR) { | 116 if (native_key_event.message == WM_CHAR) { |
109 BOOL handled; | |
110 OnChar(native_key_event.hwnd, native_key_event.message, | 117 OnChar(native_key_event.hwnd, native_key_event.message, |
111 native_key_event.wParam, native_key_event.lParam, &handled); | 118 native_key_event.wParam, native_key_event.lParam, &handled); |
112 if (handled) | 119 if (handled) |
113 event->StopPropagation(); | 120 event->StopPropagation(); |
114 return; | 121 return; |
115 } | 122 } |
116 // Handles ctrl-shift key to change text direction and layout alignment. | 123 // Handles ctrl-shift key to change text direction and layout alignment. |
117 if (ui::IMM32Manager::IsRTLKeyboardLayoutInstalled() && | 124 if (ui::IMM32Manager::IsRTLKeyboardLayoutInstalled() && |
118 !IsTextInputTypeNone()) { | 125 !IsTextInputTypeNone()) { |
119 // TODO: shouldn't need to generate a KeyEvent here. | 126 // TODO: shouldn't need to generate a KeyEvent here. |
(...skipping 10 matching lines...) Expand all Loading... | |
130 } else if (key.type() == ui::ET_KEY_RELEASED && | 137 } else if (key.type() == ui::ET_KEY_RELEASED && |
131 (code == ui::VKEY_SHIFT || code == ui::VKEY_CONTROL) && | 138 (code == ui::VKEY_SHIFT || code == ui::VKEY_CONTROL) && |
132 pending_requested_direction_ != base::i18n::UNKNOWN_DIRECTION) { | 139 pending_requested_direction_ != base::i18n::UNKNOWN_DIRECTION) { |
133 GetTextInputClient()->ChangeTextDirectionAndLayoutAlignment( | 140 GetTextInputClient()->ChangeTextDirectionAndLayoutAlignment( |
134 pending_requested_direction_); | 141 pending_requested_direction_); |
135 pending_requested_direction_ = base::i18n::UNKNOWN_DIRECTION; | 142 pending_requested_direction_ = base::i18n::UNKNOWN_DIRECTION; |
136 } | 143 } |
137 } | 144 } |
138 | 145 |
139 ui::EventDispatchDetails details = DispatchKeyEventPostIME(event); | 146 ui::EventDispatchDetails details = DispatchKeyEventPostIME(event); |
140 if (!details.dispatcher_destroyed) | 147 if (details.dispatcher_destroyed || event->stopped_propagation()) |
James Su
2015/08/03 07:07:11
is it necessary to check details.target_destroyed?
Shu Chen
2015/08/04 08:18:42
Done.
| |
141 suppress_next_char_ = event->stopped_propagation(); | 148 return; |
149 | |
150 for (size_t i = 0; i < char_msgs.size(); ++i) { | |
151 msg = char_msgs[i]; | |
152 if (msg.message == WM_CHAR || msg.message == WM_SYSCHAR) | |
153 OnChar(msg.hwnd, msg.message, msg.wParam, msg.lParam, &handled); | |
154 } | |
142 } | 155 } |
143 | 156 |
144 void InputMethodWin::OnTextInputTypeChanged(const TextInputClient* client) { | 157 void InputMethodWin::OnTextInputTypeChanged(const TextInputClient* client) { |
145 if (!IsTextInputClientFocused(client) || !IsWindowFocused(client)) | 158 if (!IsTextInputClientFocused(client) || !IsWindowFocused(client)) |
146 return; | 159 return; |
147 imm32_manager_.CancelIME(toplevel_window_handle_); | 160 imm32_manager_.CancelIME(toplevel_window_handle_); |
148 UpdateIMEState(); | 161 UpdateIMEState(); |
149 } | 162 } |
150 | 163 |
151 void InputMethodWin::OnCaretBoundsChanged(const TextInputClient* client) { | 164 void InputMethodWin::OnCaretBoundsChanged(const TextInputClient* client) { |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
217 UINT message, | 230 UINT message, |
218 WPARAM wparam, | 231 WPARAM wparam, |
219 LPARAM lparam, | 232 LPARAM lparam, |
220 BOOL* handled) { | 233 BOOL* handled) { |
221 // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. | 234 // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. |
222 tracked_objects::ScopedTracker tracking_profile( | 235 tracked_objects::ScopedTracker tracking_profile( |
223 FROM_HERE_WITH_EXPLICIT_FUNCTION("440919 InputMethodWin::OnChar")); | 236 FROM_HERE_WITH_EXPLICIT_FUNCTION("440919 InputMethodWin::OnChar")); |
224 | 237 |
225 *handled = TRUE; | 238 *handled = TRUE; |
226 | 239 |
227 if (suppress_next_char_) { | |
228 suppress_next_char_ = false; | |
229 return 0; | |
230 } | |
231 | |
232 // We need to send character events to the focused text input client event if | 240 // We need to send character events to the focused text input client event if |
233 // its text input type is ui::TEXT_INPUT_TYPE_NONE. | 241 // its text input type is ui::TEXT_INPUT_TYPE_NONE. |
234 if (GetTextInputClient()) { | 242 if (GetTextInputClient()) { |
235 const base::char16 kCarriageReturn = L'\r'; | 243 const base::char16 kCarriageReturn = L'\r'; |
236 const base::char16 ch = static_cast<base::char16>(wparam); | 244 const base::char16 ch = static_cast<base::char16>(wparam); |
237 // A mask to determine the previous key state from |lparam|. The value is 1 | 245 // A mask to determine the previous key state from |lparam|. The value is 1 |
238 // if the key is down before the message is sent, or it is 0 if the key is | 246 // if the key is down before the message is sent, or it is 0 if the key is |
239 // up. | 247 // up. |
240 const uint32 kPrevKeyDownBit = 0x40000000; | 248 const uint32 kPrevKeyDownBit = 0x40000000; |
241 if (ch == kCarriageReturn && !(lparam & kPrevKeyDownBit)) | 249 if (ch == kCarriageReturn && !(lparam & kPrevKeyDownBit)) |
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
580 // window. So we can safely assume that |attached_window_handle| is ready for | 588 // window. So we can safely assume that |attached_window_handle| is ready for |
581 // receiving keyboard input as long as it is an active window. This works well | 589 // receiving keyboard input as long as it is an active window. This works well |
582 // even when the |attached_window_handle| becomes active but has not received | 590 // even when the |attached_window_handle| becomes active but has not received |
583 // WM_FOCUS yet. | 591 // WM_FOCUS yet. |
584 return toplevel_window_handle_ && | 592 return toplevel_window_handle_ && |
585 GetActiveWindow() == toplevel_window_handle_; | 593 GetActiveWindow() == toplevel_window_handle_; |
586 } | 594 } |
587 | 595 |
588 void InputMethodWin::DispatchFabricatedKeyEvent(ui::KeyEvent* event) { | 596 void InputMethodWin::DispatchFabricatedKeyEvent(ui::KeyEvent* event) { |
589 if (event->is_char()) { | 597 if (event->is_char()) { |
590 if (suppress_next_char_) { | |
591 suppress_next_char_ = false; | |
592 return; | |
593 } | |
594 if (GetTextInputClient()) { | 598 if (GetTextInputClient()) { |
595 GetTextInputClient()->InsertChar( | 599 GetTextInputClient()->InsertChar( |
596 static_cast<base::char16>(event->key_code()), | 600 static_cast<base::char16>(event->key_code()), |
597 ui::GetModifiersFromKeyState()); | 601 ui::GetModifiersFromKeyState()); |
598 return; | 602 return; |
599 } | 603 } |
600 } | 604 } |
601 ignore_result(DispatchKeyEventPostIME(event)); | 605 ignore_result(DispatchKeyEventPostIME(event)); |
602 } | 606 } |
603 | 607 |
(...skipping 27 matching lines...) Expand all Loading... | |
631 enabled_ = true; | 635 enabled_ = true; |
632 break; | 636 break; |
633 } | 637 } |
634 | 638 |
635 imm32_manager_.SetTextInputMode(window_handle, text_input_mode); | 639 imm32_manager_.SetTextInputMode(window_handle, text_input_mode); |
636 tsf_inputscope::SetInputScopeForTsfUnawareWindow( | 640 tsf_inputscope::SetInputScopeForTsfUnawareWindow( |
637 window_handle, text_input_type, text_input_mode); | 641 window_handle, text_input_type, text_input_mode); |
638 } | 642 } |
639 | 643 |
640 } // namespace ui | 644 } // namespace ui |
OLD | NEW |