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

Side by Side Diff: ui/events/win/events_win.cc

Issue 404203003: Distinguish between keystroke and character events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IsCharFromNative() for Mac build Created 6 years, 4 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 unified diff | Download patch
« no previous file with comments | « ui/events/test/events_test_utils.cc ('k') | ui/events/x/events_x.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <windowsx.h> 5 #include <windowsx.h>
6 6
7 #include "ui/events/event_constants.h" 7 #include "ui/events/event_constants.h"
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 252
253 const char* CodeFromNative(const base::NativeEvent& native_event) { 253 const char* CodeFromNative(const base::NativeEvent& native_event) {
254 const uint16 scan_code = GetScanCodeFromLParam(native_event.lParam); 254 const uint16 scan_code = GetScanCodeFromLParam(native_event.lParam);
255 return CodeForWindowsScanCode(scan_code); 255 return CodeForWindowsScanCode(scan_code);
256 } 256 }
257 257
258 uint32 PlatformKeycodeFromNative(const base::NativeEvent& native_event) { 258 uint32 PlatformKeycodeFromNative(const base::NativeEvent& native_event) {
259 return static_cast<uint32>(native_event.wParam); 259 return static_cast<uint32>(native_event.wParam);
260 } 260 }
261 261
262 bool IsCharFromNative(const base::NativeEvent& native_event) {
263 return native_event.message == WM_CHAR;
264 }
265
262 int GetChangedMouseButtonFlagsFromNative( 266 int GetChangedMouseButtonFlagsFromNative(
263 const base::NativeEvent& native_event) { 267 const base::NativeEvent& native_event) {
264 switch (GetNativeMouseKey(native_event)) { 268 switch (GetNativeMouseKey(native_event)) {
265 case MK_LBUTTON: 269 case MK_LBUTTON:
266 return EF_LEFT_MOUSE_BUTTON; 270 return EF_LEFT_MOUSE_BUTTON;
267 case MK_MBUTTON: 271 case MK_MBUTTON:
268 return EF_MIDDLE_MOUSE_BUTTON; 272 return EF_MIDDLE_MOUSE_BUTTON;
269 case MK_RBUTTON: 273 case MK_RBUTTON:
270 return EF_RIGHT_MOUSE_BUTTON; 274 return EF_RIGHT_MOUSE_BUTTON;
271 // TODO: add support for MK_XBUTTON1. 275 // TODO: add support for MK_XBUTTON1.
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 } 405 }
402 406
403 LPARAM GetLParamFromScanCode(uint16 scan_code) { 407 LPARAM GetLParamFromScanCode(uint16 scan_code) {
404 LPARAM l_param = static_cast<LPARAM>(scan_code & 0x00FF) << 16; 408 LPARAM l_param = static_cast<LPARAM>(scan_code & 0x00FF) << 16;
405 if ((scan_code & 0xE000) == 0xE000) 409 if ((scan_code & 0xE000) == 0xE000)
406 l_param |= (1 << 24); 410 l_param |= (1 << 24);
407 return l_param; 411 return l_param;
408 } 412 }
409 413
410 } // namespace ui 414 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/test/events_test_utils.cc ('k') | ui/events/x/events_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698