Change from objective C to objective C++ and rewrite this code in a more natural way.
This commit is contained in:
Steve Checkoway
@@ -4,40 +4,20 @@
|
|||||||
#define LOADING_WINDOW_COCOA_H
|
#define LOADING_WINDOW_COCOA_H
|
||||||
|
|
||||||
#include "LoadingWindow.h"
|
#include "LoadingWindow.h"
|
||||||
#include "RageFile.h"
|
|
||||||
#include "RageUtil.h"
|
|
||||||
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
extern void MakeNewCocoaWindow( const void *data, unsigned length );
|
|
||||||
extern void DisposeOfCocoaWindow();
|
|
||||||
extern void SetCocoaWindowText( const char *s );
|
|
||||||
}
|
|
||||||
|
|
||||||
class LoadingWindow_Cocoa : public LoadingWindow
|
class LoadingWindow_Cocoa : public LoadingWindow
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
LoadingWindow_Cocoa()
|
LoadingWindow_Cocoa();
|
||||||
{
|
~LoadingWindow_Cocoa();
|
||||||
RageFile f;
|
void SetText( RString str );
|
||||||
RString data;
|
|
||||||
|
|
||||||
vector<RString> vs;
|
|
||||||
GetDirListing( "Data/splash*.png", vs, false, true );
|
|
||||||
if( !vs.empty() && f.Open(vs[0]) )
|
|
||||||
f.Read( data );
|
|
||||||
MakeNewCocoaWindow( data.data(), data.length() );
|
|
||||||
}
|
|
||||||
~LoadingWindow_Cocoa() { DisposeOfCocoaWindow(); }
|
|
||||||
|
|
||||||
void SetText( RString str ) { SetCocoaWindowText( str ); }
|
|
||||||
};
|
};
|
||||||
#define USE_LOADING_WINDOW_COCOA
|
#define USE_LOADING_WINDOW_COCOA
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* (c) 2003-2005 Steve Checkoway
|
* (c) 2003-2005, 2008 Steve Checkoway
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
|||||||
@@ -1,122 +0,0 @@
|
|||||||
#import <Cocoa/Cocoa.h>
|
|
||||||
#import "ProductInfo.h"
|
|
||||||
#import "archutils/Darwin/SMMainThread.h"
|
|
||||||
|
|
||||||
void MakeNewCocoaWindow( const void *data, unsigned length );
|
|
||||||
void DisposeOfCocoaWindow( void );
|
|
||||||
void SetCocoaWindowText( const char *s );
|
|
||||||
|
|
||||||
static NSWindow *g_window = nil;
|
|
||||||
static NSTextView *g_text = nil;
|
|
||||||
|
|
||||||
void MakeNewCocoaWindow( const void *data, unsigned length )
|
|
||||||
{
|
|
||||||
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
|
||||||
NSImage *image = nil;
|
|
||||||
|
|
||||||
if( length )
|
|
||||||
{
|
|
||||||
NSData *d = [NSData dataWithBytes:data length:length];
|
|
||||||
|
|
||||||
image = [[[NSImage alloc] initWithData:d] autorelease];
|
|
||||||
}
|
|
||||||
if( !image )
|
|
||||||
return;
|
|
||||||
|
|
||||||
NSView *view;
|
|
||||||
NSSize size = [image size];
|
|
||||||
NSRect viewRect, windowRect;
|
|
||||||
float height = 0.0f;
|
|
||||||
|
|
||||||
NSFont *font = [NSFont systemFontOfSize:0.0f];
|
|
||||||
NSRect textRect;
|
|
||||||
// Just give it a size until it is created.
|
|
||||||
textRect = NSMakeRect( 0, 0, size.width, size.height );
|
|
||||||
g_text = [[[NSTextView alloc] initWithFrame:textRect] autorelease];
|
|
||||||
[g_text setFont:font];
|
|
||||||
height = [[g_text layoutManager] defaultLineHeightForFont:font]*3 + 4;
|
|
||||||
textRect = NSMakeRect( 0, 0, size.width, height );
|
|
||||||
|
|
||||||
[g_text setFrame:textRect];
|
|
||||||
[g_text setEditable:NO];
|
|
||||||
[g_text setSelectable:NO];
|
|
||||||
[g_text setDrawsBackground:YES];
|
|
||||||
[g_text setBackgroundColor:[NSColor lightGrayColor]];
|
|
||||||
[g_text setAlignment:NSCenterTextAlignment];
|
|
||||||
[g_text setString:@"Initializing Hardware..."];
|
|
||||||
|
|
||||||
viewRect = NSMakeRect(0, height, size.width, size.height);
|
|
||||||
NSImageView *iView = [[[NSImageView alloc] initWithFrame:viewRect] autorelease];
|
|
||||||
[iView setImage:image];
|
|
||||||
[iView setImageFrameStyle:NSImageFrameNone];
|
|
||||||
|
|
||||||
windowRect = NSMakeRect( 0, 0, size.width, size.height + height );
|
|
||||||
g_window = [[NSWindow alloc] initWithContentRect:windowRect
|
|
||||||
styleMask:NSTitledWindowMask
|
|
||||||
backing:NSBackingStoreBuffered
|
|
||||||
defer:YES];
|
|
||||||
|
|
||||||
SMMainThread *mt = [[SMMainThread alloc] init];
|
|
||||||
view = [g_window contentView];
|
|
||||||
|
|
||||||
// Set some properties.
|
|
||||||
ADD_ACTIONb( mt, g_window, setOneShot:, YES );
|
|
||||||
ADD_ACTIONb( mt, g_window, setExcludedFromWindowsMenu:, YES );
|
|
||||||
ADD_ACTIONb( mt, g_window, useOptimizedDrawing:, YES );
|
|
||||||
ADD_ACTION1( mt, g_window, setTitle:, @PRODUCT_FAMILY );
|
|
||||||
ADD_ACTION0( mt, g_window, center );
|
|
||||||
// Set subviews.
|
|
||||||
ADD_ACTION1( mt, view, addSubview:, g_text );
|
|
||||||
ADD_ACTION1( mt, view, addSubview:, iView );
|
|
||||||
// Make key and order front.
|
|
||||||
ADD_ACTION1( mt, g_window, makeKeyAndOrderFront:, nil );
|
|
||||||
|
|
||||||
// Perform all of the actions in order on the main thread.
|
|
||||||
[mt performOnMainThread];
|
|
||||||
[mt release];
|
|
||||||
|
|
||||||
[pool release];
|
|
||||||
}
|
|
||||||
|
|
||||||
void DisposeOfCocoaWindow()
|
|
||||||
{
|
|
||||||
// Just in case performSelectorOnMainThread:withObject:waitUntilDone: needs an autorelease pool.
|
|
||||||
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
|
||||||
|
|
||||||
// Released when closed as controlled by setReleasedWhenClosed.
|
|
||||||
[g_window performSelectorOnMainThread:@selector(close) withObject:nil waitUntilDone:NO];
|
|
||||||
[pool release];
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetCocoaWindowText( const char *s )
|
|
||||||
{
|
|
||||||
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
|
||||||
NSString *str = [NSString stringWithUTF8String:s];
|
|
||||||
[g_text performSelectorOnMainThread:@selector(setString:) withObject:(str ? str : @"") waitUntilDone:NO];
|
|
||||||
[pool release];
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* (c) 2003-2006 Steve Checkoway
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
* copy of this software and associated documentation files (the
|
|
||||||
* "Software"), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
|
||||||
* whom the Software is furnished to do so, provided that the above
|
|
||||||
* copyright notice(s) and this permission notice appear in all copies of
|
|
||||||
* the Software and that both the above copyright notice(s) and this
|
|
||||||
* permission notice appear in supporting documentation.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
|
||||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
|
||||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
|
||||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
||||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
||||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
||||||
* PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
@@ -0,0 +1,149 @@
|
|||||||
|
#import <Cocoa/Cocoa.h>
|
||||||
|
#import "ProductInfo.h"
|
||||||
|
#import "LoadingWindow_Cocoa.h"
|
||||||
|
#import "RageUtil.h"
|
||||||
|
#import "RageFile.h"
|
||||||
|
|
||||||
|
@interface LoadingWindowHelper : NSObject
|
||||||
|
{
|
||||||
|
@public
|
||||||
|
NSWindow *m_window;
|
||||||
|
NSTextView *m_text;
|
||||||
|
}
|
||||||
|
- (void) setupWindow:(NSImage *)image;
|
||||||
|
@end
|
||||||
|
|
||||||
|
@implementation LoadingWindowHelper
|
||||||
|
- (void) setupWindow:(NSImage *)image
|
||||||
|
{
|
||||||
|
NSSize size = [image size];
|
||||||
|
NSRect viewRect, windowRect;
|
||||||
|
float height = 0.0f;
|
||||||
|
|
||||||
|
NSFont *font = [NSFont systemFontOfSize:0.0f];
|
||||||
|
NSRect textRect;
|
||||||
|
// Just give it a size until it is created.
|
||||||
|
textRect = NSMakeRect( 0, 0, size.width, size.height );
|
||||||
|
m_text = [[NSTextView alloc] initWithFrame:textRect];
|
||||||
|
[m_text setFont:font];
|
||||||
|
height = [[m_text layoutManager] defaultLineHeightForFont:font]*3 + 4;
|
||||||
|
textRect = NSMakeRect( 0, 0, size.width, height );
|
||||||
|
|
||||||
|
[m_text setFrame:textRect];
|
||||||
|
[m_text setEditable:NO];
|
||||||
|
[m_text setSelectable:NO];
|
||||||
|
[m_text setDrawsBackground:YES];
|
||||||
|
[m_text setBackgroundColor:[NSColor lightGrayColor]];
|
||||||
|
[m_text setAlignment:NSCenterTextAlignment];
|
||||||
|
[m_text setHorizontallyResizable:NO];
|
||||||
|
[m_text setVerticallyResizable:NO];
|
||||||
|
[m_text setString:@"Initializing Hardware..."];
|
||||||
|
|
||||||
|
viewRect = NSMakeRect( 0, height, size.width, size.height );
|
||||||
|
NSImageView *iView = [[NSImageView alloc] initWithFrame:viewRect];
|
||||||
|
[iView setImage:image];
|
||||||
|
[iView setImageFrameStyle:NSImageFrameNone];
|
||||||
|
|
||||||
|
windowRect = NSMakeRect( 0, 0, size.width, size.height + height );
|
||||||
|
m_window = [[NSWindow alloc] initWithContentRect:windowRect
|
||||||
|
styleMask:NSTitledWindowMask
|
||||||
|
backing:NSBackingStoreBuffered
|
||||||
|
defer:YES];
|
||||||
|
|
||||||
|
NSView *view = [m_window contentView];
|
||||||
|
|
||||||
|
// Set some properties.
|
||||||
|
[m_window setOneShot:YES];
|
||||||
|
[m_window setReleasedWhenClosed:YES];
|
||||||
|
[m_window setExcludedFromWindowsMenu:YES];
|
||||||
|
[m_window useOptimizedDrawing:YES];
|
||||||
|
[m_window setTitle:@PRODUCT_FAMILY];
|
||||||
|
[m_window center];
|
||||||
|
|
||||||
|
// Set subviews.
|
||||||
|
[view addSubview:m_text];
|
||||||
|
[view addSubview:iView];
|
||||||
|
[m_text release];
|
||||||
|
[iView release];
|
||||||
|
|
||||||
|
// Display the window.
|
||||||
|
[m_window makeKeyAndOrderFront:nil];
|
||||||
|
}
|
||||||
|
@end
|
||||||
|
|
||||||
|
static LoadingWindowHelper *g_helper = nil;
|
||||||
|
|
||||||
|
LoadingWindow_Cocoa::LoadingWindow_Cocoa()
|
||||||
|
{
|
||||||
|
RageFile f;
|
||||||
|
RString data;
|
||||||
|
|
||||||
|
vector<RString> vs;
|
||||||
|
GetDirListing( "Data/splash*.png", vs, false, true );
|
||||||
|
if( vs.empty() || !f.Open(vs[0]) )
|
||||||
|
return;
|
||||||
|
f.Read( data );
|
||||||
|
if( data.empty() )
|
||||||
|
return;
|
||||||
|
|
||||||
|
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
||||||
|
NSImage *image = nil;
|
||||||
|
NSData *d = [NSData dataWithBytes:data.data() length:data.length()];
|
||||||
|
image = [[NSImage alloc] initWithData:d];
|
||||||
|
if( !image )
|
||||||
|
{
|
||||||
|
[pool release];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
g_helper = [[LoadingWindowHelper alloc] init];
|
||||||
|
[g_helper performSelectorOnMainThread:@selector(setupWindow:) withObject:image waitUntilDone:YES];
|
||||||
|
|
||||||
|
[pool release];
|
||||||
|
}
|
||||||
|
|
||||||
|
LoadingWindow_Cocoa::~LoadingWindow_Cocoa()
|
||||||
|
{
|
||||||
|
if( !g_helper )
|
||||||
|
return;
|
||||||
|
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
||||||
|
[g_helper->m_window performSelectorOnMainThread:@selector(close) withObject:nil waitUntilDone:YES];
|
||||||
|
[g_helper release];
|
||||||
|
g_helper = nil;
|
||||||
|
[pool release];
|
||||||
|
}
|
||||||
|
|
||||||
|
void LoadingWindow_Cocoa::SetText( RString str )
|
||||||
|
{
|
||||||
|
if( !g_helper )
|
||||||
|
return;
|
||||||
|
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
||||||
|
NSString *s = [NSString stringWithUTF8String:str];
|
||||||
|
[g_helper->m_text performSelectorOnMainThread:@selector(setString:) withObject:(s ? s : @"") waitUntilDone:NO];
|
||||||
|
[pool release];
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* (c) 2003-2006, 2008 Steve Checkoway
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
* copy of this software and associated documentation files (the
|
||||||
|
* "Software"), to deal in the Software without restriction, including
|
||||||
|
* without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
* distribute, and/or sell copies of the Software, and to permit persons to
|
||||||
|
* whom the Software is furnished to do so, provided that the above
|
||||||
|
* copyright notice(s) and this permission notice appear in all copies of
|
||||||
|
* the Software and that both the above copyright notice(s) and this
|
||||||
|
* permission notice appear in supporting documentation.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||||
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
||||||
|
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
||||||
|
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
||||||
|
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
||||||
|
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||||
|
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||||
|
* PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
*/
|
||||||
Reference in New Issue
Block a user