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

Side by Side Diff: ui/events/test/events_test_utils_x11.cc

Issue 1120813002: Remove EF_FUNCTION_KEY and EF_NUMPAD_KEY. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address review comments (wez@) Created 5 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
« no previous file with comments | « ui/events/keycodes/dom4/keycode_converter_unittest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/events/test/events_test_utils_x11.h" 5 #include "ui/events/test/events_test_utils_x11.h"
6 6
7 #include <X11/extensions/XI2.h> 7 #include <X11/extensions/XI2.h>
8 #include <X11/keysym.h> 8 #include <X11/keysym.h>
9 #include <X11/X.h> 9 #include <X11/X.h>
10 #include <X11/Xlib.h> 10 #include <X11/Xlib.h>
11 11
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "ui/events/devices/x11/touch_factory_x11.h" 13 #include "ui/events/devices/x11/touch_factory_x11.h"
14 #include "ui/events/event_constants.h" 14 #include "ui/events/event_constants.h"
15 #include "ui/events/event_utils.h" 15 #include "ui/events/event_utils.h"
16 #include "ui/events/keycodes/keyboard_code_conversion_x.h" 16 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
17 17
18 namespace { 18 namespace {
19 19
20 // Converts ui::EventType to state for X*Events. 20 // Converts ui::EventType to state for X*Events.
21 unsigned int XEventState(int flags) { 21 unsigned int XEventState(int flags) {
22 return 22 return
23 ((flags & ui::EF_SHIFT_DOWN) ? ShiftMask : 0) | 23 ((flags & ui::EF_SHIFT_DOWN) ? ShiftMask : 0) |
24 ((flags & ui::EF_CONTROL_DOWN) ? ControlMask : 0) | 24 ((flags & ui::EF_CONTROL_DOWN) ? ControlMask : 0) |
25 ((flags & ui::EF_ALT_DOWN) ? Mod1Mask : 0) | 25 ((flags & ui::EF_ALT_DOWN) ? Mod1Mask : 0) |
26 ((flags & ui::EF_CAPS_LOCK_DOWN) ? LockMask : 0) | 26 ((flags & ui::EF_CAPS_LOCK_DOWN) ? LockMask : 0) |
27 ((flags & ui::EF_ALTGR_DOWN) ? Mod5Mask : 0) | 27 ((flags & ui::EF_ALTGR_DOWN) ? Mod5Mask : 0) |
28 ((flags & ui::EF_COMMAND_DOWN) ? Mod4Mask : 0) | 28 ((flags & ui::EF_COMMAND_DOWN) ? Mod4Mask : 0) |
29 ((flags & ui::EF_MOD3_DOWN) ? Mod3Mask : 0) | 29 ((flags & ui::EF_MOD3_DOWN) ? Mod3Mask : 0) |
30 ((flags & ui::EF_NUMPAD_KEY) ? Mod2Mask : 0) |
31 ((flags & ui::EF_LEFT_MOUSE_BUTTON) ? Button1Mask: 0) | 30 ((flags & ui::EF_LEFT_MOUSE_BUTTON) ? Button1Mask: 0) |
32 ((flags & ui::EF_MIDDLE_MOUSE_BUTTON) ? Button2Mask: 0) | 31 ((flags & ui::EF_MIDDLE_MOUSE_BUTTON) ? Button2Mask: 0) |
33 ((flags & ui::EF_RIGHT_MOUSE_BUTTON) ? Button3Mask: 0); 32 ((flags & ui::EF_RIGHT_MOUSE_BUTTON) ? Button3Mask: 0);
34 } 33 }
35 34
36 // Converts EventType to XKeyEvent type. 35 // Converts EventType to XKeyEvent type.
37 int XKeyEventType(ui::EventType type) { 36 int XKeyEventType(ui::EventType type) {
38 switch (type) { 37 switch (type) {
39 case ui::ET_KEY_PRESSED: 38 case ui::ET_KEY_PRESSED:
40 return KeyPress; 39 return KeyPress;
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 manager->SetDeviceListForTest(std::vector<int>(), device_list); 294 manager->SetDeviceListForTest(std::vector<int>(), device_list);
296 } 295 }
297 296
298 void SetUpTouchDevicesForTest(const std::vector<int>& devices) { 297 void SetUpTouchDevicesForTest(const std::vector<int>& devices) {
299 TouchFactory::GetInstance()->SetTouchDeviceForTest(devices); 298 TouchFactory::GetInstance()->SetTouchDeviceForTest(devices);
300 ui::DeviceDataManagerX11* manager = ui::DeviceDataManagerX11::GetInstance(); 299 ui::DeviceDataManagerX11* manager = ui::DeviceDataManagerX11::GetInstance();
301 manager->SetDeviceListForTest(devices, std::vector<int>()); 300 manager->SetDeviceListForTest(devices, std::vector<int>());
302 } 301 }
303 302
304 } // namespace ui 303 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/keycodes/dom4/keycode_converter_unittest.cc ('k') | ui/events/x/events_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698