diff options
| author | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2016-11-06 20:25:26 +0100 |
|---|---|---|
| committer | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2016-11-06 20:25:26 +0100 |
| commit | 5b25d6e14b477353165285e4387b6b755cdf387f (patch) | |
| tree | 86a9309c86a62562550d92a609dfbff119275fbb /pugl/pugl/pugl_osx.m | |
| parent | 3a66f1fa75df237f11e646e827aa109f3286f2ce (diff) | |
| parent | 0361919d84ddb24f9c7624f849e05de5cfe8ae57 (diff) | |
| download | canvas_display.lv2-5b25d6e14b477353165285e4387b6b755cdf387f.tar.xz | |
Merge commit '0361919d84ddb24f9c7624f849e05de5cfe8ae57'0.2.0
Diffstat (limited to 'pugl/pugl/pugl_osx.m')
| -rw-r--r-- | pugl/pugl/pugl_osx.m | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/pugl/pugl/pugl_osx.m b/pugl/pugl/pugl_osx.m index e8ecc98..d2681cb 100644 --- a/pugl/pugl/pugl_osx.m +++ b/pugl/pugl/pugl_osx.m @@ -131,6 +131,9 @@ struct PuglInternalsImpl { - (void) rightMouseDragged:(NSEvent*)event; - (void) rightMouseDown:(NSEvent*)event; - (void) rightMouseUp:(NSEvent*)event; +- (void) otherMouseDragged:(NSEvent*)event; +- (void) otherMouseDown:(NSEvent*)event; +- (void) otherMouseUp:(NSEvent*)event; - (void) scrollWheel:(NSEvent*)event; - (void) keyDown:(NSEvent*)event; - (void) keyUp:(NSEvent*)event; @@ -303,6 +306,11 @@ getModifiers(PuglView* view, NSEvent* ev) [self mouseMoved: event]; } +- (void) otherMouseDragged:(NSEvent*)event +{ + [self mouseMoved: event]; +} + - (void) mouseDown:(NSEvent*)event { const NSPoint wloc = [self eventLocation:event]; @@ -317,7 +325,7 @@ getModifiers(PuglView* view, NSEvent* ev) rloc.x, [[NSScreen mainScreen] frame].size.height - rloc.y, getModifiers(puglview, event), - [event buttonNumber] + [event buttonNumber] + 1 }; puglDispatchEvent(puglview, (PuglEvent*)&ev); } @@ -336,7 +344,7 @@ getModifiers(PuglView* view, NSEvent* ev) rloc.x, [[NSScreen mainScreen] frame].size.height - rloc.y, getModifiers(puglview, event), - [event buttonNumber] + [event buttonNumber] + 1 }; puglDispatchEvent(puglview, (PuglEvent*)&ev); [self updateTrackingAreas]; @@ -352,6 +360,16 @@ getModifiers(PuglView* view, NSEvent* ev) [self mouseUp: event]; } +- (void) otherMouseDown:(NSEvent*)event +{ + [self mouseDown: event]; +} + +- (void) otherMouseUp:(NSEvent*)event +{ + [self mouseUp: event]; +} + - (void) scrollWheel:(NSEvent*)event { [self updateTrackingAreas]; |