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

Side by Side Diff: views/event_gtk.cc

Issue 3165064: Move the keyboard files from base/ to app/. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: latest merge Created 10 years, 3 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 | « views/event.cc ('k') | views/examples/table2_example.h » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "views/event.h" 5 #include "views/event.h"
6 6
7 #include <gdk/gdk.h> 7 #include <gdk/gdk.h>
8 8
9 #include "base/keyboard_code_conversion_gtk.h" 9 #include "app/keyboard_code_conversion_gtk.h"
10 10
11 namespace views { 11 namespace views {
12 12
13 KeyEvent::KeyEvent(GdkEventKey* event) 13 KeyEvent::KeyEvent(GdkEventKey* event)
14 : Event(event->type == GDK_KEY_PRESS ? 14 : Event(event->type == GDK_KEY_PRESS ?
15 Event::ET_KEY_PRESSED : Event::ET_KEY_RELEASED, 15 Event::ET_KEY_PRESSED : Event::ET_KEY_RELEASED,
16 GetFlagsFromGdkState(event->state)), 16 GetFlagsFromGdkState(event->state)),
17 // TODO(erg): All these values are iffy. 17 // TODO(erg): All these values are iffy.
18 key_code_(base::WindowsKeyCodeForGdkKeyCode(event->keyval)), 18 key_code_(app::WindowsKeyCodeForGdkKeyCode(event->keyval)),
19 repeat_count_(0), 19 repeat_count_(0),
20 message_flags_(0) { 20 message_flags_(0) {
21 } 21 }
22 22
23 // static 23 // static
24 int Event::GetFlagsFromGdkState(int state) { 24 int Event::GetFlagsFromGdkState(int state) {
25 int flags = 0; 25 int flags = 0;
26 if (state & GDK_CONTROL_MASK) 26 if (state & GDK_CONTROL_MASK)
27 flags |= Event::EF_CONTROL_DOWN; 27 flags |= Event::EF_CONTROL_DOWN;
28 if (state & GDK_SHIFT_MASK) 28 if (state & GDK_SHIFT_MASK)
29 flags |= Event::EF_SHIFT_DOWN; 29 flags |= Event::EF_SHIFT_DOWN;
30 if (state & GDK_MOD1_MASK) 30 if (state & GDK_MOD1_MASK)
31 flags |= Event::EF_ALT_DOWN; 31 flags |= Event::EF_ALT_DOWN;
32 if (state & GDK_BUTTON1_MASK) 32 if (state & GDK_BUTTON1_MASK)
33 flags |= Event::EF_LEFT_BUTTON_DOWN; 33 flags |= Event::EF_LEFT_BUTTON_DOWN;
34 if (state & GDK_BUTTON2_MASK) 34 if (state & GDK_BUTTON2_MASK)
35 flags |= Event::EF_MIDDLE_BUTTON_DOWN; 35 flags |= Event::EF_MIDDLE_BUTTON_DOWN;
36 if (state & GDK_BUTTON3_MASK) 36 if (state & GDK_BUTTON3_MASK)
37 flags |= Event::EF_RIGHT_BUTTON_DOWN; 37 flags |= Event::EF_RIGHT_BUTTON_DOWN;
38 return flags; 38 return flags;
39 } 39 }
40 40
41 } // namespace views 41 } // namespace views
OLDNEW
« no previous file with comments | « views/event.cc ('k') | views/examples/table2_example.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698