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

Side by Side Diff: ui/events/cocoa/cocoa_event_utils.mm

Issue 251493002: MacViews: Implement basic NSEvent -> ui::Event conversion for Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/events/cocoa/cocoa_event_utils_unittest.mm » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #import "ui/events/cocoa/cocoa_event_utils.h" 5 #import "ui/events/cocoa/cocoa_event_utils.h"
6 6
7 #include "ui/events/event_constants.h" 7 #include "ui/events/event_constants.h"
8 #include "ui/events/event_utils.h" 8 #include "ui/events/event_utils.h"
9 9
10 namespace { 10 namespace {
(...skipping 16 matching lines...) Expand all
27 27
28 NSEventType type = [event type]; 28 NSEventType type = [event type];
29 return type == NSOtherMouseDown || type == NSOtherMouseDragged || 29 return type == NSOtherMouseDown || type == NSOtherMouseDragged ||
30 type == NSOtherMouseUp; 30 type == NSOtherMouseUp;
31 } 31 }
32 32
33 } // namespace 33 } // namespace
34 34
35 namespace ui { 35 namespace ui {
36 36
37 int EventFlagsFromNative(const base::NativeEvent& event) {
38 NSUInteger modifiers = [event modifierFlags];
39 return EventFlagsFromNSEventWithModifiers(event, modifiers);
40 }
41
42 int EventFlagsFromModifiers(NSUInteger modifiers) { 37 int EventFlagsFromModifiers(NSUInteger modifiers) {
43 int flags = 0; 38 int flags = 0;
44 flags |= (modifiers & NSAlphaShiftKeyMask) ? ui::EF_CAPS_LOCK_DOWN : 0; 39 flags |= (modifiers & NSAlphaShiftKeyMask) ? ui::EF_CAPS_LOCK_DOWN : 0;
45 flags |= (modifiers & NSShiftKeyMask) ? ui::EF_SHIFT_DOWN : 0; 40 flags |= (modifiers & NSShiftKeyMask) ? ui::EF_SHIFT_DOWN : 0;
46 flags |= (modifiers & NSControlKeyMask) ? ui::EF_CONTROL_DOWN : 0; 41 flags |= (modifiers & NSControlKeyMask) ? ui::EF_CONTROL_DOWN : 0;
47 flags |= (modifiers & NSAlternateKeyMask) ? ui::EF_ALT_DOWN : 0; 42 flags |= (modifiers & NSAlternateKeyMask) ? ui::EF_ALT_DOWN : 0;
48 flags |= (modifiers & NSCommandKeyMask) ? ui::EF_COMMAND_DOWN : 0; 43 flags |= (modifiers & NSCommandKeyMask) ? ui::EF_COMMAND_DOWN : 0;
49 return flags; 44 return flags;
50 } 45 }
51 46
52 int EventFlagsFromNSEventWithModifiers(NSEvent* event, NSUInteger modifiers) { 47 int EventFlagsFromNSEventWithModifiers(NSEvent* event, NSUInteger modifiers) {
53 int flags = EventFlagsFromModifiers(modifiers); 48 int flags = EventFlagsFromModifiers(modifiers);
54 flags |= IsLeftButtonEvent(event) ? ui::EF_LEFT_MOUSE_BUTTON : 0; 49 flags |= IsLeftButtonEvent(event) ? ui::EF_LEFT_MOUSE_BUTTON : 0;
55 flags |= IsRightButtonEvent(event) ? ui::EF_RIGHT_MOUSE_BUTTON : 0; 50 flags |= IsRightButtonEvent(event) ? ui::EF_RIGHT_MOUSE_BUTTON : 0;
56 flags |= IsMiddleButtonEvent(event) ? ui::EF_MIDDLE_MOUSE_BUTTON : 0; 51 flags |= IsMiddleButtonEvent(event) ? ui::EF_MIDDLE_MOUSE_BUTTON : 0;
57 return flags; 52 return flags;
58 } 53 }
59 54
60 } // namespace ui 55 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | ui/events/cocoa/cocoa_event_utils_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698