ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't bother with a separate NSApplication thread. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6853 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-01-15 11:05:22 +00:00
parent e429d75489
commit 85db30554e
5 changed files with 52 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/CMakeLists.txt
View File

@ -5,7 +5,6 @@ add_subdirectory(Core)
if(wxWidgets_FOUND) if(wxWidgets_FOUND)
add_subdirectory(DebuggerUICommon) add_subdirectory(DebuggerUICommon)
add_subdirectory(DebuggerWX) add_subdirectory(DebuggerWX)
add_subdirectory(InputUICommon)
add_subdirectory(VideoUICommon) add_subdirectory(VideoUICommon)
endif() endif()

3
Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
View File

@ -16,6 +16,7 @@
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include <queue> #include <queue>
#include <stdlib.h>
#include "Common.h" #include "Common.h"
#include "IniFile.h" #include "IniFile.h"
@ -371,7 +372,6 @@ unsigned int Initialize()
// Initialized // Initialized
g_real_wiimotes_initialized = true; g_real_wiimotes_initialized = true;
atexit(WiimoteReal::Shutdown);
g_wiimotes_found = FindWiimotes(g_wiimotes, wanted_wiimotes); g_wiimotes_found = FindWiimotes(g_wiimotes, wanted_wiimotes);
@ -379,6 +379,7 @@ unsigned int Initialize()
g_wiimotes_found, wanted_wiimotes); g_wiimotes_found, wanted_wiimotes);
#ifndef _WIN32 #ifndef _WIN32
atexit(WiimoteReal::Shutdown);
g_wiimotes_found = ConnectWiimotes(g_wiimotes); g_wiimotes_found = ConnectWiimotes(g_wiimotes);
#endif #endif

5
Source/Core/DolphinWX/CMakeLists.txt
View File

@ -43,18 +43,17 @@ if(wxWidgets_FOUND)
Src/UDPConfigDiag.cpp Src/UDPConfigDiag.cpp
Src/WiimoteConfigDiag.cpp Src/WiimoteConfigDiag.cpp
Src/MemoryCards/WiiSaveCrypted.cpp Src/MemoryCards/WiiSaveCrypted.cpp
Src/WXInputBase.cpp
Src/WxUtils.cpp) Src/WxUtils.cpp)
set(WXLIBS debwx set(WXLIBS debwx
debugger_ui_util debugger_ui_util
inputuicommon
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${GTK2_LIBRARIES}) ${GTK2_LIBRARIES})
else(wxWidgets_FOUND) else(wxWidgets_FOUND)
set(SRCS ${SRCS} set(SRCS ${SRCS}
Src/MainNoGUI.cpp Src/MainNoGUI.cpp)
Src/cmdline.c)
endif() endif()
if(WIN32) if(WIN32)

20
Source/Core/DolphinWX/DolphinWX.vcproj
View File

@ -56,7 +56,7 @@
Optimization="3" Optimization="3"
InlineFunctionExpansion="0" InlineFunctionExpansion="0"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include" AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include"
PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="false" StringPooling="false"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -175,7 +175,7 @@
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="false" OmitFramePointers="false"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include" AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include"
PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -287,7 +287,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include" AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_WINDOWS;NOPCH;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_WINDOWS;NOPCH;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -398,7 +398,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include" AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -511,7 +511,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include" AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include"
PreprocessorDefinitions="DEBUGFAST;WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="DEBUGFAST;WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -627,7 +627,7 @@
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include" AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DebuggerUICommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include;..\..\..\Externals\CLRun\include"
PreprocessorDefinitions="DEBUGFAST;WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="DEBUGFAST;WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -1231,6 +1231,14 @@
RelativePath=".\src\stdafx.h" RelativePath=".\src\stdafx.h"
> >
</File> </File>
<File
RelativePath=".\Src\WXInputBase.cpp"
>
</File>
<File
RelativePath=".\Src\WXInputBase.h"
>
</File>
<File <File
RelativePath=".\Src\WxUtils.cpp" RelativePath=".\Src\WxUtils.cpp"
> >

111
Source/Core/DolphinWX/Src/MainNoGUI.cpp
View File

@ -257,87 +257,13 @@ void X11_MainLoop()
} }
#endif #endif
int main(int argc, char* argv[])
{
#ifdef __APPLE__ #ifdef __APPLE__
int cocoaArgc;
char **cocoaArgv;
int appleMain(int argc, char *argv[]);
@interface CocoaThread : NSObject
{
NSThread *Thread;
}
- (void)cocoaThreadStart;
- (void)cocoaThreadRun: (id) sender;
@end
@implementation CocoaThread
#define CocoaThreadHaveFinish @"CocoaThreadHaveFinish"
- (void)cocoaThreadStart
{
[NSThread detachNewThreadSelector: @selector(cocoaThreadRun:)
toTarget: self withObject: nil];
}
- (void)cocoaThreadRun: (id) sender
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
Thread = [NSThread currentThread];
appleMain(cocoaArgc, cocoaArgv);
[pool release];
}
@end
int main(int argc, char *argv[])
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSEvent *event = [[NSEvent alloc] init]; NSEvent *event = [[NSEvent alloc] init];
CocoaThread *thread = [[CocoaThread alloc] init];
ProcessSerialNumber psn; ProcessSerialNumber psn;
cocoaArgc = argc;
cocoaArgv = argv;
GetCurrentProcess(&psn);
TransformProcessType(&psn, kProcessTransformToForegroundApplication);
SetFrontProcess(&psn);
if (NSApp == nil) {
[NSApplication sharedApplication];
//TODO : Create menu
[NSApp finishLaunching];
}
[thread cocoaThreadStart];
while (1)
{
event = [NSApp nextEventMatchingMask: NSKeyDownMask
untilDate: [NSDate distantFuture]
inMode: NSDefaultRunLoopMode dequeue: YES];
if (([event modifierFlags] & NSCommandKeyMask) == 0)
continue;
if ([[event characters] UTF8String][0] == 'q') {
Core::Stop();
break;
} else
[NSApp sendEvent: event];
}
[event release];
[thread release];
[pool release];
}
int appleMain(int argc, char *argv[])
#else
int main(int argc, char* argv[])
#endif #endif
{
int ch, help = 0; int ch, help = 0;
struct option longopts[] = { struct option longopts[] = {
{ "exec", no_argument, NULL, 'e' }, { "exec", no_argument, NULL, 'e' },
@ -380,7 +306,38 @@ int main(int argc, char* argv[])
// No use running the loop when booting fails // No use running the loop when booting fails
if (BootManager::BootCore(argv[optind])) if (BootManager::BootCore(argv[optind]))
{ {
#if defined HAVE_X11 && HAVE_X11 #ifdef __APPLE__
GetCurrentProcess(&psn);
TransformProcessType(&psn, kProcessTransformToForegroundApplication);
SetFrontProcess(&psn);
if (NSApp == nil) {
[NSApplication sharedApplication];
//TODO : Create menu
[NSApp finishLaunching];
}
while (running)
{
event = [NSApp nextEventMatchingMask: NSAnyEventMask
untilDate: [NSDate distantFuture]
inMode: NSDefaultRunLoopMode dequeue: YES];
if ([event type] == NSKeyDown &&
[event modifierFlags] & NSCommandKeyMask &&
[[event characters] UTF8String][0] == 'q')
{
Core::Stop();
break;
}
if ([event type] != NSKeyDown)
[NSApp sendEvent: event];
}
[event release];
[pool release];
#elif defined HAVE_X11 && HAVE_X11
XInitThreads(); XInitThreads();
X11_MainLoop(); X11_MainLoop();
#else #else