From e429d75489b959e13fd7d15f0c9a30122e56a9fd Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Sat, 15 Jan 2011 10:33:07 +0000 Subject: [PATCH] Clean up nowx and stop cocoaApp busy-waiting in the main loop. Set up an exit(3) task to shut down real wiimotes. This shouldn't really be necessary, but we do currently handle a number of error conditions by calling exit(3). Retire the inputuicommon library. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6852 8ced0084-cf51-0410-be5f-012b33b47a6e --- CMakeLists.txt | 1 - SConstruct | 1 - Source/Core/Common/Src/FileUtil.cpp | 9 +- .../Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 3 +- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 1 + Source/Core/DolphinWX/Src/Main.cpp | 1 + Source/Core/DolphinWX/Src/MainNoGUI.cpp | 167 ++++--- Source/Core/DolphinWX/Src/Params.ggo | 6 - Source/Core/DolphinWX/Src/SConscript | 23 +- .../Src/WXInputBase.cpp | 52 +-- .../Src/WXInputBase.h | 0 Source/Core/DolphinWX/Src/cmdline.c | 365 --------------- Source/Core/DolphinWX/Src/cmdline.h | 152 ------- Source/Core/DolphinWX/Src/cocoaApp.h | 15 - Source/Core/DolphinWX/Src/cocoaApp.m | 94 ---- Source/Core/InputUICommon/CMakeLists.txt | 4 - .../Core/InputUICommon/InputUICommon.vcproj | 422 ------------------ Source/Core/InputUICommon/Src/SConscript | 12 - 18 files changed, 115 insertions(+), 1213 deletions(-) delete mode 100644 Source/Core/DolphinWX/Src/Params.ggo rename Source/Core/{InputUICommon => DolphinWX}/Src/WXInputBase.cpp (78%) rename Source/Core/{InputUICommon => DolphinWX}/Src/WXInputBase.h (100%) delete mode 100644 Source/Core/DolphinWX/Src/cmdline.c delete mode 100644 Source/Core/DolphinWX/Src/cmdline.h delete mode 100644 Source/Core/DolphinWX/Src/cocoaApp.h delete mode 100644 Source/Core/DolphinWX/Src/cocoaApp.m delete mode 100644 Source/Core/InputUICommon/CMakeLists.txt delete mode 100644 Source/Core/InputUICommon/InputUICommon.vcproj delete mode 100644 Source/Core/InputUICommon/Src/SConscript diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ed4251e15..41671f0696 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -256,7 +256,6 @@ include_directories(Source/Core/DiscIO/Src) include_directories(Source/Core/DolphinWX/Src) include_directories(Source/Core/DSPCore/Src) include_directories(Source/Core/InputCommon/Src) -include_directories(Source/Core/InputUICommon/Src) include_directories(Source/Core/VideoCommon/Src) include_directories(Source/Core/VideoUICommon/Src) diff --git a/SConstruct b/SConstruct index 903dc959bc..a8de696ca2 100644 --- a/SConstruct +++ b/SConstruct @@ -353,7 +353,6 @@ dirs = [ 'Source/Core/DiscIO/Src', 'Source/Core/DolphinWX/Src', 'Source/Core/InputCommon/Src', - 'Source/Core/InputUICommon/Src', 'Source/Core/VideoCommon/Src', 'Source/Core/VideoUICommon/Src', 'Source/DSPTool/Src', diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index c8ef55103f..f37ba1e669 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -598,15 +598,8 @@ std::string GetBundleDirectory() CFStringGetFileSystemRepresentation(BundlePath, AppBundlePath, sizeof(AppBundlePath)); CFRelease(BundleRef); CFRelease(BundlePath); -#if defined(HAVE_WX) && HAVE_WX + return AppBundlePath; -#else - std::string NoWxBundleDirectory; - NoWxBundleDirectory=AppBundlePath; - NoWxBundleDirectory+=DIR_SEP; - NoWxBundleDirectory+="Dolphin.app"; - return NoWxBundleDirectory; -#endif } #endif diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index dc01e7841e..654b71e2a8 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -211,12 +211,13 @@ void Wiimote::RealDisconnect() NOTICE_LOG(WIIMOTE, "Disconnecting wiimote %i", index + 1); + m_connected = false; + [btd closeConnection]; btd = NULL; cchan = NULL; ichan = NULL; - m_connected = false; } int Wiimote::IORead(unsigned char *buf) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 69ca3b927a..4c66d5a60f 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -371,6 +371,7 @@ unsigned int Initialize() // Initialized g_real_wiimotes_initialized = true; + atexit(WiimoteReal::Shutdown); g_wiimotes_found = FindWiimotes(g_wiimotes, wanted_wiimotes); diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 2d833abf07..49e88d45c3 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -321,6 +321,7 @@ bool DolphinApp::OnInit() wxPoint(x, y), wxSize(w, h), UseDebugger, BatchMode, UseLogger); SetTopWindow(main_frame); + main_frame->SetMinSize(wxSize(400, 300)); #if defined HAVE_X11 && HAVE_X11 XInitThreads(); diff --git a/Source/Core/DolphinWX/Src/MainNoGUI.cpp b/Source/Core/DolphinWX/Src/MainNoGUI.cpp index 19ed5faa7a..add529c777 100644 --- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/Src/MainNoGUI.cpp @@ -18,10 +18,7 @@ #include #include #include - -#ifndef _WIN32 -#include -#endif +#include #include "Common.h" #include "FileUtil.h" @@ -33,13 +30,12 @@ #endif #ifdef __APPLE__ -#import "cocoaApp.h" +#import #endif #include "Core.h" #include "Host.h" #include "CPUDetect.h" -#include "cmdline.h" #include "Thread.h" #include "PowerPC/PowerPC.h" #include "HW/Wiimote.h" @@ -49,11 +45,8 @@ #include "LogManager.h" #include "BootManager.h" -#if defined HAVE_X11 && HAVE_X11 -bool running = true; -#endif - bool rendererHasFocus = true; +bool running = true; void Host_NotifyMapLoaded(){} @@ -62,24 +55,20 @@ void Host_ShowJitResults(unsigned int address){} Common::Event updateMainFrameEvent; void Host_Message(int Id) { -#if defined(HAVE_X11) && HAVE_X11 switch (Id) { case WM_USER_STOP: running = false; break; } -#endif } void Host_UpdateTitle(const char* title){}; void Host_UpdateLogDisplay(){} - void Host_UpdateDisasmDialog(){} - void Host_UpdateMainFrame() { updateMainFrameEvent.Set(); @@ -87,10 +76,8 @@ void Host_UpdateMainFrame() void Host_UpdateBreakPointView(){} - void Host_UpdateMemoryView(){} - void Host_SetDebugMode(bool){} void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height) @@ -112,10 +99,9 @@ void Host_ConnectWiimote(int wm_idx, bool connect) {} void Host_SetWaitCursor(bool enable){} - void Host_UpdateStatusBar(const char* _pText, int Filed){} -void Host_SysMessage(const char *fmt, ...) +void Host_SysMessage(const char *fmt, ...) { va_list list; char msg[512]; @@ -271,146 +257,143 @@ void X11_MainLoop() } #endif -//for cocoa we need to hijack the main to get event #ifdef __APPLE__ +int cocoaArgc; +char **cocoaArgv; +int appleMain(int argc, char *argv[]); + @interface CocoaThread : NSObject { NSThread *Thread; } - (void)cocoaThreadStart; -- (void)cocoaThreadRun:(id)sender; -- (void)cocoaThreadQuit:(NSNotification*)note; -- (bool)cocoaThreadRunning; +- (void)cocoaThreadRun: (id) sender; @end -static NSString *CocoaThreadHaveFinish = @"CocoaThreadHaveFinish"; - -int cocoaArgc; -char **cocoaArgv; -int appleMain(int argc, char *argv[]); - @implementation CocoaThread - +#define CocoaThreadHaveFinish @"CocoaThreadHaveFinish" - (void)cocoaThreadStart { - - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cocoaThreadQuit:) name:CocoaThreadHaveFinish object:nil]; - [NSThread detachNewThreadSelector:@selector(cocoaThreadRun:) toTarget:self withObject:nil]; - + [NSThread detachNewThreadSelector: @selector(cocoaThreadRun:) + toTarget: self withObject: nil]; } -- (void)cocoaThreadRun:(id)sender +- (void)cocoaThreadRun: (id) sender { - - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; Thread = [NSThread currentThread]; - //launch main - appleMain(cocoaArgc,cocoaArgv); - - [[NSNotificationCenter defaultCenter] postNotificationName:CocoaThreadHaveFinish object:nil]; + + appleMain(cocoaArgc, cocoaArgv); [pool release]; - } - -- (void)cocoaThreadQuit:(NSNotification*)note -{ - - [[NSNotificationCenter defaultCenter] removeObserver:self]; - -} - -- (bool)cocoaThreadRunning -{ - if([Thread isFinished]) - return false; - else - return true; -} - @end - int main(int argc, char *argv[]) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSEvent *event = [[NSEvent alloc] init]; + CocoaThread *thread = [[CocoaThread alloc] init]; + ProcessSerialNumber psn; cocoaArgc = argc; cocoaArgv = argv; - cocoaCreateApp(); + GetCurrentProcess(&psn); + TransformProcessType(&psn, kProcessTransformToForegroundApplication); + SetFrontProcess(&psn); + + if (NSApp == nil) { + [NSApplication sharedApplication]; + //TODO : Create menu + [NSApp finishLaunching]; + } - CocoaThread *thread = [[CocoaThread alloc] init]; - NSEvent *event = [[NSEvent alloc] init]; - [thread cocoaThreadStart]; - //cocoa event loop - while(1) + while (1) { - event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES ]; - if(cocoaSendEvent(event)) - { + 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; - } - if(![thread cocoaThreadRunning]) - 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 { - gengetopt_args_info args_info; + int ch, help = 0; + struct option longopts[] = { + { "exec", no_argument, NULL, 'e' }, + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, 'v' }, + { NULL, 0, NULL, 0 } + }; - if (cmdline_parser(argc, argv, &args_info) != 0) - return(1); - - if (args_info.inputs_num < 1) - { - fprintf(stderr, "Please supply at least one argument - the ISO to boot.\n"); - return(1); + while ((ch = getopt_long(argc, argv, "eh?v", longopts, 0)) != -1) { + switch (ch) { + case 'e': + break; + case 'h': + case '?': + help = 1; + break; + case 'v': + fprintf(stderr, "%s\n", svn_rev_str); + return 1; + } + } + + if (help == 1 || argc == optind) { + fprintf(stderr, "%s\n\n", svn_rev_str); + fprintf(stderr, "A multi-platform Gamecube/Wii emulator\n\n"); + fprintf(stderr, "Usage: %s [-e ] [-h] [-v]\n", argv[0]); + fprintf(stderr, " -e, --exec Load the specified file\n"); + fprintf(stderr, " -h, --help Show this help message\n"); + fprintf(stderr, " -v, --help Print version and exit\n"); + return 1; } - std::string bootFile(args_info.inputs[0]); updateMainFrameEvent.Init(); - LogManager::Init(); SConfig::Init(); CPluginManager::Init(); - CPluginManager::GetInstance().ScanForPlugins(); + WiimoteReal::LoadSettings(); -#if defined HAVE_X11 && HAVE_X11 - XInitThreads(); -#endif - - if (BootManager::BootCore(bootFile)) //no use running the loop when booting fails + // No use running the loop when booting fails + if (BootManager::BootCore(argv[optind])) { -#if defined(HAVE_X11) && HAVE_X11 +#if defined HAVE_X11 && HAVE_X11 + XInitThreads(); X11_MainLoop(); #else while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN) updateMainFrameEvent.Wait(); #endif } - updateMainFrameEvent.Shutdown(); + updateMainFrameEvent.Shutdown(); WiimoteReal::Shutdown(); CPluginManager::Shutdown(); SConfig::Shutdown(); LogManager::Shutdown(); - cmdline_parser_free (&args_info); - return(0); + return 0; } diff --git a/Source/Core/DolphinWX/Src/Params.ggo b/Source/Core/DolphinWX/Src/Params.ggo deleted file mode 100644 index 2cf3dc6c3f..0000000000 --- a/Source/Core/DolphinWX/Src/Params.ggo +++ /dev/null @@ -1,6 +0,0 @@ -package "Dolphin" -version "SVN" -purpose "A multi platform gamecube/wii emulator" - -option "debug" d "enable debug" flag off - diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 1eb3043283..bc99d08f51 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -54,19 +54,15 @@ if env['HAVE_WX']: else: files += [ 'MainNoGUI.cpp', - 'cmdline.c', ] if sys.platform == 'win32': files += [ "stdafx.cpp" ] -elif sys.platform == 'darwin' and not env['HAVE_WX']: - files += [ 'cocoaApp.m' ] +elif sys.platform == 'darwin': + if env['HAVE_WX']: + wxlibs += env['wxconfiglibs'] ldflags += [ '-Wl,-pagezero_size,0x1000' ] - exeNoGUI = '#' + env['prefix'] + '/DolphinNoGUI' -elif sys.platform == 'darwin' and env['HAVE_WX']: - wxlibs += env['wxconfiglibs'] - ldflags += [ '-Wl,-pagezero_size,0x1000' ] - exeGUI = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin' + exe = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin' env.Install('#' + env['prefix'] + '/Dolphin.app/Contents/' + 'Library/Frameworks/Cg.framework', source = [ @@ -115,15 +111,14 @@ elif sys.platform == 'darwin' and env['HAVE_WX']: else: files += [ 'X11Utils.cpp' ] libs += [ 'SDL' ] - exeGUI = env['binary_dir'] + '/dolphin-emu' - exeNoGUI = env['binary_dir'] + '/dolphin-emu-nogui' + if env['HAVE_WX']: + exe = env['binary_dir'] + '/dolphin-emu' + else: + exe = env['binary_dir'] + '/dolphin-emu-nogui' env.InstallAs(env['data_dir'] + '/sys', '#Data/Sys') env.InstallAs(env['data_dir'] + '/user', '#Data/User') libs = wxlibs + libs + env['LIBS'] linkflags = ldflags + env['LINKFLAGS'] -if env['HAVE_WX']: - env.Program(exeGUI, files, LIBS = libs, LINKFLAGS = linkflags) -else: - env.Program(exeNoGUI, files, LIBS = libs, LINKFLAGS = linkflags) +env.Program(exe, files, LIBS = libs, LINKFLAGS = linkflags) diff --git a/Source/Core/InputUICommon/Src/WXInputBase.cpp b/Source/Core/DolphinWX/Src/WXInputBase.cpp similarity index 78% rename from Source/Core/InputUICommon/Src/WXInputBase.cpp rename to Source/Core/DolphinWX/Src/WXInputBase.cpp index 8bd0d75e6c..96deb64422 100644 --- a/Source/Core/InputUICommon/Src/WXInputBase.cpp +++ b/Source/Core/DolphinWX/Src/WXInputBase.cpp @@ -32,8 +32,8 @@ const wxString WXKeyToString(int keycode) case WXK_DELETE: return _("Delete"); // Undocumented wx keycodes - case 167: return _("Paragraph"); - case 177: return _("Plus-Minus"); + case 167: return _("Paragraph"); + case 177: return _("Plus-Minus"); case WXK_START: return _("Start"); case WXK_LBUTTON: return _("L Button"); @@ -103,34 +103,34 @@ const wxString WXKeyToString(int keycode) case WXK_SCROLL: return _("Scroll Lock"); case WXK_PAGEUP: return _("Page Up"); case WXK_PAGEDOWN: return _("Page Down"); - case WXK_NUMPAD_SPACE: return _("NP Space"); - case WXK_NUMPAD_TAB: return _("NP Tab"); - case WXK_NUMPAD_ENTER: return _("NP Enter"); + case WXK_NUMPAD_SPACE: return _("NP Space"); + case WXK_NUMPAD_TAB: return _("NP Tab"); + case WXK_NUMPAD_ENTER: return _("NP Enter"); case WXK_NUMPAD_F1: return wxT("NP F1"); case WXK_NUMPAD_F2: return wxT("NP F2"); case WXK_NUMPAD_F3: return wxT("NP F3"); case WXK_NUMPAD_F4: return wxT("NP F4"); - case WXK_NUMPAD_HOME: return _("NP Home"); - case WXK_NUMPAD_LEFT: return _("NP Left"); + case WXK_NUMPAD_HOME: return _("NP Home"); + case WXK_NUMPAD_LEFT: return _("NP Left"); case WXK_NUMPAD_UP: return _("NP Up"); - case WXK_NUMPAD_RIGHT: return _("NP Right"); - case WXK_NUMPAD_DOWN: return _("NP Down"); - case WXK_NUMPAD_PAGEUP: return _("NP Page Up"); - case WXK_NUMPAD_PAGEDOWN: return _("NP Page Down"); - case WXK_NUMPAD_END: return _("NP End"); - case WXK_NUMPAD_BEGIN: return _("NP Begin"); - case WXK_NUMPAD_INSERT: return _("NP Insert"); - case WXK_NUMPAD_DELETE: return _("NP Delete"); - case WXK_NUMPAD_EQUAL: return _("NP Equal"); - case WXK_NUMPAD_MULTIPLY: return _("NP Multiply"); - case WXK_NUMPAD_ADD: return _("NP Add"); - case WXK_NUMPAD_SEPARATOR: return _("NP Separator"); - case WXK_NUMPAD_SUBTRACT: return _("NP Subtract"); - case WXK_NUMPAD_DECIMAL: return _("NP Decimal"); - case WXK_NUMPAD_DIVIDE: return _("NP Divide"); - case WXK_WINDOWS_LEFT: return _("Windows Left"); - case WXK_WINDOWS_RIGHT: return _("Windows Right"); - case WXK_WINDOWS_MENU: return _("Windows Menu"); + case WXK_NUMPAD_RIGHT: return _("NP Right"); + case WXK_NUMPAD_DOWN: return _("NP Down"); + case WXK_NUMPAD_PAGEUP: return _("NP Page Up"); + case WXK_NUMPAD_PAGEDOWN: return _("NP Page Down"); + case WXK_NUMPAD_END: return _("NP End"); + case WXK_NUMPAD_BEGIN: return _("NP Begin"); + case WXK_NUMPAD_INSERT: return _("NP Insert"); + case WXK_NUMPAD_DELETE: return _("NP Delete"); + case WXK_NUMPAD_EQUAL: return _("NP Equal"); + case WXK_NUMPAD_MULTIPLY: return _("NP Multiply"); + case WXK_NUMPAD_ADD: return _("NP Add"); + case WXK_NUMPAD_SEPARATOR: return _("NP Separator"); + case WXK_NUMPAD_SUBTRACT: return _("NP Subtract"); + case WXK_NUMPAD_DECIMAL: return _("NP Decimal"); + case WXK_NUMPAD_DIVIDE: return _("NP Divide"); + case WXK_WINDOWS_LEFT: return _("Windows Left"); + case WXK_WINDOWS_RIGHT: return _("Windows Right"); + case WXK_WINDOWS_MENU: return _("Windows Menu"); case WXK_COMMAND: return _("Command"); } @@ -152,7 +152,7 @@ const wxString WXKeymodToString(int modifier) // wxWidgets can only use Alt/Ctrl/Shift as menu accelerators, // so Meta (Command on OS X) is simply made equivalent to Ctrl. case wxMOD_META: return wxT("Ctrl"); - default: return wxT(""); + default: return wxT(""); } } diff --git a/Source/Core/InputUICommon/Src/WXInputBase.h b/Source/Core/DolphinWX/Src/WXInputBase.h similarity index 100% rename from Source/Core/InputUICommon/Src/WXInputBase.h rename to Source/Core/DolphinWX/Src/WXInputBase.h diff --git a/Source/Core/DolphinWX/Src/cmdline.c b/Source/Core/DolphinWX/Src/cmdline.c deleted file mode 100644 index a72c623ed5..0000000000 --- a/Source/Core/DolphinWX/Src/cmdline.c +++ /dev/null @@ -1,365 +0,0 @@ -/* - File autogenerated by gengetopt version 2.21 - generated with the following command: - gengetopt --unamed-opt=ISOFILE -i Params.ggo - - The developers of gengetopt consider the fixed text that goes in all - gengetopt output files to be in the public domain: - we make no copyright claims on it. -*/ - -/* If we use autoconf. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -#include "getopt.h" - -#include "cmdline.h" - -const char *gengetopt_args_info_purpose = "A multi platform gamecube/wii emulator"; - -const char *gengetopt_args_info_usage = "Usage: Dolphin [OPTIONS]... [ISOFILE]..."; - -const char *gengetopt_args_info_description = ""; - -const char *gengetopt_args_info_help[] = { - " -h, --help Print help and exit", - " -V, --version Print version and exit", - " -d, --debug enable debug (default=off)", - 0 -}; - -static -void clear_given (struct gengetopt_args_info *args_info); -static -void clear_args (struct gengetopt_args_info *args_info); - -static int -cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_info *args_info, - struct cmdline_parser_params *params, const char *additional_error); - - -static char * -gengetopt_strdup (const char *s); - -static -void clear_given (struct gengetopt_args_info *args_info) -{ - args_info->help_given = 0 ; - args_info->version_given = 0 ; - args_info->debug_given = 0 ; -} - -static -void clear_args (struct gengetopt_args_info *args_info) -{ - args_info->debug_flag = 0; - -} - -static -void init_args_info(struct gengetopt_args_info *args_info) -{ - args_info->help_help = gengetopt_args_info_help[0] ; - args_info->version_help = gengetopt_args_info_help[1] ; - args_info->debug_help = gengetopt_args_info_help[2] ; - -} - -void -cmdline_parser_print_version (void) -{ - printf ("%s %s\n", CMDLINE_PARSER_PACKAGE, CMDLINE_PARSER_VERSION); -} - -void -cmdline_parser_print_help (void) -{ - int i = 0; - cmdline_parser_print_version (); - - if (strlen(gengetopt_args_info_purpose) > 0) - printf("\n%s\n", gengetopt_args_info_purpose); - - printf("\n%s\n\n", gengetopt_args_info_usage); - - if (strlen(gengetopt_args_info_description) > 0) - printf("%s\n", gengetopt_args_info_description); - - while (gengetopt_args_info_help[i]) - printf("%s\n", gengetopt_args_info_help[i++]); -} - -void -cmdline_parser_init (struct gengetopt_args_info *args_info) -{ - clear_given (args_info); - clear_args (args_info); - init_args_info (args_info); - - args_info->inputs = NULL; - args_info->inputs_num = 0; -} - -struct cmdline_parser_params * -cmdline_parser_params_init() -{ - struct cmdline_parser_params *params = - (struct cmdline_parser_params *)malloc(sizeof(struct cmdline_parser_params)); - - if (params) - { - params->override = 0; - params->initialize = 0; - params->check_required = 0; - params->check_ambiguity = 0; - } - - return params; -} - -static void -cmdline_parser_release (struct gengetopt_args_info *args_info) -{ - - unsigned int i; - - for (i = 0; i < args_info->inputs_num; ++i) - free (args_info->inputs [i]); - - if (args_info->inputs_num) - free (args_info->inputs); - - clear_given (args_info); -} - -int -cmdline_parser_file_save(const char *filename, struct gengetopt_args_info *args_info) -{ - FILE *outfile; - int i = 0; - - outfile = fopen(filename, "w"); - - if (!outfile) - { - fprintf (stderr, "%s: cannot open file for writing: %s\n", CMDLINE_PARSER_PACKAGE, filename); - return EXIT_FAILURE; - } - - if (args_info->help_given) { - fprintf(outfile, "%s\n", "help"); - } - if (args_info->version_given) { - fprintf(outfile, "%s\n", "version"); - } - if (args_info->debug_given) { - fprintf(outfile, "%s\n", "debug"); - } - - fclose (outfile); - - i = EXIT_SUCCESS; - return i; -} - -void -cmdline_parser_free (struct gengetopt_args_info *args_info) -{ - cmdline_parser_release (args_info); -} - - -/* gengetopt_strdup() */ -/* strdup.c replacement of strdup, which is not standard */ -char * -gengetopt_strdup (const char *s) -{ - char *result = NULL; - if (!s) - return result; - - result = (char*)malloc(strlen(s) + 1); - if (result == (char*)0) - return (char*)0; - strcpy(result, s); - return result; -} - -int -cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info) -{ - return cmdline_parser2 (argc, argv, args_info, 0, 1, 1); -} - -int -cmdline_parser_ext (int argc, char * const *argv, struct gengetopt_args_info *args_info, - struct cmdline_parser_params *params) -{ - int result; - result = cmdline_parser_internal (argc, argv, args_info, params, NULL); - - if (result == EXIT_FAILURE) - { - cmdline_parser_free (args_info); - exit (EXIT_FAILURE); - } - - return result; -} - -int -cmdline_parser2 (int argc, char * const *argv, struct gengetopt_args_info *args_info, int override, int initialize, int check_required) -{ - int result; - struct cmdline_parser_params params; - - params.override = override; - params.initialize = initialize; - params.check_required = check_required; - params.check_ambiguity = 0; - - result = cmdline_parser_internal (argc, argv, args_info, ¶ms, NULL); - - if (result == EXIT_FAILURE) - { - cmdline_parser_free (args_info); - exit (EXIT_FAILURE); - } - - return result; -} - -int -cmdline_parser_required (struct gengetopt_args_info *args_info, const char *prog_name) -{ - return EXIT_SUCCESS; -} - -int -cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_info *args_info, - struct cmdline_parser_params *params, const char *additional_error) -{ - int c; /* Character of the parsed option. */ - - int error = 0; - struct gengetopt_args_info local_args_info; - - int override; - int initialize; - int check_required; - int check_ambiguity; - - override = params->override; - initialize = params->initialize; - check_required = params->check_required; - check_ambiguity = params->check_ambiguity; - - if (initialize) - cmdline_parser_init (args_info); - - cmdline_parser_init (&local_args_info); - - optarg = 0; - optind = 0; - opterr = 1; - optopt = '?'; - - while (1) - { - int option_index = 0; - char *stop_char; - - static struct option long_options[] = { - { "help", 0, NULL, 'h' }, - { "version", 0, NULL, 'V' }, - { "debug", 0, NULL, 'd' }, - { NULL, 0, NULL, 0 } - }; - - stop_char = 0; - c = getopt_long (argc, argv, "hVd", long_options, &option_index); - - if (c == -1) break; /* Exit from `while (1)' loop. */ - - switch (c) - { - case 'h': /* Print help and exit. */ - cmdline_parser_print_help (); - cmdline_parser_free (&local_args_info); - exit (EXIT_SUCCESS); - - case 'V': /* Print version and exit. */ - cmdline_parser_print_version (); - cmdline_parser_free (&local_args_info); - exit (EXIT_SUCCESS); - - case 'd': /* enable debug. */ - if (local_args_info.debug_given || (check_ambiguity && args_info->debug_given)) - { - fprintf (stderr, "%s: `--debug' (`-d') option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); - goto failure; - } - if (args_info->debug_given && ! override) - continue; - local_args_info.debug_given = 1; - args_info->debug_given = 1; - args_info->debug_flag = !(args_info->debug_flag); - break; - - - case 0: /* Long option with no short option */ - case '?': /* Invalid option. */ - /* `getopt_long' already printed an error message. */ - goto failure; - - default: /* bug: option not considered. */ - fprintf (stderr, "%s: option unknown: %c%s\n", CMDLINE_PARSER_PACKAGE, c, (additional_error ? additional_error : "")); - abort (); - } /* switch */ - } /* while */ - - - - - cmdline_parser_release (&local_args_info); - - if ( error ) - return (EXIT_FAILURE); - - if (optind < argc) - { - int i = 0 ; - int found_prog_name = 0; - /* whether program name, i.e., argv[0], is in the remaining args - (this may happen with some implementations of getopt, - but surely not with the one included by gengetopt) */ - - i = optind; - while (i < argc) - if (argv[i++] == argv[0]) { - found_prog_name = 1; - break; - } - i = 0; - - args_info->inputs_num = argc - optind - found_prog_name; - args_info->inputs = - (char **)(malloc ((args_info->inputs_num)*sizeof(char *))) ; - while (optind < argc) - if (argv[optind++] != argv[0]) - args_info->inputs[ i++ ] = gengetopt_strdup (argv[optind-1]) ; - } - - return 0; - -failure: - - cmdline_parser_release (&local_args_info); - return (EXIT_FAILURE); -} diff --git a/Source/Core/DolphinWX/Src/cmdline.h b/Source/Core/DolphinWX/Src/cmdline.h deleted file mode 100644 index b6440e41a9..0000000000 --- a/Source/Core/DolphinWX/Src/cmdline.h +++ /dev/null @@ -1,152 +0,0 @@ -/** @file cmdline.h - * @brief The header file for the command line option parser - * generated by GNU Gengetopt version 2.21 - * http://www.gnu.org/software/gengetopt. - * DO NOT modify this file, since it can be overwritten - * @author GNU Gengetopt by Lorenzo Bettini */ - -#ifndef CMDLINE_H -#define CMDLINE_H - -/* If we use autoconf. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#ifndef CMDLINE_PARSER_PACKAGE -/** @brief the program name */ -#define CMDLINE_PARSER_PACKAGE "Dolphin" -#endif - -#ifndef CMDLINE_PARSER_VERSION -/** @brief the program version */ -#define CMDLINE_PARSER_VERSION "SVN" -#endif - -/** @brief Where the command line options are stored */ -struct gengetopt_args_info -{ - const char *help_help; /**< @brief Print help and exit help description. */ - const char *version_help; /**< @brief Print version and exit help description. */ - int debug_flag; /**< @brief enable debug (default=off). */ - const char *debug_help; /**< @brief enable debug help description. */ - - int help_given ; /**< @brief Whether help was given. */ - int version_given ; /**< @brief Whether version was given. */ - int debug_given ; /**< @brief Whether debug was given. */ - - char **inputs ; /**< @brief unamed options (options without names) */ - unsigned inputs_num ; /**< @brief unamed options number */ -} ; - -/** @brief The additional parameters to pass to parser functions */ -struct cmdline_parser_params -{ - int override; /**< @brief whether to override possibly already present options (default 0) */ - int initialize; /**< @brief whether to initialize the option structure gengetopt_args_info (default 0) */ - int check_required; /**< @brief whether to check that all required options were provided (default 0) */ - int check_ambiguity; /**< @brief whether to check for options already specified in the option structure gengetopt_args_info (default 0) */ -} ; - -/** @brief the purpose string of the program */ -extern const char *gengetopt_args_info_purpose; -/** @brief the usage string of the program */ -extern const char *gengetopt_args_info_usage; -/** @brief all the lines making the help output */ -extern const char *gengetopt_args_info_help[]; - -/** - * The command line parser - * @param argc the number of command line options - * @param argv the command line options - * @param args_info the structure where option information will be stored - * @return 0 if everything went fine, NON 0 if an error took place - */ -int cmdline_parser (int argc, char * const *argv, - struct gengetopt_args_info *args_info); - -/** - * The command line parser (version with additional parameters - deprecated) - * @param argc the number of command line options - * @param argv the command line options - * @param args_info the structure where option information will be stored - * @param override whether to override possibly already present options - * @param initialize whether to initialize the option structure my_args_info - * @param check_required whether to check that all required options were provided - * @return 0 if everything went fine, NON 0 if an error took place - * @deprecated use cmdline_parser_ext() instead - */ -int cmdline_parser2 (int argc, char * const *argv, - struct gengetopt_args_info *args_info, - int override, int initialize, int check_required); - -/** - * The command line parser (version with additional parameters) - * @param argc the number of command line options - * @param argv the command line options - * @param args_info the structure where option information will be stored - * @param params additional parameters for the parser - * @return 0 if everything went fine, NON 0 if an error took place - */ -int cmdline_parser_ext (int argc, char * const *argv, - struct gengetopt_args_info *args_info, - struct cmdline_parser_params *params); - -/** - * Save the contents of the option struct into a (text) file. - * This file can be read by the config file parser (if generated by gengetopt) - * @param filename the file where to save - * @param args_info the option struct to save - * @return 0 if everything went fine, NON 0 if an error took place - */ -int cmdline_parser_file_save(const char *filename, - struct gengetopt_args_info *args_info); - -/** - * Print the help - */ -void cmdline_parser_print_help(void); -/** - * Print the version - */ -void cmdline_parser_print_version(void); - -/** - * Allocates dynamically a cmdline_parser_params structure and initializes - * all its fields to 0 - * @return the initialized cmdline_parser_params structure - */ -struct cmdline_parser_params *cmdline_parser_params_init(); - -/** - * Initializes the passed gengetopt_args_info structure's fields - * (also set default values for options that have a default) - * @param args_info the structure to initialize - */ -void cmdline_parser_init (struct gengetopt_args_info *args_info); -/** - * Deallocates the string fields of the gengetopt_args_info structure - * (but does not deallocate the structure itself) - * @param args_info the structure to deallocate - */ -void cmdline_parser_free (struct gengetopt_args_info *args_info); - -/** - * Checks that all the required options were specified - * @param args_info the structure to check - * @param prog_name the name of the program that will be used to print - * possible errors - * @return - */ -int cmdline_parser_required (struct gengetopt_args_info *args_info, - const char *prog_name); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ -#endif /* CMDLINE_H */ diff --git a/Source/Core/DolphinWX/Src/cocoaApp.h b/Source/Core/DolphinWX/Src/cocoaApp.h deleted file mode 100644 index 81e3d17704..0000000000 --- a/Source/Core/DolphinWX/Src/cocoaApp.h +++ /dev/null @@ -1,15 +0,0 @@ -#import - -#ifdef __cplusplus -extern "C" -{ -#endif - -bool cocoaSendEvent(NSEvent *event); - -void cocoaCreateApp(); - -#ifdef __cplusplus -} -#endif - diff --git a/Source/Core/DolphinWX/Src/cocoaApp.m b/Source/Core/DolphinWX/Src/cocoaApp.m deleted file mode 100644 index dfcc92f8da..0000000000 --- a/Source/Core/DolphinWX/Src/cocoaApp.m +++ /dev/null @@ -1,94 +0,0 @@ -#import "cocoaApp.h" - -@implementation NSApplication(i) -- (void)appRunning -{ - _running = 1; -} -@end - -@interface cocoaAppDelegate : NSObject -- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender; -@end - -@implementation cocoaAppDelegate : NSObject -- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender -{ - return NSTerminateCancel; -} -@end - -void cocoaCreateApp() -{ - ProcessSerialNumber psn; - - if (!GetCurrentProcess(&psn)) { - TransformProcessType(&psn, - kProcessTransformToForegroundApplication); - SetFrontProcess(&psn); - } - - if (NSApp == nil) { - [NSApplication sharedApplication]; - //TODO : Create menu - [NSApp finishLaunching]; - } - - if ([NSApp delegate] == nil) { - [NSApp setDelegate:[[cocoaAppDelegate alloc] init]]; - } - - [NSApp appRunning]; -} - -bool cocoaKeyCode(NSEvent *event) -{ - static bool CMDDown = false, QDown = false; - bool Return = false; - - NSConnection *connec = [[NSConnection new] autorelease]; - - [connec setRootObject: event]; - if ([connec registerName: @"DolphinCocoaEvent"] == NO) - { - //printf("error creating nsconnection\n"); - } - - if( [event type] != NSFlagsChanged ) - { - const char *Keys = [[event characters] UTF8String]; - - if( Keys[0] == 'q' && [event type] == NSKeyDown ) - QDown = true; - if( Keys[0] == 'q' && [event type] == NSKeyUp ) - QDown = false; - } - else - if( [event modifierFlags] & NSCommandKeyMask ) - CMDDown = true; - else - CMDDown = false; - - if( QDown && CMDDown ) - Return = true; - - return Return; -} - -bool cocoaSendEvent(NSEvent *event) -{ - if ( event != nil ) { - switch ([event type]) { - case NSKeyDown: - case NSKeyUp: - case NSFlagsChanged: // For Command - return cocoaKeyCode(event); - break; - default: - [NSApp sendEvent:event]; - break; - } - } - - return false; -} diff --git a/Source/Core/InputUICommon/CMakeLists.txt b/Source/Core/InputUICommon/CMakeLists.txt deleted file mode 100644 index eea7e1b3d4..0000000000 --- a/Source/Core/InputUICommon/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -set(SRCS Src/WXInputBase.cpp) - -add_library(inputuicommon ${SRCS}) -target_link_libraries(inputuicommon inputcommon) diff --git a/Source/Core/InputUICommon/InputUICommon.vcproj b/Source/Core/InputUICommon/InputUICommon.vcproj deleted file mode 100644 index 65c3070082..0000000000 --- a/Source/Core/InputUICommon/InputUICommon.vcproj +++ /dev/null @@ -1,422 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Core/InputUICommon/Src/SConscript b/Source/Core/InputUICommon/Src/SConscript deleted file mode 100644 index b7cdc6ed1b..0000000000 --- a/Source/Core/InputUICommon/Src/SConscript +++ /dev/null @@ -1,12 +0,0 @@ -# -*- python -*- - -Import('env') - -if not env['HAVE_WX']: - Return() - -files = [ - 'WXInputBase.cpp', - ] - -env.StaticLibrary(env['local_libs'] + 'inputuicommon', files)