encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mac: Translate Ctrl-Left click to right click.

This commit is contained in:
Sam Lantinga 2013-09-13 17:42:31 -07:00
parent e231d5b450
commit 67c02a282a
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/video/cocoa/SDL_cocoawindow.h
View File

@ -30,6 +30,7 @@ typedef struct SDL_WindowData SDL_WindowData;
@interface Cocoa_WindowListener : NSResponder <NSWindowDelegate> { @interface Cocoa_WindowListener : NSResponder <NSWindowDelegate> {
SDL_WindowData *_data; SDL_WindowData *_data;
BOOL observingVisible; BOOL observingVisible;
BOOL wasCtrlLeft;
BOOL wasVisible; BOOL wasVisible;
} }

16
src/video/cocoa/SDL_cocoawindow.m
View File

@ -62,6 +62,7 @@ static void ScheduleContextUpdates(SDL_WindowData *data)
_data = data; _data = data;
observingVisible = YES; observingVisible = YES;
wasCtrlLeft = NO;
wasVisible = [window isVisible]; wasVisible = [window isVisible];
center = [NSNotificationCenter defaultCenter]; center = [NSNotificationCenter defaultCenter];
@ -333,7 +334,13 @@ static void ScheduleContextUpdates(SDL_WindowData *data)
switch ([theEvent buttonNumber]) { switch ([theEvent buttonNumber]) {
case 0: case 0:
button = SDL_BUTTON_LEFT; if ([theEvent modifierFlags] & NSControlKeyMask) {
wasCtrlLeft = YES;
button = SDL_BUTTON_RIGHT;
} else {
wasCtrlLeft = NO;
button = SDL_BUTTON_LEFT;
}
break; break;
case 1: case 1:
button = SDL_BUTTON_RIGHT; button = SDL_BUTTON_RIGHT;
@ -364,7 +371,12 @@ static void ScheduleContextUpdates(SDL_WindowData *data)
switch ([theEvent buttonNumber]) { switch ([theEvent buttonNumber]) {
case 0: case 0:
button = SDL_BUTTON_LEFT; if (wasCtrlLeft) {
button = SDL_BUTTON_RIGHT;
wasCtrlLeft = NO;
} else {
button = SDL_BUTTON_LEFT;
}
break; break;
case 1: case 1:
button = SDL_BUTTON_RIGHT; button = SDL_BUTTON_RIGHT;