[aseprite] 156/250: Add support for right and middle click on Skia/OSX port

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 15f4a1629422d30fb22ad7406bce779afc1dcd95
Author: David Capello <davidcapello at gmail.com>
Date:   Tue Oct 13 16:02:18 2015 -0300

    Add support for right and middle click on Skia/OSX port
---
 src/she/osx/view.h  | 13 ++++++++--
 src/she/osx/view.mm | 71 +++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 69 insertions(+), 15 deletions(-)

diff --git a/src/she/osx/view.h b/src/she/osx/view.h
index f319596..a4727ba 100644
--- a/src/she/osx/view.h
+++ b/src/she/osx/view.h
@@ -25,12 +25,21 @@
 - (void)keyDown:(NSEvent*)event;
 - (void)keyUp:(NSEvent*)event;
 - (void)flagsChanged:(NSEvent*)event;
-- (void)mouseDown:(NSEvent*)event;
-- (void)mouseUp:(NSEvent*)event;
 - (void)mouseEntered:(NSEvent*)event;
 - (void)mouseMoved:(NSEvent*)event;
 - (void)mouseExited:(NSEvent*)event;
+- (void)mouseDown:(NSEvent*)event;
+- (void)mouseUp:(NSEvent*)event;
 - (void)mouseDragged:(NSEvent*)event;
+- (void)rightMouseDown:(NSEvent*)event;
+- (void)rightMouseUp:(NSEvent*)event;
+- (void)rightMouseDragged:(NSEvent*)event;
+- (void)otherMouseDown:(NSEvent*)event;
+- (void)otherMouseUp:(NSEvent*)event;
+- (void)otherMouseDragged:(NSEvent*)event;
+- (void)handleMouseDown:(NSEvent*)event;
+- (void)handleMouseUp:(NSEvent*)event;
+- (void)handleMouseDragged:(NSEvent*)event;
 - (void)setFrameSize:(NSSize)newSize;
 - (void)createMouseTrackingArea;
 - (void)destroyMouseTrackingArea;
diff --git a/src/she/osx/view.mm b/src/she/osx/view.mm
index 3389f5e..da9286c 100644
--- a/src/she/osx/view.mm
+++ b/src/she/osx/view.mm
@@ -283,49 +283,94 @@ inline Event::MouseButton get_mouse_buttons(NSEvent* event)
   [super flagsChanged:event];
 }
 
-- (void)mouseDown:(NSEvent*)event
+- (void)mouseEntered:(NSEvent*)event
 {
   Event ev;
-  ev.setType(Event::MouseDown);
+  ev.setType(Event::MouseEnter);
   ev.setPosition(get_local_mouse_pos(self, event));
-  ev.setButton(Event::LeftButton);
   queue_event(ev);
 }
 
-- (void)mouseUp:(NSEvent*)event
+- (void)mouseMoved:(NSEvent*)event
 {
   Event ev;
-  ev.setType(Event::MouseUp);
+  ev.setType(Event::MouseMove);
   ev.setPosition(get_local_mouse_pos(self, event));
-  ev.setButton(Event::LeftButton);
   queue_event(ev);
 }
 
-- (void)mouseEntered:(NSEvent*)event
+- (void)mouseExited:(NSEvent*)event
 {
   Event ev;
-  ev.setType(Event::MouseEnter);
+  ev.setType(Event::MouseLeave);
   ev.setPosition(get_local_mouse_pos(self, event));
   queue_event(ev);
 }
 
-- (void)mouseMoved:(NSEvent*)event
+- (void)mouseDown:(NSEvent*)event
+{
+  [self handleMouseDown:event];
+}
+
+- (void)mouseUp:(NSEvent*)event
+{
+  [self handleMouseUp:event];
+}
+
+- (void)mouseDragged:(NSEvent*)event
+{
+  [self handleMouseDragged:event];
+}
+
+- (void)rightMouseDown:(NSEvent*)event
+{
+  [self handleMouseDown:event];
+}
+
+- (void)rightMouseUp:(NSEvent*)event
+{
+  [self handleMouseUp:event];
+}
+
+- (void)rightMouseDragged:(NSEvent*)event
+{
+  [self handleMouseDragged:event];
+}
+
+- (void)otherMouseDown:(NSEvent*)event
+{
+  [self handleMouseDown:event];
+}
+
+- (void)otherMouseUp:(NSEvent*)event
+{
+  [self handleMouseUp:event];
+}
+
+- (void)otherMouseDragged:(NSEvent*)event
+{
+  [self handleMouseDragged:event];
+}
+
+- (void)handleMouseDown:(NSEvent*)event
 {
   Event ev;
-  ev.setType(Event::MouseMove);
+  ev.setType(Event::MouseDown);
   ev.setPosition(get_local_mouse_pos(self, event));
+  ev.setButton(get_mouse_buttons(event));
   queue_event(ev);
 }
 
-- (void)mouseExited:(NSEvent*)event
+- (void)handleMouseUp:(NSEvent*)event
 {
   Event ev;
-  ev.setType(Event::MouseLeave);
+  ev.setType(Event::MouseUp);
   ev.setPosition(get_local_mouse_pos(self, event));
+  ev.setButton(get_mouse_buttons(event));
   queue_event(ev);
 }
 
-- (void)mouseDragged:(NSEvent*)event
+- (void)handleMouseDragged:(NSEvent*)event
 {
   Event ev;
   ev.setType(Event::MouseMove);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git