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

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

Issue 251493002: MacViews: Implement basic NSEvent -> ui::Event conversion for Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: selfnit Created 6 years, 8 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
« ui/events/events_stub.cc ('K') | « ui/events/win/events_win.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 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 return gfx::Vector2d(0, -kWheelScrollAmount); 532 return gfx::Vector2d(0, -kWheelScrollAmount);
533 case 6: 533 case 6:
534 return gfx::Vector2d(kWheelScrollAmount, 0); 534 return gfx::Vector2d(kWheelScrollAmount, 0);
535 case 7: 535 case 7:
536 return gfx::Vector2d(-kWheelScrollAmount, 0); 536 return gfx::Vector2d(-kWheelScrollAmount, 0);
537 default: 537 default:
538 return gfx::Vector2d(); 538 return gfx::Vector2d();
539 } 539 }
540 } 540 }
541 541
542 base::NativeEvent CopyNativeEvent(const base::NativeEvent& event) {
543 if (!event || event->type == GenericEvent)
544 return NULL;
545 XEvent* copy = new XEvent;
546 *copy = *event;
547 return copy;
548 }
549
550 void ReleaseCopiedNativeEvent(const base::NativeEvent& event) {
551 delete event;
552 }
553
542 void ClearTouchIdIfReleased(const base::NativeEvent& xev) { 554 void ClearTouchIdIfReleased(const base::NativeEvent& xev) {
543 ui::EventType type = ui::EventTypeFromNative(xev); 555 ui::EventType type = ui::EventTypeFromNative(xev);
544 if (type == ui::ET_TOUCH_CANCELLED || 556 if (type == ui::ET_TOUCH_CANCELLED ||
545 type == ui::ET_TOUCH_RELEASED) { 557 type == ui::ET_TOUCH_RELEASED) {
546 ui::TouchFactory* factory = ui::TouchFactory::GetInstance(); 558 ui::TouchFactory* factory = ui::TouchFactory::GetInstance();
547 ui::DeviceDataManager* manager = ui::DeviceDataManager::GetInstance(); 559 ui::DeviceDataManager* manager = ui::DeviceDataManager::GetInstance();
548 double tracking_id; 560 double tracking_id;
549 if (manager->GetEventData( 561 if (manager->GetEventData(
550 *xev, ui::DeviceDataManager::DT_TOUCH_TRACKING_ID, &tracking_id)) { 562 *xev, ui::DeviceDataManager::DT_TOUCH_TRACKING_ID, &tracking_id)) {
551 factory->ReleaseSlotForTrackingID(tracking_id); 563 factory->ReleaseSlotForTrackingID(tracking_id);
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 DeviceDataManager::GetInstance()->GetGestureTimes( 682 DeviceDataManager::GetInstance()->GetGestureTimes(
671 native_event, start_time, end_time); 683 native_event, start_time, end_time);
672 return true; 684 return true;
673 } 685 }
674 686
675 bool IsTouchpadEvent(const base::NativeEvent& event) { 687 bool IsTouchpadEvent(const base::NativeEvent& event) {
676 return DeviceDataManager::GetInstance()->IsTouchpadXInputEvent(event); 688 return DeviceDataManager::GetInstance()->IsTouchpadXInputEvent(event);
677 } 689 }
678 690
679 } // namespace ui 691 } // namespace ui
OLDNEW
« ui/events/events_stub.cc ('K') | « ui/events/win/events_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698