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

Side by Side Diff: ui/events/x/events_x.cc

Issue 277443004: Handle X11 Mod3Mask for Caps Lock remapping. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update unit tests with Mod3Mask 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
« no previous file with comments | « chrome/browser/chromeos/events/event_rewriter_unittest.cc ('k') | no next file » | 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 "ui/events/event_constants.h" 5 #include "ui/events/event_constants.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <string.h> 8 #include <string.h>
9 #include <X11/extensions/XInput.h> 9 #include <X11/extensions/XInput.h>
10 #include <X11/extensions/XInput2.h> 10 #include <X11/extensions/XInput2.h>
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 int GetEventFlagsFromXState(unsigned int state) { 130 int GetEventFlagsFromXState(unsigned int state) {
131 int flags = 0; 131 int flags = 0;
132 if (state & ControlMask) 132 if (state & ControlMask)
133 flags |= ui::EF_CONTROL_DOWN; 133 flags |= ui::EF_CONTROL_DOWN;
134 if (state & ShiftMask) 134 if (state & ShiftMask)
135 flags |= ui::EF_SHIFT_DOWN; 135 flags |= ui::EF_SHIFT_DOWN;
136 if (state & Mod1Mask) 136 if (state & Mod1Mask)
137 flags |= ui::EF_ALT_DOWN; 137 flags |= ui::EF_ALT_DOWN;
138 if (state & LockMask) 138 if (state & LockMask)
139 flags |= ui::EF_CAPS_LOCK_DOWN; 139 flags |= ui::EF_CAPS_LOCK_DOWN;
140 if (state & Mod3Mask)
141 flags |= ui::EF_MOD3_DOWN;
140 if (state & Mod4Mask) 142 if (state & Mod4Mask)
141 flags |= ui::EF_COMMAND_DOWN; 143 flags |= ui::EF_COMMAND_DOWN;
142 if (state & Mod5Mask) 144 if (state & Mod5Mask)
143 flags |= ui::EF_ALTGR_DOWN; 145 flags |= ui::EF_ALTGR_DOWN;
144 if (state & Button1Mask) 146 if (state & Button1Mask)
145 flags |= ui::EF_LEFT_MOUSE_BUTTON; 147 flags |= ui::EF_LEFT_MOUSE_BUTTON;
146 if (state & Button2Mask) 148 if (state & Button2Mask)
147 flags |= ui::EF_MIDDLE_MOUSE_BUTTON; 149 flags |= ui::EF_MIDDLE_MOUSE_BUTTON;
148 if (state & Button3Mask) 150 if (state & Button3Mask)
149 flags |= ui::EF_RIGHT_MOUSE_BUTTON; 151 flags |= ui::EF_RIGHT_MOUSE_BUTTON;
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 DeviceDataManager::GetInstance()->GetGestureTimes( 706 DeviceDataManager::GetInstance()->GetGestureTimes(
705 native_event, start_time, end_time); 707 native_event, start_time, end_time);
706 return true; 708 return true;
707 } 709 }
708 710
709 bool IsTouchpadEvent(const base::NativeEvent& event) { 711 bool IsTouchpadEvent(const base::NativeEvent& event) {
710 return DeviceDataManager::GetInstance()->IsTouchpadXInputEvent(event); 712 return DeviceDataManager::GetInstance()->IsTouchpadXInputEvent(event);
711 } 713 }
712 714
713 } // namespace ui 715 } // namespace ui
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/events/event_rewriter_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698