sdl-ios-xcode: src/video/cocoa/SDL_cocoaevents.m annotate

annotate src/video/cocoa/SDL_cocoaevents.m @ 5271:e107518710f6

Removed private API use that was causing AppStore rejection Pavel Kanzelsberger to SDL I tried to submit a SDL application to the Mac AppStore and it got rejected because SDL cocoa is using a Private (non-public) API. Problematic part is here: SDL_cocoaevents.m @implementation NSApplication(SDL) - (void)setRunning { _running = 1; } @end Symbol _running in NSApplication is private and shouldn't be used. Any ideas what could I do about this?

author	Sam Lantinga <slouken@libsdl.org>
date	Sat, 12 Feb 2011 07:57:35 -0800
parents	b530ef003506
children

rev	line source
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
5267 b530ef003506 Happy 2011! :) Sam Lantinga <slouken@libsdl.org> parents: 5060 diff changeset	3 Copyright (C) 1997-2011 Sam Lantinga
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 #include "SDL_config.h"
3120 1282a042d530 Temporary workaround for building on 64-bit Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	23 #include "SDL_timer.h"
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25 #include "SDL_cocoavideo.h"
2738 79c1bd651f04 Fixed a bunch of compile warnings on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	26 #include "../../events/SDL_events_c.h"
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	27
3624 9b1af1049f66 Merged r4866:4867 from branches/SDL-1.2: 64-bit Mac OS X 10.5 SDK fix. Ryan C. Gordon <icculus@icculus.org> parents: 3517 diff changeset	28 #if !defined(UsrActivity) && defined(__LP64__) && !defined(__POWER__)
9b1af1049f66 Merged r4866:4867 from branches/SDL-1.2: 64-bit Mac OS X 10.5 SDK fix. Ryan C. Gordon <icculus@icculus.org> parents: 3517 diff changeset	29 /*
9b1af1049f66 Merged r4866:4867 from branches/SDL-1.2: 64-bit Mac OS X 10.5 SDK fix. Ryan C. Gordon <icculus@icculus.org> parents: 3517 diff changeset	30 * Workaround for a bug in the 10.5 SDK: By accident, OSService.h does
9b1af1049f66 Merged r4866:4867 from branches/SDL-1.2: 64-bit Mac OS X 10.5 SDK fix. Ryan C. Gordon <icculus@icculus.org> parents: 3517 diff changeset	31 * not include Power.h at all when compiling in 64bit mode. This has
9b1af1049f66 Merged r4866:4867 from branches/SDL-1.2: 64-bit Mac OS X 10.5 SDK fix. Ryan C. Gordon <icculus@icculus.org> parents: 3517 diff changeset	32 * been fixed in 10.6, but for 10.5, we manually define UsrActivity
9b1af1049f66 Merged r4866:4867 from branches/SDL-1.2: 64-bit Mac OS X 10.5 SDK fix. Ryan C. Gordon <icculus@icculus.org> parents: 3517 diff changeset	33 * to ensure compilation works.
9b1af1049f66 Merged r4866:4867 from branches/SDL-1.2: 64-bit Mac OS X 10.5 SDK fix. Ryan C. Gordon <icculus@icculus.org> parents: 3517 diff changeset	34 */
9b1af1049f66 Merged r4866:4867 from branches/SDL-1.2: 64-bit Mac OS X 10.5 SDK fix. Ryan C. Gordon <icculus@icculus.org> parents: 3517 diff changeset	35 #define UsrActivity 1
9b1af1049f66 Merged r4866:4867 from branches/SDL-1.2: 64-bit Mac OS X 10.5 SDK fix. Ryan C. Gordon <icculus@icculus.org> parents: 3517 diff changeset	36 #endif
3120 1282a042d530 Temporary workaround for building on 64-bit Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	37
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38 /* setAppleMenu disappeared from the headers in 10.4 */
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39 @interface NSApplication(NSAppleMenu)
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40 - (void)setAppleMenu:(NSMenu *)menu;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	41 @end
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	43 @interface SDLAppDelegate : NSObject
05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	44 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	45 @end
05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	46
05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	47 @implementation SDLAppDelegate : NSObject
05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	48 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	49 {
05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	50 SDL_SendQuit();
05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	51 return NSTerminateCancel;
05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	52 }
05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	53 @end
05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	54
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55 static NSString *
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	56 GetApplicationName(void)
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	57 {
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	58 NSDictionary *dict;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	59 NSString *appName = 0;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	60
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	61 /* Determine the application name */
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	62 dict = (NSDictionary *)CFBundleGetInfoDictionary(CFBundleGetMainBundle());
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	63 if (dict)
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	64 appName = [dict objectForKey: @"CFBundleName"];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	65
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	66 if (![appName length])
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	67 appName = [[NSProcessInfo processInfo] processName];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	68
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	69 return appName;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	70 }
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	72 static void
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73 CreateApplicationMenus(void)
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	74 {
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	75 NSString *appName;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	76 NSString *title;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	77 NSMenu *appleMenu;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	78 NSMenu *windowMenu;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	79 NSMenuItem *menuItem;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	80
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	81 /* Create the main menu bar */
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82 [NSApp setMainMenu:[[NSMenu alloc] init]];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	83
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	84 /* Create the application menu */
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	85 appName = GetApplicationName();
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	86 appleMenu = [[NSMenu alloc] initWithTitle:@""];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	87
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	88 /* Add menu items */
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	89 title = [@"About " stringByAppendingString:appName];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	90 [appleMenu addItemWithTitle:title action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	91
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	92 [appleMenu addItem:[NSMenuItem separatorItem]];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	93
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	94 title = [@"Hide " stringByAppendingString:appName];
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	95 [appleMenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@/"h"/""];
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	96
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	97 menuItem = (NSMenuItem )[appleMenu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@/"h"*/""];
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	98 [menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask\|NSCommandKeyMask)];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	99
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	100 [appleMenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	101
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	102 [appleMenu addItem:[NSMenuItem separatorItem]];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	103
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	104 title = [@"Quit " stringByAppendingString:appName];
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	105 [appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@/"q"/""];
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	106
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	107 /* Put menu into the menubar */
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	108 menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	109 [menuItem setSubmenu:appleMenu];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	110 [[NSApp mainMenu] addItem:menuItem];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	111 [menuItem release];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	112
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	113 /* Tell the application object that this is now the application menu */
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	114 [NSApp setAppleMenu:appleMenu];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	115 [appleMenu release];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	116
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	117
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	118 /* Create the window menu */
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	119 windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	120
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	121 /* "Minimize" item */
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	122 menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@/"m"/""];
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	123 [windowMenu addItem:menuItem];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	124 [menuItem release];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	125
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 /* Put menu into the menubar */
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	127 menuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	128 [menuItem setSubmenu:windowMenu];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	129 [[NSApp mainMenu] addItem:menuItem];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	130 [menuItem release];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	131
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	132 /* Tell the application object that this is now the window menu */
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	133 [NSApp setWindowsMenu:windowMenu];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	134 [windowMenu release];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	135 }
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	136
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	137 void
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	138 Cocoa_RegisterApp(void)
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	139 {
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	140 ProcessSerialNumber psn;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	141 NSAutoreleasePool *pool;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	142
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	143 if (!GetCurrentProcess(&psn)) {
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	144 TransformProcessType(&psn, kProcessTransformToForegroundApplication);
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	145 SetFrontProcess(&psn);
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	146 }
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	147
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	148 pool = [[NSAutoreleasePool alloc] init];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	149 if (NSApp == nil) {
1936 83946ee0ff1f Implemented OpenGL support on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 1932 diff changeset	150 [NSApplication sharedApplication];
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	151
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	152 if ([NSApp mainMenu] == nil) {
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	153 CreateApplicationMenus();
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	154 }
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	155 [NSApp finishLaunching];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	156 }
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	157 if ([NSApp delegate] == nil) {
05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	158 [NSApp setDelegate:[[SDLAppDelegate alloc] init]];
05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	159 }
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	160 [pool release];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	161 }
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	162
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	163 void
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	164 Cocoa_PumpEvents(_THIS)
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	165 {
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	166 NSAutoreleasePool *pool;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	167
3025 54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	168 /* Update activity every 30 seconds to prevent screensaver */
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	169 if (_this->suspend_screensaver) {
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	170 SDL_VideoData data = (SDL_VideoData )_this->driverdata;
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	171 Uint32 now = SDL_GetTicks();
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	172 if (!data->screensaver_activity \|\|
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	173 (int)(now-data->screensaver_activity) >= 30000) {
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	174 UpdateSystemActivity(UsrActivity);
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	175 data->screensaver_activity = now;
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	176 }
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	177 }
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	178
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	179 pool = [[NSAutoreleasePool alloc] init];
5271 e107518710f6 Removed private API use that was causing AppStore rejection Sam Lantinga <slouken@libsdl.org> parents: 5267 diff changeset	180 for ( ; ; ) {
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	181 NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES ];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	182 if ( event == nil ) {
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	183 break;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	184 }
4670 ad4f32e874ee Added preliminary touch code to SDL_cocoakeyboard.m jimtla parents: 4669 diff changeset	185
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	186 switch ([event type]) {
3517 e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	187 case NSLeftMouseDown:
e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	188 case NSOtherMouseDown:
e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	189 case NSRightMouseDown:
e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	190 case NSLeftMouseUp:
e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	191 case NSOtherMouseUp:
e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	192 case NSRightMouseUp:
e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	193 case NSLeftMouseDragged:
e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	194 case NSRightMouseDragged:
e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	195 case NSOtherMouseDragged: /* usually middle mouse dragged */
5060 2170edcdfbd0 Fixed mouse button index for additional mouse buttons Sam Lantinga <slouken@libsdl.org> parents: 5057 diff changeset	196 case NSMouseMoved:
5057 bdff53ed6c8b Fix mouse wheel events in fullscreen mode for OS X Jjgod Jiang <gzjjgod@gmail.com> parents: 4925 diff changeset	197 case NSScrollWheel:
3517 e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	198 Cocoa_HandleMouseEvent(_this, event);
e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	199 /* Pass through to NSApp to make sure everything stays in sync */
e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	200 [NSApp sendEvent:event];
e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	201 break;
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	202 case NSKeyDown:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	203 case NSKeyUp:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	204 case NSFlagsChanged:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	205 Cocoa_HandleKeyEvent(_this, event);
1962 c92e5f3e68d9 Hack to stop the beeping Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	206 /* Fall through to pass event to NSApp; er, nevermind... */
3280 00cace2d9080 Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009 Sam Lantinga <slouken@libsdl.org> parents: 3120 diff changeset	207
00cace2d9080 Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009 Sam Lantinga <slouken@libsdl.org> parents: 3120 diff changeset	208 /* Add to support system-wide keyboard shortcuts like CMD+Space */
00cace2d9080 Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009 Sam Lantinga <slouken@libsdl.org> parents: 3120 diff changeset	209 if (([event modifierFlags] & NSCommandKeyMask) \|\| [event type] == NSFlagsChanged)
00cace2d9080 Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009 Sam Lantinga <slouken@libsdl.org> parents: 3120 diff changeset	210 [NSApp sendEvent: event];
1962 c92e5f3e68d9 Hack to stop the beeping Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	211 break;
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	212 default:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	213 [NSApp sendEvent:event];
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	214 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	215 }
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	216 }
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	217 [pool release];
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	218 }
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	219
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	220 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/cocoa/SDL_cocoaevents.m @ 5271:e107518710f6