We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Proposed patch

rightmouse.diff (text/plain), 2.80 KB, created by Aapo Hanski on 2010-01-05 13:25:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aapo Hanski

Created: 2010-01-05 13:25:19 UTC

Size: 2.80 KB

patch

obsolete

>Index: src/video/cocoa/SDL_cocoawindow.m
>===================================================================
>--- src/video/cocoa/SDL_cocoawindow.m	(revision 5441)
>+++ src/video/cocoa/SDL_cocoawindow.m	(working copy)
>@@ -34,6 +34,25 @@
>     r->origin.y = CGDisplayPixelsHigh(kCGDirectMainDisplay) - r->origin.y - r->size.height;
> }
> 
>+@interface SDLContentView : NSView
>+{
>+    Cocoa_WindowListener *listener;
>+}
>+- (void)setListener:(Cocoa_WindowListener *) theListener;
>+- (void)rightMouseDown:(NSEvent *) theEvent;
>+@end
>+
>+@implementation SDLContentView
>+- (void)setListener:(Cocoa_WindowListener *) theListener
>+{
>+    listener = theListener;
>+}
>+- (void)rightMouseDown:(NSEvent *) theEvent
>+{
>+    [listener rightMouseDown:theEvent];
>+}
>+@end
>+
> @implementation Cocoa_WindowListener
> 
> - (void)listen:(SDL_WindowData *)data
>@@ -46,7 +65,7 @@
> 
>     [_data->window setNextResponder:self];
>     if ([_data->window delegate] != nil) {
>-        [center addObserver:self selector:@selector(windowDisExpose:) name:NSWindowDidExposeNotification object:_data->window];
>+        [center addObserver:self selector:@selector(windowDidExpose:) name:NSWindowDidExposeNotification object:_data->window];
>         [center addObserver:self selector:@selector(windowDidMove:) name:NSWindowDidMoveNotification object:_data->window];
>         [center addObserver:self selector:@selector(windowDidResize:) name:NSWindowDidResizeNotification object:_data->window];
>         [center addObserver:self selector:@selector(windowDidMiniaturize:) name:NSWindowDidMiniaturizeNotification object:_data->window];
>@@ -60,6 +79,9 @@
>     [center addObserver:self selector:@selector(windowDidUnhide:) name:NSApplicationDidUnhideNotification object:NSApp];
> 
>     [_data->window setAcceptsMouseMovedEvents:YES];
>+    
>+    if ([[_data->window contentView] class] == [SDLContentView class])
>+        [[_data->window contentView] setListener:self];
> }
> 
> - (void)close
>@@ -177,7 +199,7 @@
>         button = SDL_BUTTON_MIDDLE;
>         break;
>     default:
>-        button = [theEvent buttonNumber];
>+        button = [theEvent buttonNumber] + 1; /* SDL buttons start at 1 */
>         break;
>     }
>     SDL_SendMouseButton(index, SDL_PRESSED, button);
>@@ -210,7 +232,7 @@
>         button = SDL_BUTTON_MIDDLE;
>         break;
>     default:
>-        button = [theEvent buttonNumber];
>+        button = [theEvent buttonNumber] + 1; /* SDL buttons start at 1 */
>         break;
>     }
>     SDL_SendMouseButton(index, SDL_RELEASED, button);
>@@ -436,6 +458,9 @@
>         }
>     }
>     nswindow = [[SDLWindow alloc] initWithContentRect:rect styleMask:style backing:NSBackingStoreBuffered defer:FALSE screen:screen];
>+    NSView* contentView = [[SDLContentView alloc] initWithFrame:[[nswindow contentView] frame]];
>+    [nswindow setContentView:contentView];
>+    [contentView release];
> 
>     [pool release];

Actions: View | Diff

Attachments on bug 910: 477

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.