mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 00:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

(OSX PowerPC) PowerPC Fixed

Browse Source
This commit is contained in:
neville 2018-08-31 21:22:08 +02:00
parent ad15f76ff5
commit 8c3479f850
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/drivers/cocoa/ui_cocoa_msg_window.m
View File

@ -80,7 +80,7 @@ static enum ui_msg_window_response ui_msg_window_cocoa_dialog(ui_msg_window_stat
break; break;
} }
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
[alert beginSheetModalForWindow:(BRIDGE NSWindow *)ui_companion_driver_get_main_window() [alert beginSheetModalForWindow:(BRIDGE NSWindow *)ui_companion_driver_get_main_window()
completionHandler:^(NSModalResponse returnCode) { completionHandler:^(NSModalResponse returnCode) {
[[NSApplication sharedApplication] stopModalWithCode:returnCode]; [[NSApplication sharedApplication] stopModalWithCode:returnCode];

24
ui/drivers/ui_cocoa.m
View File

@ -42,6 +42,7 @@
#import <MetalKit/MetalKit.h> #import <MetalKit/MetalKit.h>
#endif #endif
#if !((defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))))
@interface WindowListener : NSResponder<NSWindowDelegate> @interface WindowListener : NSResponder<NSWindowDelegate>
@end @end
@ -59,6 +60,7 @@
{} {}
@end @end
#endif
id<ApplePlatform> apple_platform; id<ApplePlatform> apple_platform;
@ -72,7 +74,9 @@ id<ApplePlatform> apple_platform;
apple_view_type_t _vt; apple_view_type_t _vt;
NSView* _renderView; NSView* _renderView;
id _sleepActivity; id _sleepActivity;
#if !(defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
WindowListener *_listener; WindowListener *_listener;
#endif
} }
@property (nonatomic, retain) NSWindow IBOutlet* window; @property (nonatomic, retain) NSWindow IBOutlet* window;
@ -261,11 +265,15 @@ static char** waiting_argv;
[self.window setCollectionBehavior:NS_WINDOW_COLLECTION_BEHAVIOR_FULLSCREEN_PRIMARY]; [self.window setCollectionBehavior:NS_WINDOW_COLLECTION_BEHAVIOR_FULLSCREEN_PRIMARY];
} }
#if !(defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
_listener = [WindowListener new]; _listener = [WindowListener new];
#endif
[self.window setAcceptsMouseMovedEvents: YES]; [self.window setAcceptsMouseMovedEvents: YES];
#if !(defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
[self.window setNextResponder:_listener]; [self.window setNextResponder:_listener];
self.window.delegate = _listener; self.window.delegate = _listener;
#endif
[[self.window contentView] setAutoresizesSubviews:YES]; [[self.window contentView] setAutoresizesSubviews:YES];
@ -331,10 +339,12 @@ static char** waiting_argv;
} }
_renderView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable; _renderView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
_renderView.frame = self.window.contentView.bounds; [_renderView setFrame: [[self.window contentView] bounds]];
self.window.contentView = _renderView; self.window.contentView = _renderView;
#if !(defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
[self.window.contentView setNextResponder:_listener]; [self.window.contentView setNextResponder:_listener];
#endif
} }
- (apple_view_type_t)viewType { - (apple_view_type_t)viewType {
@ -349,15 +359,19 @@ static char** waiting_argv;
return [NSApp isActive]; return [NSApp isActive];
} }
#define NS_FULLSCREEN_WINDOW_MASK (1 << 14)
- (void)setVideoMode:(gfx_ctx_mode_t)mode { - (void)setVideoMode:(gfx_ctx_mode_t)mode {
BOOL isFullScreen = (self.window.styleMask & NSFullScreenWindowMask) == NSFullScreenWindowMask; BOOL isFullScreen = (self.window.styleMask & NS_FULLSCREEN_WINDOW_MASK) == NS_FULLSCREEN_WINDOW_MASK;
if (mode.fullscreen && !isFullScreen) SEL fselector = NSSelectorFromString(BOXSTRING("toggleFullScreen"));
if (mode.fullscreen && !isFullScreen && [self.window respondsToSelector:fselector])
{ {
[self.window toggleFullScreen:self]; [self.window toggleFullScreen:self];
return; return;
} }
if (!mode.fullscreen && isFullScreen) if (!mode.fullscreen && isFullScreen && [self.window respondsToSelector:fselector])
{ {
[self.window toggleFullScreen:self]; [self.window toggleFullScreen:self];
} }
@ -379,7 +393,7 @@ static char** waiting_argv;
- (bool)setDisableDisplaySleep:(bool)disable - (bool)setDisableDisplaySleep:(bool)disable
{ {
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
if (disable && _sleepActivity == nil) if (disable && _sleepActivity == nil)
{ {
_sleepActivity = [NSProcessInfo.processInfo beginActivityWithOptions:NSActivityIdleDisplaySleepDisabled reason:@"disable screen saver"]; _sleepActivity = [NSProcessInfo.processInfo beginActivityWithOptions:NSActivityIdleDisplaySleepDisabled reason:@"disable screen saver"];