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

Much work on menus, gui features. Partially-working recent-isos menu list. Bugfix for some of the new console stuff that could have caused some funny bunny business, or crashes, in a few games. Why dat wascaly wabbit! >_< 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2100 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-10-31 10:03:07 +00:00
parent c274d4e43c
commit 4cb8e21f94
27 changed files with 1215 additions and 771 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
common/include/PluginCallbacks.h
View File

@ -268,8 +268,13 @@ typedef struct _PS2E_MenuItemInfo
// Specifies the handle of a sub menu to bind to this menu. If NULL, the menu is // Specifies the handle of a sub menu to bind to this menu. If NULL, the menu is
// created normally. If non-NULL, the menu item will use sub-menu mode and will // created normally. If non-NULL, the menu item will use sub-menu mode and will
// ignore the Style field. // ignore the Style field.
PS2E_MenuHandle* SubMenu; PS2E_MenuHandle SubMenu;
// Menu that this item is attached to. When this struct is passed into AddMenuItem,
// the menu item will be automatically appended to the menu specified in this field
// if the field is non-NULL (if the field is NULL then no action is taken).
PS2E_MenuHandle OwnerMenu;
// When FALSE the menu item will appear grayed out to the user, and unselectable. // When FALSE the menu item will appear grayed out to the user, and unselectable.
BOOL Enabled; BOOL Enabled;
@ -340,7 +345,7 @@ typedef struct _PS2E_MenuItemAPI
// fashion. When a submenu is assigned, the Style attribute of the menu will be // fashion. When a submenu is assigned, the Style attribute of the menu will be
// ignored. Passing NULL into this function will clear the submenu and return the // ignored. Passing NULL into this function will clear the submenu and return the
// menu item to whatever it's current Style attribute is set to. // menu item to whatever it's current Style attribute is set to.
void (PS2E_CALLBACK* MenuItem_SetSubMenu)( PS2E_MenuItemHandle mitem, PS2E_MenuHandle* submenu ); void (PS2E_CALLBACK* MenuItem_SetSubMenu)( PS2E_MenuItemHandle mitem, PS2E_MenuHandle submenu );
// Assigns the callback function for this menu (important!). If passed NULL, the menu // Assigns the callback function for this menu (important!). If passed NULL, the menu
// item will be automatically disabled (grayed out) by the emulator. // item will be automatically disabled (grayed out) by the emulator.
@ -352,6 +357,8 @@ typedef struct _PS2E_MenuItemAPI
// Returns the current enable status of the specified menu item. // Returns the current enable status of the specified menu item.
BOOL (PS2E_CALLBACK* MenuItem_IsEnabled)( PS2E_MenuItemHandle mitem ); BOOL (PS2E_CALLBACK* MenuItem_IsEnabled)( PS2E_MenuItemHandle mitem );
void* reserved[4];
} PS2E_MenuItemAPI; } PS2E_MenuItemAPI;
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
@ -437,6 +444,18 @@ typedef struct _PS2E_EmulatorInfo
// resources. // resources.
int LogicalCores; int LogicalCores;
// Specifies the size of the wchar_t of the emulator, in bytes. Plugin authors should be
// sure to check this against your own sizeof(wchar_t) before using any API that has
// a wchar_t parameter (such as the ConsoleWriterWide interface). wchar_t is a loosely
// defined type that can range from 8 bits to 32 bits (realistically, although there is
// no actual limit on size), and can vary between compilers for the same platform.
int Sizeof_wchar_t;
// Reserved area for future expansion of the structure (avoids having to upgrade the
// plugin api for amending new extensions).
int reserved1[6];
// GetInt // GetInt
// Self-explanatory. // Self-explanatory.
// //
@ -496,19 +515,19 @@ typedef struct _PS2E_EmulatorInfo
// //
void (PS2E_CALLBACK* OSD_WriteLn)( int icon, const char* msg ); void (PS2E_CALLBACK* OSD_WriteLn)( int icon, const char* msg );
void (PS2E_CALLBACK* AddMenuItem)( const PS2E_MenuItemInfo* item );
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Menu / MenuItem Section // Menu / MenuItem Section
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void (PS2E_CALLBACK* AddMenuItem)( const PS2E_MenuItemInfo* item );
// Allocates a new menu handle and returns it. The returned menu can have any valid existing // Allocates a new menu handle and returns it. The returned menu can have any valid existing
// menu items bound to it, and can be assigned as a submenu to any created MenuItem. The menu // menu items bound to it, and can be assigned as a submenu to any created MenuItem. The menu
// can belong to multiple menu items, however menu items can only belong to a single menu. // can belong to multiple menu items, however menu items can only belong to a single menu.
PS2E_MenuHandle (PS2E_CALLBACK* Menu_Create)( PS2E_THISPTR thisptr ); PS2E_MenuHandle (PS2E_CALLBACK* Menu_Create)( PS2E_THISPTR thisptr );
// Deletes the specified menu and frees its allocated memory resources. NULL pointers are // Deletes the specified menu and frees its allocated memory resources. NULL pointers are
// safely ignored. Any menu itels also attached to this menu will be deleted. Even if you // safely ignored. Any menu items also attached to this menu will be deleted. Even if you
// do not explicitly delete your plugin's menu resources, the emulator will do automatic // do not explicitly delete your plugin's menu resources, the emulator will do automatic
// cleanup after the plugin's instance is free'd. // cleanup after the plugin's instance is free'd.
void (PS2E_CALLBACK* Menu_Delete)( PS2E_MenuHandle handle ); void (PS2E_CALLBACK* Menu_Delete)( PS2E_MenuHandle handle );
@ -533,6 +552,8 @@ typedef struct _PS2E_EmulatorInfo
// side before using this interface. See PS2E_ConsoleWriterWideAPI comments for more info. // side before using this interface. See PS2E_ConsoleWriterWideAPI comments for more info.
PS2E_ConsoleWriterWideAPI ConsoleW; PS2E_ConsoleWriterWideAPI ConsoleW;
void* reserved2[8];
} PS2E_EmulatorInfo; } PS2E_EmulatorInfo;
@ -797,7 +818,7 @@ typedef struct _PS2E_LibraryAPI
// Reserved area at the end of the structure, for future API expansion. This area // Reserved area at the end of the structure, for future API expansion. This area
// should always be zeroed out, so that future versions of emulators that may have // should always be zeroed out, so that future versions of emulators that may have
// defined functions here will recognize the functions as not supported. // defined functions here will recognize the functions as not supported by the plugin.
void* reserved[12]; void* reserved[12];
} PS2E_LibraryAPI; } PS2E_LibraryAPI;

5
pcsx2/HwWrite.cpp
View File

@ -179,8 +179,11 @@ void hwWrite8(u32 mem, u8 value)
if (( value == '\r' ) || ( sio_count == 1023 ) || if (( value == '\r' ) || ( sio_count == 1023 ) ||
( value == '\n' && sio_count != 0 )) ( value == '\n' && sio_count != 0 ))
{ {
// Use "%s" below even though it feels indirect -- it's necessary to avoid
// errors if/when games use printf formatting control chars.
sio_buffer[sio_count] = 0; sio_buffer[sio_count] = 0;
Console.WriteLn( ConColor_EE, ShiftJIS_ConvertString(sio_buffer) ); Console.WriteLn( ConColor_EE, L"%s", ShiftJIS_ConvertString(sio_buffer).c_str() );
sio_count = 0; sio_count = 0;
} }
else if( value != '\n' ) else if( value != '\n' )

13
pcsx2/IopBios.cpp
View File

@ -174,9 +174,7 @@ void bios_write() // 0x35/0x03
if (a0 == 1) // stdout if (a0 == 1) // stdout
{ {
const char *ptr = Ra1; const char *ptr = Ra1;
Console.Write( ConColor_IOP, L"%s", ShiftJIS_ConvertString(ptr, a2).c_str() );
//Console.Write( ConColor_IOP, "%.*s", a2, ptr);
Console.Write( ConColor_IOP, ShiftJIS_ConvertString(ptr, a2) );
} }
else else
{ {
@ -284,10 +282,13 @@ _start:
} }
*ptmp = 0; *ptmp = 0;
// Note: Use Read to obtain a write pointer here, since we're just writing back the // Use Read to obtain a write pointer here, since we're just writing back the
// temp buffer we saved earlier. // temp buffer we saved earlier.
memcpy( (void*)iopVirtMemR<void>(sp), save, 4*4); memcpy( (void*)iopVirtMemR<void>(sp), save, 4*4);
Console.Write( ConColor_IOP, ShiftJIS_ConvertString(tmp), 1023 );
// Use "%s" even though it seems indirect: this avoids chaos if/when the IOP decides
// to feed us strings that contain percentages or other printf formatting control chars.
Console.Write( ConColor_IOP, L"%s", ShiftJIS_ConvertString(tmp).c_str(), 1023 );
pc0 = ra; pc0 = ra;
} }
@ -300,7 +301,7 @@ void bios_putchar () // 3d
void bios_puts () // 3e/3f void bios_puts () // 3e/3f
{ {
Console.Write( ConColor_IOP, Ra0 ); Console.Write( ConColor_IOP, L"%s", ShiftJIS_ConvertString(Ra0).c_str() );
pc0 = ra; pc0 = ra;
} }

2
pcsx2/IopHw.cpp
View File

@ -673,7 +673,7 @@ void psxHwWrite8(u32 add, u8 value) {
( value == '\n' && g_pbufi != 0 ) ) ( value == '\n' && g_pbufi != 0 ) )
{ {
g_pbuf[g_pbufi] = 0; g_pbuf[g_pbufi] = 0;
Console.WriteLn( ConColor_IOP, g_pbuf ); Console.WriteLn( ConColor_IOP, "%s", g_pbuf );
g_pbufi = 0; g_pbufi = 0;
} }
else if( value != '\n' ) else if( value != '\n' )

939
pcsx2/Linux/pcsx2.cbp
View File

@ -1,469 +1,470 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file> <CodeBlocks_project_file>
<FileVersion major="1" minor="6" /> <FileVersion major="1" minor="6" />
<Project> <Project>
<Option title="pcsx2" /> <Option title="pcsx2" />
<Option platforms="Windows;Unix;" /> <Option platforms="Windows;Unix;" />
<Option pch_mode="2" /> <Option pch_mode="2" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Debug"> <Target title="Debug">
<Option platforms="Windows;Unix;" /> <Option platforms="Windows;Unix;" />
<Option output="$(SvnRootDir)/bin/pcsx2-dbg" prefix_auto="1" extension_auto="1" /> <Option output="$(SvnRootDir)/bin/pcsx2-dbg" prefix_auto="1" extension_auto="1" />
<Option working_dir="$(SvnRootDir)/bin/" /> <Option working_dir="$(SvnRootDir)/bin/" />
<Option object_output="./.objs/debug" /> <Option object_output="./.objs/debug" />
<Option external_deps="../../tools/bin/bin2cpp;" /> <Option external_deps="../../tools/bin/bin2cpp;" />
<Option type="0" /> <Option type="0" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-march=i486" /> <Add option="-march=i486" />
<Add option="-g" /> <Add option="-g" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
<Add option="-DPCSX2_DEVBUILD" /> <Add option="-DPCSX2_DEVBUILD" />
<Add option="-DPCSX2_DEBUG" /> <Add option="-DPCSX2_DEBUG" />
</Compiler> </Compiler>
<ResourceCompiler> <ResourceCompiler>
<Add directory="$(ProjectRootDir)/gui" /> <Add directory="$(ProjectRootDir)/gui" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --libs`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --libs`" />
<Add library="$(SvnRootDir)/deps/debug/zlib.a" /> <Add library="$(SvnRootDir)/deps/debug/zlib.a" />
<Add library="$(SvnRootDir)/deps/debug/libx86emitter.a" /> <Add library="$(SvnRootDir)/deps/debug/libx86emitter.a" />
<Add library="$(SvnRootDir)/deps/debug/libUtilities.a" /> <Add library="$(SvnRootDir)/deps/debug/libUtilities.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Devel"> <Target title="Devel">
<Option platforms="Windows;Unix;" /> <Option platforms="Windows;Unix;" />
<Option output="$(SvnRootDir)/bin/pcsx2-dev" prefix_auto="1" extension_auto="1" /> <Option output="$(SvnRootDir)/bin/pcsx2-dev" prefix_auto="1" extension_auto="1" />
<Option working_dir="$(SvnRootDir)/bin/" /> <Option working_dir="$(SvnRootDir)/bin/" />
<Option object_output="./.objs/devel" /> <Option object_output="./.objs/devel" />
<Option external_deps="../../tools/bin/bin2cpp;" /> <Option external_deps="../../tools/bin/bin2cpp;" />
<Option type="0" /> <Option type="0" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-W" /> <Add option="-W" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
<Add option="-DNDEBUG" /> <Add option="-DNDEBUG" />
<Add option="-DPCSX2_DEVBUILD" /> <Add option="-DPCSX2_DEVBUILD" />
<Add option="-DPCSX2_DEVEL" /> <Add option="-DPCSX2_DEVEL" />
</Compiler> </Compiler>
<ResourceCompiler> <ResourceCompiler>
<Add directory="$(ProjectRootDir)/gui" /> <Add directory="$(ProjectRootDir)/gui" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --libs`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --libs`" />
<Add library="$(SvnRootDir)/deps/devel/zlib.a" /> <Add library="$(SvnRootDir)/deps/devel/zlib.a" />
<Add library="$(SvnRootDir)/deps/devel/libx86emitter.a" /> <Add library="$(SvnRootDir)/deps/devel/libx86emitter.a" />
<Add library="$(SvnRootDir)/deps/devel/libUtilities.a" /> <Add library="$(SvnRootDir)/deps/devel/libUtilities.a" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option platforms="Windows;Unix;" /> <Option platforms="Windows;Unix;" />
<Option output="$(SvnRootDir)/bin/pcsx2" prefix_auto="1" extension_auto="1" /> <Option output="$(SvnRootDir)/bin/pcsx2" prefix_auto="1" extension_auto="1" />
<Option working_dir="$(SvnRootDir)/bin/" /> <Option working_dir="$(SvnRootDir)/bin/" />
<Option object_output="./.objs/release" /> <Option object_output="./.objs/release" />
<Option external_deps="../../tools/bin/bin2cpp;" /> <Option external_deps="../../tools/bin/bin2cpp;" />
<Option type="0" /> <Option type="0" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" />
<Add option="-DNDEBUG" /> <Add option="-DNDEBUG" />
</Compiler> </Compiler>
<ResourceCompiler> <ResourceCompiler>
<Add directory="$(ProjectRootDir)/gui" /> <Add directory="$(ProjectRootDir)/gui" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --libs`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --libs`" />
<Add library="$(SvnRootDir)/deps/release/zlib.a" /> <Add library="$(SvnRootDir)/deps/release/zlib.a" />
<Add library="$(SvnRootDir)/deps/release/libx86emitter.a" /> <Add library="$(SvnRootDir)/deps/release/libx86emitter.a" />
<Add library="$(SvnRootDir)/deps/release/libUtilities.a" /> <Add library="$(SvnRootDir)/deps/release/libUtilities.a" />
</Linker> </Linker>
</Target> </Target>
<Environment> <Environment>
<Variable name="SvnRootDir" value="../../" /> <Variable name="SvnRootDir" value="../../" />
<Variable name="ProjectRootDir" value='&quot;$(SvnRootDir)/pcsx2/&quot;' /> <Variable name="ProjectRootDir" value='&quot;$(SvnRootDir)/pcsx2/&quot;' />
<Variable name="CommonDir" value='&quot;$(SvnRootDir)/common/&quot;' /> <Variable name="CommonDir" value='&quot;$(SvnRootDir)/common/&quot;' />
</Environment> </Environment>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-Wno-format" /> <Add option="-Wno-format" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-Wno-unused-value" /> <Add option="-Wno-unused-value" />
<Add option="-Wunused-variable" /> <Add option="-Wunused-variable" />
<Add option="-fno-guess-branch-probability" /> <Add option="-fno-guess-branch-probability" />
<Add option="-fno-dse" /> <Add option="-fno-dse" />
<Add option="-fno-tree-dse" /> <Add option="-fno-tree-dse" />
<Add option="-fno-strict-aliasing" /> <Add option="-fno-strict-aliasing" />
<Add option="-pipe -msse -msse2" /> <Add option="-pipe -msse -msse2" />
<Add option="-m32" /> <Add option="-m32" />
<Add option="-DWX_PRECOMP" /> <Add option="-DWX_PRECOMP" />
<Add directory="$(SvnRootDir)/common/include/" /> <Add directory="$(SvnRootDir)/common/include/" />
<Add directory="$(SvnRootDir)/3rdparty/" /> <Add directory="$(SvnRootDir)/3rdparty/" />
<Add directory="$(ProjectRootDir)" /> <Add directory="$(ProjectRootDir)" />
<Add directory="$(ProjectRootDir)/gui" /> <Add directory="$(ProjectRootDir)/gui" />
<Add directory="$(ProjectRootDir)/x86" /> <Add directory="$(ProjectRootDir)/x86" />
</Compiler> </Compiler>
<Unit filename="../../common/include/PS2Edefs.h" /> <Unit filename="../../common/include/PS2Edefs.h" />
<Unit filename="../../common/include/PS2Etypes.h" /> <Unit filename="../../common/include/PS2Etypes.h" />
<Unit filename="../../common/include/Pcsx2Api.h" /> <Unit filename="../../common/include/Pcsx2Api.h" />
<Unit filename="../../common/include/Pcsx2Defs.h" /> <Unit filename="../../common/include/Pcsx2Defs.h" />
<Unit filename="../../common/include/Pcsx2Types.h" /> <Unit filename="../../common/include/Pcsx2Types.h" />
<Unit filename="../../common/include/PluginCallbacks.h" /> <Unit filename="../../common/include/PluginCallbacks.h" />
<Unit filename="../../common/include/wx/folderdesc.txt" /> <Unit filename="../../common/include/wx/folderdesc.txt" />
<Unit filename="../CDVD/CDVD.cpp" /> <Unit filename="../CDVD/CDVD.cpp" />
<Unit filename="../CDVD/CDVD.h" /> <Unit filename="../CDVD/CDVD.h" />
<Unit filename="../CDVD/CDVD_internal.h" /> <Unit filename="../CDVD/CDVD_internal.h" />
<Unit filename="../CDVD/CDVDaccess.cpp" /> <Unit filename="../CDVD/CDVDaccess.cpp" />
<Unit filename="../CDVD/CDVDaccess.h" /> <Unit filename="../CDVD/CDVDaccess.h" />
<Unit filename="../CDVD/CDVDisoReader.cpp" /> <Unit filename="../CDVD/CDVDisoReader.cpp" />
<Unit filename="../CDVD/CDVDisoReader.h" /> <Unit filename="../CDVD/CDVDisoReader.h" />
<Unit filename="../CDVD/CdRom.cpp" /> <Unit filename="../CDVD/CdRom.cpp" />
<Unit filename="../CDVD/CdRom.h" /> <Unit filename="../CDVD/CdRom.h" />
<Unit filename="../CDVD/IsoFScdvd.h" /> <Unit filename="../CDVD/IsoFScdvd.h" />
<Unit filename="../CDVD/IsoFSdrv.cpp" /> <Unit filename="../CDVD/IsoFSdrv.cpp" />
<Unit filename="../CDVD/IsoFSdrv.h" /> <Unit filename="../CDVD/IsoFSdrv.h" />
<Unit filename="../CDVD/IsoFStools.cpp" /> <Unit filename="../CDVD/IsoFStools.cpp" />
<Unit filename="../CDVD/IsoFStools.h" /> <Unit filename="../CDVD/IsoFStools.h" />
<Unit filename="../CDVD/IsoFileFormats.cpp" /> <Unit filename="../CDVD/IsoFileFormats.cpp" />
<Unit filename="../CDVD/IsoFileFormats.h" /> <Unit filename="../CDVD/IsoFileFormats.h" />
<Unit filename="../CDVD/IsoFileTools.cpp" /> <Unit filename="../CDVD/IsoFileTools.cpp" />
<Unit filename="../CDVD/IsoFileTools.h" /> <Unit filename="../CDVD/IsoFileTools.h" />
<Unit filename="../COP0.cpp" /> <Unit filename="../COP0.cpp" />
<Unit filename="../COP2.cpp" /> <Unit filename="../COP2.cpp" />
<Unit filename="../Cache.cpp" /> <Unit filename="../Cache.cpp" />
<Unit filename="../Cache.h" /> <Unit filename="../Cache.h" />
<Unit filename="../Common.h" /> <Unit filename="../Common.h" />
<Unit filename="../Config.h" /> <Unit filename="../Config.h" />
<Unit filename="../Counters.cpp" /> <Unit filename="../Counters.cpp" />
<Unit filename="../Counters.h" /> <Unit filename="../Counters.h" />
<Unit filename="../DebugTools/Debug.h" /> <Unit filename="../DebugTools/Debug.h" />
<Unit filename="../DebugTools/DisASM.h" /> <Unit filename="../DebugTools/DisASM.h" />
<Unit filename="../DebugTools/DisR3000A.cpp" /> <Unit filename="../DebugTools/DisR3000A.cpp" />
<Unit filename="../DebugTools/DisR5900.cpp" /> <Unit filename="../DebugTools/DisR5900.cpp" />
<Unit filename="../DebugTools/DisR5900asm.cpp" /> <Unit filename="../DebugTools/DisR5900asm.cpp" />
<Unit filename="../DebugTools/DisVU0Micro.cpp" /> <Unit filename="../DebugTools/DisVU0Micro.cpp" />
<Unit filename="../DebugTools/DisVU1Micro.cpp" /> <Unit filename="../DebugTools/DisVU1Micro.cpp" />
<Unit filename="../DebugTools/DisVUmicro.h" /> <Unit filename="../DebugTools/DisVUmicro.h" />
<Unit filename="../DebugTools/DisVUops.h" /> <Unit filename="../DebugTools/DisVUops.h" />
<Unit filename="../Docs/ChangeLog.txt" /> <Unit filename="../Docs/ChangeLog.txt" />
<Unit filename="../Docs/License.txt" /> <Unit filename="../Docs/License.txt" />
<Unit filename="../Docs/devblog.txt" /> <Unit filename="../Docs/devblog.txt" />
<Unit filename="../Dump.cpp" /> <Unit filename="../Dump.cpp" />
<Unit filename="../Dump.h" /> <Unit filename="../Dump.h" />
<Unit filename="../Elfheader.cpp" /> <Unit filename="../Elfheader.cpp" />
<Unit filename="../Elfheader.h" /> <Unit filename="../Elfheader.h" />
<Unit filename="../FPU.cpp" /> <Unit filename="../FPU.cpp" />
<Unit filename="../FiFo.cpp" /> <Unit filename="../FiFo.cpp" />
<Unit filename="../GS.cpp" /> <Unit filename="../GS.cpp" />
<Unit filename="../GS.h" /> <Unit filename="../GS.h" />
<Unit filename="../GSState.cpp" /> <Unit filename="../GSState.cpp" />
<Unit filename="../Gif.cpp" /> <Unit filename="../Gif.cpp" />
<Unit filename="../Gif.h" /> <Unit filename="../Gif.h" />
<Unit filename="../HostGui.h" /> <Unit filename="../HostGui.h" />
<Unit filename="../Hw.cpp" /> <Unit filename="../Hw.cpp" />
<Unit filename="../Hw.h" /> <Unit filename="../Hw.h" />
<Unit filename="../HwRead.cpp" /> <Unit filename="../HwRead.cpp" />
<Unit filename="../HwWrite.cpp" /> <Unit filename="../HwWrite.cpp" />
<Unit filename="../IPU/IPU.cpp" /> <Unit filename="../IPU/IPU.cpp" />
<Unit filename="../IPU/IPU.h" /> <Unit filename="../IPU/IPU.h" />
<Unit filename="../IPU/acoroutine.S" /> <Unit filename="../IPU/acoroutine.S" />
<Unit filename="../IPU/coroutine.cpp" /> <Unit filename="../IPU/coroutine.cpp" />
<Unit filename="../IPU/coroutine.h" /> <Unit filename="../IPU/coroutine.h" />
<Unit filename="../IPU/mpeg2lib/Idct.cpp" /> <Unit filename="../IPU/mpeg2lib/Idct.cpp" />
<Unit filename="../IPU/mpeg2lib/Mpeg.cpp" /> <Unit filename="../IPU/mpeg2lib/Mpeg.cpp" />
<Unit filename="../IPU/mpeg2lib/Mpeg.h" /> <Unit filename="../IPU/mpeg2lib/Mpeg.h" />
<Unit filename="../IPU/mpeg2lib/Vlc.h" /> <Unit filename="../IPU/mpeg2lib/Vlc.h" />
<Unit filename="../IPU/yuv2rgb.cpp" /> <Unit filename="../IPU/yuv2rgb.cpp" />
<Unit filename="../IPU/yuv2rgb.h" /> <Unit filename="../IPU/yuv2rgb.h" />
<Unit filename="../Interpreter.cpp" /> <Unit filename="../Interpreter.cpp" />
<Unit filename="../IopBios.cpp" /> <Unit filename="../IopBios.cpp" />
<Unit filename="../IopBios.h" /> <Unit filename="../IopBios.h" />
<Unit filename="../IopBios2.h" /> <Unit filename="../IopBios2.h" />
<Unit filename="../IopCommon.h" /> <Unit filename="../IopCommon.h" />
<Unit filename="../IopCounters.cpp" /> <Unit filename="../IopCounters.cpp" />
<Unit filename="../IopCounters.h" /> <Unit filename="../IopCounters.h" />
<Unit filename="../IopDma.cpp" /> <Unit filename="../IopDma.cpp" />
<Unit filename="../IopDma.h" /> <Unit filename="../IopDma.h" />
<Unit filename="../IopHw.cpp" /> <Unit filename="../IopHw.cpp" />
<Unit filename="../IopHw.h" /> <Unit filename="../IopHw.h" />
<Unit filename="../IopMem.cpp" /> <Unit filename="../IopMem.cpp" />
<Unit filename="../IopMem.h" /> <Unit filename="../IopMem.h" />
<Unit filename="../IopSio2.cpp" /> <Unit filename="../IopSio2.cpp" />
<Unit filename="../IopSio2.h" /> <Unit filename="../IopSio2.h" />
<Unit filename="LnxHostSys.cpp" /> <Unit filename="LnxHostSys.cpp" />
<Unit filename="LnxKeyCodes.cpp"> <Unit filename="LnxKeyCodes.cpp">
<Option compiler="gcc" use="1" buildCommand="$compiler $options $includes `pkg-config gtk+-2.0 --cflags` -c $file -o $object" /> <Option compiler="gcc" use="1" buildCommand="$compiler $options $includes `pkg-config gtk+-2.0 --cflags` -c $file -o $object" />
</Unit> </Unit>
<Unit filename="../MMI.cpp" /> <Unit filename="../MMI.cpp" />
<Unit filename="../MTGS.cpp" /> <Unit filename="../MTGS.cpp" />
<Unit filename="../Memory.cpp" /> <Unit filename="../Memory.cpp" />
<Unit filename="../Memory.h" /> <Unit filename="../Memory.h" />
<Unit filename="../NakedAsm.h" /> <Unit filename="../NakedAsm.h" />
<Unit filename="../Patch.cpp" /> <Unit filename="../Patch.cpp" />
<Unit filename="../Patch.h" /> <Unit filename="../Patch.h" />
<Unit filename="../PathDefs.h" /> <Unit filename="../PathDefs.h" />
<Unit filename="../Pcsx2Config.cpp" /> <Unit filename="../Pcsx2Config.cpp" />
<Unit filename="../PluginManager.cpp" /> <Unit filename="../PluginManager.cpp" />
<Unit filename="../Plugins.h" /> <Unit filename="../Plugins.h" />
<Unit filename="../PrecompiledHeader.h" /> <Unit filename="../PrecompiledHeader.h" />
<Unit filename="../R3000A.cpp" /> <Unit filename="../R3000A.cpp" />
<Unit filename="../R3000A.h" /> <Unit filename="../R3000A.h" />
<Unit filename="../R3000AInterpreter.cpp" /> <Unit filename="../R3000AInterpreter.cpp" />
<Unit filename="../R3000AOpcodeTables.cpp" /> <Unit filename="../R3000AOpcodeTables.cpp" />
<Unit filename="../R5900.cpp" /> <Unit filename="../R5900.cpp" />
<Unit filename="../R5900.h" /> <Unit filename="../R5900.h" />
<Unit filename="../R5900Exceptions.h" /> <Unit filename="../R5900Exceptions.h" />
<Unit filename="../R5900OpcodeImpl.cpp" /> <Unit filename="../R5900OpcodeImpl.cpp" />
<Unit filename="../R5900OpcodeTables.cpp" /> <Unit filename="../R5900OpcodeTables.cpp" />
<Unit filename="../R5900OpcodeTables.h" /> <Unit filename="../R5900OpcodeTables.h" />
<Unit filename="../RecoverySystem.cpp" /> <Unit filename="../RecoverySystem.cpp" />
<Unit filename="../SPR.cpp" /> <Unit filename="../SPR.cpp" />
<Unit filename="../SPR.h" /> <Unit filename="../SPR.h" />
<Unit filename="../SamplProf.h" /> <Unit filename="../SamplProf.h" />
<Unit filename="../SaveState.cpp" /> <Unit filename="../SaveState.cpp" />
<Unit filename="../SaveState.h" /> <Unit filename="../SaveState.h" />
<Unit filename="../ShiftJisToUnicode.cpp" /> <Unit filename="../ShiftJisToUnicode.cpp" />
<Unit filename="../Sif.cpp" /> <Unit filename="../Sif.cpp" />
<Unit filename="../Sif.h" /> <Unit filename="../Sif.h" />
<Unit filename="../Sifcmd.h" /> <Unit filename="../Sifcmd.h" />
<Unit filename="../Sio.cpp" /> <Unit filename="../Sio.cpp" />
<Unit filename="../Sio.h" /> <Unit filename="../Sio.h" />
<Unit filename="../SourceLog.cpp" /> <Unit filename="../SourceLog.cpp" />
<Unit filename="../Stats.cpp" /> <Unit filename="../Stats.cpp" />
<Unit filename="../Stats.h" /> <Unit filename="../Stats.h" />
<Unit filename="../StringUtils.h" /> <Unit filename="../StringUtils.h" />
<Unit filename="../System.cpp" /> <Unit filename="../System.cpp" />
<Unit filename="../System.h" /> <Unit filename="../System.h" />
<Unit filename="../System/PageFaultSource.h" /> <Unit filename="../System/PageFaultSource.h" />
<Unit filename="../System/SysCoreThread.cpp" /> <Unit filename="../System/SysCoreThread.cpp" />
<Unit filename="../System/SysThreadBase.cpp" /> <Unit filename="../System/SysThreadBase.cpp" />
<Unit filename="../System/SysThreads.h" /> <Unit filename="../System/SysThreads.h" />
<Unit filename="../Tags.h" /> <Unit filename="../Tags.h" />
<Unit filename="../Utilities/AsciiFile.h" /> <Unit filename="../Utilities/AsciiFile.h" />
<Unit filename="../Utilities/FileUtils.cpp" /> <Unit filename="../Utilities/FileUtils.cpp" />
<Unit filename="../Utilities/folderdesc.txt" /> <Unit filename="../Utilities/folderdesc.txt" />
<Unit filename="../VU.h" /> <Unit filename="../VU.h" />
<Unit filename="../VU0.cpp" /> <Unit filename="../VU0.cpp" />
<Unit filename="../VU0micro.cpp" /> <Unit filename="../VU0micro.cpp" />
<Unit filename="../VU0microInterp.cpp" /> <Unit filename="../VU0microInterp.cpp" />
<Unit filename="../VU1micro.cpp" /> <Unit filename="../VU1micro.cpp" />
<Unit filename="../VU1microInterp.cpp" /> <Unit filename="../VU1microInterp.cpp" />
<Unit filename="../VUflags.cpp" /> <Unit filename="../VUflags.cpp" />
<Unit filename="../VUflags.h" /> <Unit filename="../VUflags.h" />
<Unit filename="../VUmicro.h" /> <Unit filename="../VUmicro.h" />
<Unit filename="../VUmicroMem.cpp" /> <Unit filename="../VUmicroMem.cpp" />
<Unit filename="../VUops.cpp" /> <Unit filename="../VUops.cpp" />
<Unit filename="../VUops.h" /> <Unit filename="../VUops.h" />
<Unit filename="../Vif.cpp" /> <Unit filename="../Vif.cpp" />
<Unit filename="../Vif.h" /> <Unit filename="../Vif.h" />
<Unit filename="../Vif0Dma.cpp" /> <Unit filename="../Vif0Dma.cpp" />
<Unit filename="../Vif1Dma.cpp" /> <Unit filename="../Vif1Dma.cpp" />
<Unit filename="../VifDma.cpp" /> <Unit filename="../VifDma.cpp" />
<Unit filename="../VifDma.h" /> <Unit filename="../VifDma.h" />
<Unit filename="../VifDma_internal.h" /> <Unit filename="../VifDma_internal.h" />
<Unit filename="../gui/AdvancedDialog.cpp" /> <Unit filename="../gui/AdvancedDialog.cpp" />
<Unit filename="../gui/AdvancedDialog.h" /> <Unit filename="../gui/AdvancedDialog.h" />
<Unit filename="../gui/App.h" /> <Unit filename="../gui/App.h" />
<Unit filename="../gui/AppAssert.cpp" /> <Unit filename="../gui/AppAssert.cpp" />
<Unit filename="../gui/AppConfig.cpp" /> <Unit filename="../gui/AppConfig.cpp" />
<Unit filename="../gui/AppConfig.h" /> <Unit filename="../gui/AppConfig.h" />
<Unit filename="../gui/AppCoreThread.cpp" /> <Unit filename="../gui/AppCoreThread.cpp" />
<Unit filename="../gui/AppInit.cpp" /> <Unit filename="../gui/AppInit.cpp" />
<Unit filename="../gui/AppMain.cpp" /> <Unit filename="../gui/AppMain.cpp" />
<Unit filename="../gui/AppRes.cpp" /> <Unit filename="../gui/AppRes.cpp" />
<Unit filename="../gui/CheckedStaticBox.cpp" /> <Unit filename="../gui/CheckedStaticBox.cpp" />
<Unit filename="../gui/CheckedStaticBox.h" /> <Unit filename="../gui/CheckedStaticBox.h" />
<Unit filename="../gui/ConsoleLogger.cpp" /> <Unit filename="../gui/ConsoleLogger.cpp" />
<Unit filename="../gui/ConsoleLogger.h" /> <Unit filename="../gui/ConsoleLogger.h" />
<Unit filename="../gui/Dialogs/AboutBoxDialog.cpp" /> <Unit filename="../gui/Dialogs/AboutBoxDialog.cpp" />
<Unit filename="../gui/Dialogs/ConfigurationDialog.cpp" /> <Unit filename="../gui/Dialogs/ConfigurationDialog.cpp" />
<Unit filename="../gui/Dialogs/ConfigurationDialog.h" /> <Unit filename="../gui/Dialogs/ConfigurationDialog.h" />
<Unit filename="../gui/Dialogs/ConfirmationDialogs.cpp" /> <Unit filename="../gui/Dialogs/ConfirmationDialogs.cpp" />
<Unit filename="../gui/Dialogs/FirstTimeWizard.cpp" /> <Unit filename="../gui/Dialogs/FirstTimeWizard.cpp" />
<Unit filename="../gui/Dialogs/ImportSettingsDialog.cpp" /> <Unit filename="../gui/Dialogs/ImportSettingsDialog.cpp" />
<Unit filename="../gui/Dialogs/LogOptionsDialog.cpp" /> <Unit filename="../gui/Dialogs/LogOptionsDialog.cpp" />
<Unit filename="../gui/Dialogs/LogOptionsDialog.h" /> <Unit filename="../gui/Dialogs/LogOptionsDialog.h" />
<Unit filename="../gui/Dialogs/ModalPopups.h" /> <Unit filename="../gui/Dialogs/ModalPopups.h" />
<Unit filename="../gui/Dialogs/PickUserModeDialog.cpp" /> <Unit filename="../gui/Dialogs/PickUserModeDialog.cpp" />
<Unit filename="../gui/FrameForGS.cpp" /> <Unit filename="../gui/FrameForGS.cpp" />
<Unit filename="../gui/GlobalCommands.cpp" /> <Unit filename="../gui/GlobalCommands.cpp" />
<Unit filename="../gui/IniInterface.cpp" /> <Unit filename="../gui/IniInterface.cpp" />
<Unit filename="../gui/IniInterface.h" /> <Unit filename="../gui/IniInterface.h" />
<Unit filename="../gui/MainFrame.cpp" /> <Unit filename="../gui/MainFrame.cpp" />
<Unit filename="../gui/MainFrame.h" /> <Unit filename="../gui/MainFrame.h" />
<Unit filename="../gui/MainMenuClicks.cpp" /> <Unit filename="../gui/MainMenuClicks.cpp" />
<Unit filename="../gui/MemoryCardFile.cpp" /> <Unit filename="../gui/MemoryCardFile.cpp" />
<Unit filename="../gui/Panels/AudioPanel.cpp" /> <Unit filename="../gui/Panels/AudioPanel.cpp" />
<Unit filename="../gui/Panels/BiosSelectorPanel.cpp" /> <Unit filename="../gui/Panels/BiosSelectorPanel.cpp" />
<Unit filename="../gui/Panels/ConfigurationPanels.h" /> <Unit filename="../gui/Panels/ConfigurationPanels.h" />
<Unit filename="../gui/Panels/CpuPanel.cpp" /> <Unit filename="../gui/Panels/CpuPanel.cpp" />
<Unit filename="../gui/Panels/DirPickerPanel.cpp" /> <Unit filename="../gui/Panels/DirPickerPanel.cpp" />
<Unit filename="../gui/Panels/GameFixesPanel.cpp" /> <Unit filename="../gui/Panels/GameFixesPanel.cpp" />
<Unit filename="../gui/Panels/MiscPanelStuff.cpp" /> <Unit filename="../gui/Panels/MiscPanelStuff.cpp" />
<Unit filename="../gui/Panels/PathsPanel.cpp" /> <Unit filename="../gui/Panels/PathsPanel.cpp" />
<Unit filename="../gui/Panels/PluginSelectorPanel.cpp" /> <Unit filename="../gui/Panels/PluginSelectorPanel.cpp" />
<Unit filename="../gui/Panels/SpeedhacksPanel.cpp" /> <Unit filename="../gui/Panels/SpeedhacksPanel.cpp" />
<Unit filename="../gui/Panels/VideoPanel.cpp" /> <Unit filename="../gui/Panels/VideoPanel.cpp" />
<Unit filename="../gui/Plugins.cpp" /> <Unit filename="../gui/Plugins.cpp" />
<Unit filename="../gui/Resources/AppIcon16.h" /> <Unit filename="../gui/RecentIsoList.cpp" />
<Unit filename="../gui/Resources/AppIcon16.png"> <Unit filename="../gui/Resources/AppIcon16.h" />
<Option compile="1" /> <Unit filename="../gui/Resources/AppIcon16.png">
<Option weight="0" /> <Option compile="1" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" /> <Option weight="0" />
</Unit> <Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
<Unit filename="../gui/Resources/AppIcon32.h" /> </Unit>
<Unit filename="../gui/Resources/AppIcon32.png"> <Unit filename="../gui/Resources/AppIcon32.h" />
<Option compile="1" /> <Unit filename="../gui/Resources/AppIcon32.png">
<Option weight="0" /> <Option compile="1" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" /> <Option weight="0" />
</Unit> <Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
<Unit filename="../gui/Resources/AppIcon64.h" /> </Unit>
<Unit filename="../gui/Resources/AppIcon64.png"> <Unit filename="../gui/Resources/AppIcon64.h" />
<Option compile="1" /> <Unit filename="../gui/Resources/AppIcon64.png">
<Option weight="0" /> <Option compile="1" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" /> <Option weight="0" />
</Unit> <Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
<Unit filename="../gui/Resources/BackgroundLogo.h" /> </Unit>
<Unit filename="../gui/Resources/BackgroundLogo.png"> <Unit filename="../gui/Resources/BackgroundLogo.h" />
<Option compile="1" /> <Unit filename="../gui/Resources/BackgroundLogo.png">
<Option weight="0" /> <Option compile="1" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" /> <Option weight="0" />
</Unit> <Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
<Unit filename="../gui/Resources/ConfigIcon_Cpu.h" /> </Unit>
<Unit filename="../gui/Resources/ConfigIcon_Cpu.png"> <Unit filename="../gui/Resources/ConfigIcon_Cpu.h" />
<Option compile="1" /> <Unit filename="../gui/Resources/ConfigIcon_Cpu.png">
<Option weight="0" /> <Option compile="1" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" /> <Option weight="0" />
</Unit> <Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
<Unit filename="../gui/Resources/ConfigIcon_Gamefixes.h" /> </Unit>
<Unit filename="../gui/Resources/ConfigIcon_Gamefixes.png"> <Unit filename="../gui/Resources/ConfigIcon_Gamefixes.h" />
<Option compile="1" /> <Unit filename="../gui/Resources/ConfigIcon_Gamefixes.png">
<Option weight="0" /> <Option compile="1" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" /> <Option weight="0" />
</Unit> <Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
<Unit filename="../gui/Resources/ConfigIcon_Paths.h" /> </Unit>
<Unit filename="../gui/Resources/ConfigIcon_Paths.png"> <Unit filename="../gui/Resources/ConfigIcon_Paths.h" />
<Option compile="1" /> <Unit filename="../gui/Resources/ConfigIcon_Paths.png">
<Option weight="0" /> <Option compile="1" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" /> <Option weight="0" />
</Unit> <Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
<Unit filename="../gui/Resources/ConfigIcon_Plugins.h" /> </Unit>
<Unit filename="../gui/Resources/ConfigIcon_Plugins.png"> <Unit filename="../gui/Resources/ConfigIcon_Plugins.h" />
<Option compile="1" /> <Unit filename="../gui/Resources/ConfigIcon_Plugins.png">
<Option weight="0" /> <Option compile="1" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" /> <Option weight="0" />
</Unit> <Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
<Unit filename="../gui/Resources/ConfigIcon_Speedhacks.h" /> </Unit>
<Unit filename="../gui/Resources/ConfigIcon_Speedhacks.png"> <Unit filename="../gui/Resources/ConfigIcon_Speedhacks.h" />
<Option compile="1" /> <Unit filename="../gui/Resources/ConfigIcon_Speedhacks.png">
<Option weight="0" /> <Option compile="1" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" /> <Option weight="0" />
</Unit> <Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
<Unit filename="../gui/Resources/ConfigIcon_Video.h" /> </Unit>
<Unit filename="../gui/Resources/ConfigIcon_Video.png"> <Unit filename="../gui/Resources/ConfigIcon_Video.h" />
<Option compile="1" /> <Unit filename="../gui/Resources/ConfigIcon_Video.png">
<Option weight="0" /> <Option compile="1" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" /> <Option weight="0" />
</Unit> <Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
<Unit filename="../gui/Resources/Dualshock.h" /> </Unit>
<Unit filename="../gui/Resources/Dualshock.jpg"> <Unit filename="../gui/Resources/Dualshock.h" />
<Option compile="1" /> <Unit filename="../gui/Resources/Dualshock.jpg">
<Option weight="0" /> <Option compile="1" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" /> <Option weight="0" />
</Unit> <Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
<Unit filename="../gui/Resources/EmbeddedImage.h" /> </Unit>
<Unit filename="../gui/Saveslots.cpp" /> <Unit filename="../gui/Resources/EmbeddedImage.h" />
<Unit filename="../gui/i18n.cpp" /> <Unit filename="../gui/Saveslots.cpp" />
<Unit filename="../gui/i18n.h" /> <Unit filename="../gui/i18n.cpp" />
<Unit filename="../gui/wxHelpers.cpp" /> <Unit filename="../gui/i18n.h" />
<Unit filename="../gui/wxHelpers.h" /> <Unit filename="../gui/wxHelpers.cpp" />
<Unit filename="../ps2/BiosTools.cpp" /> <Unit filename="../gui/wxHelpers.h" />
<Unit filename="../ps2/BiosTools.h" /> <Unit filename="../ps2/BiosTools.cpp" />
<Unit filename="../ps2/GIFpath.cpp" /> <Unit filename="../ps2/BiosTools.h" />
<Unit filename="../ps2/Iop/IopHwRead.cpp" /> <Unit filename="../ps2/GIFpath.cpp" />
<Unit filename="../ps2/Iop/IopHwWrite.cpp" /> <Unit filename="../ps2/Iop/IopHwRead.cpp" />
<Unit filename="../ps2/Iop/IopHw_Internal.h" /> <Unit filename="../ps2/Iop/IopHwWrite.cpp" />
<Unit filename="../vtlb.cpp" /> <Unit filename="../ps2/Iop/IopHw_Internal.h" />
<Unit filename="../vtlb.h" /> <Unit filename="../vtlb.cpp" />
<Unit filename="../x86/BaseblockEx.cpp" /> <Unit filename="../vtlb.h" />
<Unit filename="../x86/BaseblockEx.h" /> <Unit filename="../x86/BaseblockEx.cpp" />
<Unit filename="../x86/aVUzerorec.S" /> <Unit filename="../x86/BaseblockEx.h" />
<Unit filename="../x86/aVif.S" /> <Unit filename="../x86/aVUzerorec.S" />
<Unit filename="../x86/iCOP0.cpp" /> <Unit filename="../x86/aVif.S" />
<Unit filename="../x86/iCOP0.h" /> <Unit filename="../x86/iCOP0.cpp" />
<Unit filename="../x86/iCOP2.cpp" /> <Unit filename="../x86/iCOP0.h" />
<Unit filename="../x86/iCore.cpp" /> <Unit filename="../x86/iCOP2.cpp" />
<Unit filename="../x86/iCore.h" /> <Unit filename="../x86/iCore.cpp" />
<Unit filename="../x86/iFPU.cpp" /> <Unit filename="../x86/iCore.h" />
<Unit filename="../x86/iFPU.h" /> <Unit filename="../x86/iFPU.cpp" />
<Unit filename="../x86/iFPUd.cpp" /> <Unit filename="../x86/iFPU.h" />
<Unit filename="../x86/iMMI.cpp" /> <Unit filename="../x86/iFPUd.cpp" />
<Unit filename="../x86/iMMI.h" /> <Unit filename="../x86/iMMI.cpp" />
<Unit filename="../x86/iMisc.cpp" /> <Unit filename="../x86/iMMI.h" />
<Unit filename="../x86/iR3000A.cpp" /> <Unit filename="../x86/iMisc.cpp" />
<Unit filename="../x86/iR3000A.h" /> <Unit filename="../x86/iR3000A.cpp" />
<Unit filename="../x86/iR3000Atables.cpp" /> <Unit filename="../x86/iR3000A.h" />
<Unit filename="../x86/iR5900.h" /> <Unit filename="../x86/iR3000Atables.cpp" />
<Unit filename="../x86/iR5900Arit.h" /> <Unit filename="../x86/iR5900.h" />
<Unit filename="../x86/iR5900AritImm.h" /> <Unit filename="../x86/iR5900Arit.h" />
<Unit filename="../x86/iR5900Branch.h" /> <Unit filename="../x86/iR5900AritImm.h" />
<Unit filename="../x86/iR5900Jump.h" /> <Unit filename="../x86/iR5900Branch.h" />
<Unit filename="../x86/iR5900LoadStore.h" /> <Unit filename="../x86/iR5900Jump.h" />
<Unit filename="../x86/iR5900Misc.cpp" /> <Unit filename="../x86/iR5900LoadStore.h" />
<Unit filename="../x86/iR5900Move.h" /> <Unit filename="../x86/iR5900Misc.cpp" />
<Unit filename="../x86/iR5900MultDiv.h" /> <Unit filename="../x86/iR5900Move.h" />
<Unit filename="../x86/iR5900Shift.h" /> <Unit filename="../x86/iR5900MultDiv.h" />
<Unit filename="../x86/iVU0micro.cpp" /> <Unit filename="../x86/iR5900Shift.h" />
<Unit filename="../x86/iVU1micro.cpp" /> <Unit filename="../x86/iVU0micro.cpp" />
<Unit filename="../x86/iVif.cpp"> <Unit filename="../x86/iVU1micro.cpp" />
<Option compiler="gcc" use="0" buildCommand="gcc $options -S $includes -c $file -o $object" /> <Unit filename="../x86/iVif.cpp">
</Unit> <Option compiler="gcc" use="0" buildCommand="gcc $options -S $includes -c $file -o $object" />
<Unit filename="../x86/ir5900tables.cpp" /> </Unit>
<Unit filename="../x86/ix86-32/iCore-32.cpp" /> <Unit filename="../x86/ir5900tables.cpp" />
<Unit filename="../x86/ix86-32/iR5900-32.cpp" /> <Unit filename="../x86/ix86-32/iCore-32.cpp" />
<Unit filename="../x86/ix86-32/iR5900Arit.cpp" /> <Unit filename="../x86/ix86-32/iR5900-32.cpp" />
<Unit filename="../x86/ix86-32/iR5900AritImm.cpp" /> <Unit filename="../x86/ix86-32/iR5900Arit.cpp" />
<Unit filename="../x86/ix86-32/iR5900Branch.cpp" /> <Unit filename="../x86/ix86-32/iR5900AritImm.cpp" />
<Unit filename="../x86/ix86-32/iR5900Jump.cpp" /> <Unit filename="../x86/ix86-32/iR5900Branch.cpp" />
<Unit filename="../x86/ix86-32/iR5900LoadStore.cpp" /> <Unit filename="../x86/ix86-32/iR5900Jump.cpp" />
<Unit filename="../x86/ix86-32/iR5900Move.cpp" /> <Unit filename="../x86/ix86-32/iR5900LoadStore.cpp" />
<Unit filename="../x86/ix86-32/iR5900MultDiv.cpp" /> <Unit filename="../x86/ix86-32/iR5900Move.cpp" />
<Unit filename="../x86/ix86-32/iR5900Shift.cpp" /> <Unit filename="../x86/ix86-32/iR5900MultDiv.cpp" />
<Unit filename="../x86/ix86-32/iR5900Templates.cpp" /> <Unit filename="../x86/ix86-32/iR5900Shift.cpp" />
<Unit filename="../x86/ix86-32/recVTLB.cpp" /> <Unit filename="../x86/ix86-32/iR5900Templates.cpp" />
<Unit filename="../x86/microVU.cpp" /> <Unit filename="../x86/ix86-32/recVTLB.cpp" />
<Unit filename="../x86/microVU.h" /> <Unit filename="../x86/microVU.cpp" />
<Unit filename="../x86/microVU_Alloc.inl" /> <Unit filename="../x86/microVU.h" />
<Unit filename="../x86/microVU_Analyze.inl" /> <Unit filename="../x86/microVU_Alloc.inl" />
<Unit filename="../x86/microVU_Branch.inl" /> <Unit filename="../x86/microVU_Analyze.inl" />
<Unit filename="../x86/microVU_Compile.inl" /> <Unit filename="../x86/microVU_Branch.inl" />
<Unit filename="../x86/microVU_Execute.inl" /> <Unit filename="../x86/microVU_Compile.inl" />
<Unit filename="../x86/microVU_Flags.inl" /> <Unit filename="../x86/microVU_Execute.inl" />
<Unit filename="../x86/microVU_IR.h" /> <Unit filename="../x86/microVU_Flags.inl" />
<Unit filename="../x86/microVU_Log.inl" /> <Unit filename="../x86/microVU_IR.h" />
<Unit filename="../x86/microVU_Lower.inl" /> <Unit filename="../x86/microVU_Log.inl" />
<Unit filename="../x86/microVU_Macro.inl" /> <Unit filename="../x86/microVU_Lower.inl" />
<Unit filename="../x86/microVU_Misc.h" /> <Unit filename="../x86/microVU_Macro.inl" />
<Unit filename="../x86/microVU_Misc.inl" /> <Unit filename="../x86/microVU_Misc.h" />
<Unit filename="../x86/microVU_Tables.inl" /> <Unit filename="../x86/microVU_Misc.inl" />
<Unit filename="../x86/microVU_Upper.inl" /> <Unit filename="../x86/microVU_Tables.inl" />
<Unit filename="../x86/sVU_Debug.h" /> <Unit filename="../x86/microVU_Upper.inl" />
<Unit filename="../x86/sVU_Lower.cpp" /> <Unit filename="../x86/sVU_Debug.h" />
<Unit filename="../x86/sVU_Micro.cpp" /> <Unit filename="../x86/sVU_Lower.cpp" />
<Unit filename="../x86/sVU_Micro.h" /> <Unit filename="../x86/sVU_Micro.cpp" />
<Unit filename="../x86/sVU_Upper.cpp" /> <Unit filename="../x86/sVU_Micro.h" />
<Unit filename="../x86/sVU_zerorec.cpp" /> <Unit filename="../x86/sVU_Upper.cpp" />
<Unit filename="../x86/sVU_zerorec.h" /> <Unit filename="../x86/sVU_zerorec.cpp" />
<Extensions> <Unit filename="../x86/sVU_zerorec.h" />
<envvars /> <Extensions>
<code_completion> <envvars />
<search_path add="/usr/include/wx-2.8" /> <code_completion>
</code_completion> <search_path add="/usr/include/wx-2.8" />
<lib_finder disable_auto="1" /> </code_completion>
<debugger /> <lib_finder disable_auto="1" />
</Extensions> <debugger />
</Project> </Extensions>
</CodeBlocks_project_file> </Project>
</CodeBlocks_project_file>

29
pcsx2/PluginManager.cpp
View File

@ -690,6 +690,21 @@ PluginManager::PluginManager( const wxString (&folders)[PluginId_Count] )
//m_libs[i].GetSymbol( L"PS2E_InitAPI" ); //m_libs[i].GetSymbol( L"PS2E_InitAPI" );
// Fetch plugin name and version information
_PS2EgetLibName GetLibName = (_PS2EgetLibName)m_info[pid].Lib.GetSymbol( L"PS2EgetLibName" );
_PS2EgetLibVersion2 GetLibVersion2 = (_PS2EgetLibVersion2)m_info[pid].Lib.GetSymbol( L"PS2EgetLibVersion2" );
if( GetLibName == NULL || GetLibVersion2 == NULL )
throw Exception::PluginLoadError( pid, m_info[pid].Filename,
wxsFormat( L"\nMethod binding failure on GetLibName or GetLibVersion2.\n" ),
_( "Configured plugin is not a PCSX2 plugin, or is for an older unsupported version of PCSX2." )
);
m_info[pid].Name = fromUTF8( GetLibName() );
int version = GetLibVersion2( tbl_PluginInfo[pid].typemask );
m_info[pid].Version.Printf( L"%d.%d.%d", (version>>8)&0xff, version&0xff, (version>>24)&0xff );
// Bind Required Functions // Bind Required Functions
// (generate critical error if binding fails) // (generate critical error if binding fails)
@ -720,6 +735,9 @@ PluginManager::PluginManager( const wxString (&folders)[PluginId_Count] )
x86caps.PhysicalCores, x86caps.PhysicalCores,
x86caps.LogicalCores, x86caps.LogicalCores,
sizeof(wchar_t),
0,0,0,0,0,0,
pcsx2_GetInt, pcsx2_GetInt,
pcsx2_GetBoolean, pcsx2_GetBoolean,
@ -1116,15 +1134,6 @@ void PluginManager::Configure( PluginsEnum_t pid )
m_info[pid].CommonBindings.Configure(); m_info[pid].CommonBindings.Configure();
} }
// Creates an instance of a plugin manager, using the specified plugin filenames for sources.
// Impl Note: Have to use this stupid effing 'friend' declaration because static members of
// classes can't access their own protected members. W-T-F?
//
PluginManager* PluginManager_Create( const wxString (&folders)[PluginId_Count] )
{
return new PluginManager( folders );
}
PluginManager* PluginManager_Create( const wxChar* (&folders)[PluginId_Count] ) PluginManager* PluginManager_Create( const wxChar* (&folders)[PluginId_Count] )
{ {
wxString passins[PluginId_Count]; wxString passins[PluginId_Count];
@ -1133,7 +1142,7 @@ PluginManager* PluginManager_Create( const wxChar* (&folders)[PluginId_Count] )
passins[pi->id] = folders[pi->id]; passins[pi->id] = folders[pi->id];
} while( ++pi, pi->shortname != NULL ); } while( ++pi, pi->shortname != NULL );
return PluginManager_Create( passins ); return new PluginManager( passins );
} }
static PluginManagerBase s_pluginman_placebo; static PluginManagerBase s_pluginman_placebo;

13
pcsx2/Plugins.h
View File

@ -272,7 +272,10 @@ protected:
{ {
bool IsInitialized; bool IsInitialized;
bool IsOpened; bool IsOpened;
wxString Filename; wxString Filename;
wxString Name;
wxString Version;
LegacyPluginAPI_Common CommonBindings; LegacyPluginAPI_Common CommonBindings;
wxDynamicLibrary Lib; wxDynamicLibrary Lib;
@ -280,7 +283,6 @@ protected:
PluginStatus_t() : PluginStatus_t() :
IsInitialized( false ) IsInitialized( false )
, IsOpened( false ) , IsOpened( false )
, Filename()
, CommonBindings() , CommonBindings()
, Lib() , Lib()
{ {
@ -295,6 +297,7 @@ public: // hack until we unsuck plugins...
PluginStatus_t m_info[PluginId_Count]; PluginStatus_t m_info[PluginId_Count];
public: public:
PluginManager( const wxString (&folders)[PluginId_Count] );
virtual ~PluginManager() throw(); virtual ~PluginManager() throw();
void Init(); void Init();
@ -310,13 +313,12 @@ public:
bool KeyEvent( const keyEvent& evt ); bool KeyEvent( const keyEvent& evt );
void Configure( PluginsEnum_t pid ); void Configure( PluginsEnum_t pid );
friend PluginManager* PluginManager_Create( const wxString (&folders)[PluginId_Count] ); const wxString& GetName( PluginsEnum_t pid ) const { return m_info[pid].Name; }
const wxString& GetVersion( PluginsEnum_t pid ) const { return m_info[pid].Version; }
friend PluginManager* PluginManager_Create( const wxChar* (&folders)[PluginId_Count] ); friend PluginManager* PluginManager_Create( const wxChar* (&folders)[PluginId_Count] );
protected: protected:
// Internal constructor, should be called by Create only.
PluginManager( const wxString (&folders)[PluginId_Count] );
void BindCommon( PluginsEnum_t pid ); void BindCommon( PluginsEnum_t pid );
void BindRequired( PluginsEnum_t pid ); void BindRequired( PluginsEnum_t pid );
void BindOptional( PluginsEnum_t pid ); void BindOptional( PluginsEnum_t pid );
@ -327,7 +329,6 @@ protected:
extern const PluginInfo tbl_PluginInfo[]; extern const PluginInfo tbl_PluginInfo[];
extern PluginManager* g_plugins; extern PluginManager* g_plugins;
extern PluginManager* PluginManager_Create( const wxString (&folders)[PluginId_Count] );
extern PluginManager* PluginManager_Create( const wxChar* (&folders)[PluginId_Count] ); extern PluginManager* PluginManager_Create( const wxChar* (&folders)[PluginId_Count] );
extern PluginManagerBase& GetPluginManager(); extern PluginManagerBase& GetPluginManager();

6
pcsx2/R5900OpcodeImpl.cpp
View File

@ -790,7 +790,7 @@ int __Deci2Call(int call, u32 *addr)
pdeciaddr += (deci2addr[4]+0xc)%16; pdeciaddr += (deci2addr[4]+0xc)%16;
memcpy(deci2buffer, pdeciaddr, deci2addr[1]-0xc); memcpy(deci2buffer, pdeciaddr, deci2addr[1]-0xc);
deci2buffer[deci2addr[1]-0xc>=255?255:deci2addr[1]-0xc]='\0'; deci2buffer[deci2addr[1]-0xc>=255?255:deci2addr[1]-0xc]='\0';
Console.Write( ConColor_EE, ShiftJIS_ConvertString(deci2buffer) ); Console.Write( ConColor_EE, L"%s", ShiftJIS_ConvertString(deci2buffer).c_str() );
} }
deci2addr[3] = 0; deci2addr[3] = 0;
return 1; return 1;
@ -809,7 +809,7 @@ int __Deci2Call(int call, u32 *addr)
case 0x10://kputs case 0x10://kputs
if( addr != NULL ) if( addr != NULL )
Console.Write( ConColor_EE, ShiftJIS_ConvertString((char*)PSM(*addr)) ); Console.Write( ConColor_EE, L"%s", ShiftJIS_ConvertString((char*)PSM(*addr)).c_str() );
return 1; return 1;
} }
@ -831,7 +831,7 @@ void SYSCALL()
if (call == 0x7c) if (call == 0x7c)
{ {
if(cpuRegs.GPR.n.a0.UL[0] == 0x10) if(cpuRegs.GPR.n.a0.UL[0] == 0x10)
Console.Write( ConColor_EE, ShiftJIS_ConvertString((char*)PSM(memRead32(cpuRegs.GPR.n.a1.UL[0]))) ); Console.Write( ConColor_EE, L"%s", ShiftJIS_ConvertString((char*)PSM(memRead32(cpuRegs.GPR.n.a1.UL[0]))).c_str() );
else else
__Deci2Call( cpuRegs.GPR.n.a0.UL[0], (u32*)PSM(cpuRegs.GPR.n.a1.UL[0]) ); __Deci2Call( cpuRegs.GPR.n.a0.UL[0], (u32*)PSM(cpuRegs.GPR.n.a1.UL[0]) );
} }

52
pcsx2/System/SysCoreThread.cpp
View File

@ -96,6 +96,16 @@ void SysCoreThread::Reset()
m_resetVirtualMachine = true; m_resetVirtualMachine = true;
} }
// This function *will* reset the emulator in order to allow the specified elf file to
// take effect. This is because it really doesn't make sense to change the elf file outside
// the context of a reset/restart.
void SysCoreThread::SetElfOverride( const wxString& elf )
{
pxAssertDev( !m_hasValidState, "Thread synchronization error while assigning ELF override." );
m_elf_override = elf;
}
// Applies a full suite of new settings, which will automatically facilitate the necessary // Applies a full suite of new settings, which will automatically facilitate the necessary
// resets of the core and components (including plugins, if needed). The scope of resetting // resets of the core and components (including plugins, if needed). The scope of resetting
// is determined by comparing the current settings against the new settings. // is determined by comparing the current settings against the new settings.
@ -128,6 +138,24 @@ bool SysCoreThread::HasPendingStateChangeRequest() const
return m_CoreCancelDamnit || mtgsThread.HasPendingException() || _parent::HasPendingStateChangeRequest(); return m_CoreCancelDamnit || mtgsThread.HasPendingException() || _parent::HasPendingStateChangeRequest();
} }
struct ScopedBool_ClearOnError
{
bool& m_target;
bool m_success;
ScopedBool_ClearOnError( bool& target ) :
m_target( target ), m_success( false )
{
m_target = true;
}
virtual ~ScopedBool_ClearOnError()
{
m_target = m_success;
}
void Success() { m_success = true; }
};
void SysCoreThread::CpuInitializeMess() void SysCoreThread::CpuInitializeMess()
{ {
@ -139,8 +167,10 @@ void SysCoreThread::CpuInitializeMess()
m_resetRecompilers = false; m_resetRecompilers = false;
m_resetProfilers = false; m_resetProfilers = false;
wxString elf_file; ScopedBool_ClearOnError sbcoe( m_hasValidState );
if( EmuConfig.SkipBiosSplash )
wxString elf_file( m_elf_override );
if( elf_file.IsEmpty() && EmuConfig.SkipBiosSplash )
{ {
// Fetch the ELF filename and CD type from the CDVD provider. // Fetch the ELF filename and CD type from the CDVD provider.
wxString ename; wxString ename;
@ -164,19 +194,19 @@ void SysCoreThread::CpuInitializeMess()
if( !elf_file.IsEmpty() ) if( !elf_file.IsEmpty() )
{ {
// Skip Bios Hack -- Runs the PS2 BIOS stub, and then manually loads the ELF // Skip Bios Hack *or* Manual ELF override:
// executable data, and injects the cpuRegs.pc with the address of the // Runs the PS2 BIOS stub, and then manually loads the ELF executable data, and
// execution start point. // injects the cpuRegs.pc with the address of the execution start point.
// //
// This hack is necessary for non-CD ELF files, and is optional for game CDs // This hack is necessary for non-CD ELF files, and is optional for game CDs as a
// (though not recommended for games because of rare ill side effects). // fast bott up option. (though not recommended for games because of rare ill side
// effects).
m_hasValidState = true;
cpuExecuteBios(); cpuExecuteBios();
m_hasValidState = false; // because loadElfFile might error...
loadElfFile( elf_file ); loadElfFile( elf_file );
} }
m_hasValidState = true;
sbcoe.Success();
} }
void SysCoreThread::StateCheckInThread() void SysCoreThread::StateCheckInThread()
@ -227,6 +257,8 @@ void SysCoreThread::OnResumeInThread( bool isSuspended )
// Invoked by the pthread_exit or pthread_cancel. // Invoked by the pthread_exit or pthread_cancel.
void SysCoreThread::OnCleanupInThread() void SysCoreThread::OnCleanupInThread()
{ {
m_hasValidState = false;
Threading::DisableHiresScheduler(); Threading::DisableHiresScheduler();
if( g_plugins != NULL ) if( g_plugins != NULL )

1
pcsx2/System/SysThreadBase.cpp
View File

@ -188,7 +188,6 @@ void SysThreadBase::Resume()
{ {
if( IsSelf() ) return; if( IsSelf() ) return;
if( m_ExecMode == ExecMode_Opened ) return; if( m_ExecMode == ExecMode_Opened ) return;
if( !pxAssert( g_plugins != NULL ) ) return;
ScopedLock locker( m_ExecModeMutex ); ScopedLock locker( m_ExecModeMutex );

6
pcsx2/System/SysThreads.h
View File

@ -186,6 +186,8 @@ protected:
// Used by SETJMP only, but ifdef'ing it out clutters up the code. // Used by SETJMP only, but ifdef'ing it out clutters up the code.
bool m_CoreCancelDamnit; bool m_CoreCancelDamnit;
wxString m_elf_override;
public: public:
static SysCoreThread& Get(); static SysCoreThread& Get();
@ -204,8 +206,10 @@ public:
} }
bool HasPendingStateChangeRequest() const; bool HasPendingStateChangeRequest() const;
virtual void StateCheckInThread(); virtual void StateCheckInThread();
virtual const wxString& GetElfOverride() const { return m_elf_override; }
virtual void SetElfOverride( const wxString& elf );
protected: protected:
void CpuInitializeMess(); void CpuInitializeMess();

157
pcsx2/gui/App.h
View File

@ -18,7 +18,6 @@
#include <wx/wx.h> #include <wx/wx.h>
#include <wx/fileconf.h> #include <wx/fileconf.h>
#include <wx/imaglist.h> #include <wx/imaglist.h>
#include <wx/docview.h>
#include <wx/apptrait.h> #include <wx/apptrait.h>
#include "Utilities/EventSource.h" #include "Utilities/EventSource.h"
@ -56,6 +55,9 @@ END_DECLARE_EVENT_TYPES()
// the universal Accelerator table. // the universal Accelerator table.
static const int pxID_PadHandler_Keydown = 8030; static const int pxID_PadHandler_Keydown = 8030;
// Plugin ID sections are spaced out evenly at intervals to make it easy to use a
// single for-loop to create them.
static const int PluginMenuId_Interval = 0x10;
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// All Menu Options for the Main Window! :D // All Menu Options for the Main Window! :D
@ -82,6 +84,7 @@ enum MenuIdentifiers
MenuId_Src_Plugin, MenuId_Src_Plugin,
MenuId_Src_NoDisc, MenuId_Src_NoDisc,
MenuId_Boot_Iso, // Opens submenu with Iso browser, and recent isos. MenuId_Boot_Iso, // Opens submenu with Iso browser, and recent isos.
MenuId_IsoSelector, // Contains a submenu of selectable "favorite" isos
MenuId_IsoBrowse, // Open dialog, runs selected iso. MenuId_IsoBrowse, // Open dialog, runs selected iso.
MenuId_Boot_CDVD, // opens a submenu filled by CDVD plugin (usually list of drives) MenuId_Boot_CDVD, // opens a submenu filled by CDVD plugin (usually list of drives)
MenuId_Boot_ELF, MenuId_Boot_ELF,
@ -122,20 +125,17 @@ enum MenuIdentifiers
MenuId_Config_Multitap0Toggle, MenuId_Config_Multitap0Toggle,
MenuId_Config_Multitap1Toggle, MenuId_Config_Multitap1Toggle,
// Video Subsection // Plugin Sections
// Top items are PCSX2-controlled. GS plugin items are inserted beneath. // ---------------
MenuId_Video_Basics, // includes frame timings and skippings settings // Each plugin menu begins with its name, which is a grayed out option that's
MenuId_Video_Advanced, // inserted at the bottom of the menu // intended for display purposes only. Plugin ID sections are spaced out evenly
// at intervals to make it easy to use a single for-loop to create them.
// Audio subsection MenuId_PluginBase_Name = 0x100,
// Top items are PCSX2-controlled. SPU2 plugin items are inserted beneath. MenuId_PluginBase_Settings = 0x101,
// [no items at this time]
MenuId_Audio_Advanced, // inserted at the bottom of the menu MenuId_Video_CoreSettings = 0x200,// includes frame timings and skippings settings
// Controller subsection
// Top items are PCSX2-controlled. Pad plugin items are inserted beneath.
// [no items at this time]
MenuId_Pad_Advanced,
// Miscellaneous Menu! (Misc) // Miscellaneous Menu! (Misc)
MenuId_Website, // Visit our awesome website! MenuId_Website, // Visit our awesome website!
@ -163,6 +163,17 @@ enum AppEventType
AppStatus_Exiting AppStatus_Exiting
}; };
enum PluginEventType
{
PluginsEvt_Loaded,
PluginsEvt_Init,
PluginsEvt_Open,
PluginsEvt_Close,
PluginsEvt_Shutdown,
PluginsEvt_Unloaded,
};
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// KeyAcceleratorCode // KeyAcceleratorCode
// A custom keyboard accelerator that I like better than wx's wxAcceleratorEntry. // A custom keyboard accelerator that I like better than wx's wxAcceleratorEntry.
@ -251,6 +262,54 @@ public:
}; };
// --------------------------------------------------------------------------------------
// RecentIsoList
// --------------------------------------------------------------------------------------
class RecentIsoList : public wxEvtHandler
{
protected:
struct RecentItem
{
wxString Filename;
wxMenuItem* ItemPtr;
RecentItem() { ItemPtr = NULL; }
RecentItem( const wxString& src ) :
Filename( src )
, ItemPtr( NULL )
{
}
};
std::vector<RecentItem> m_Items;
wxMenu* m_Menu;
uint m_MaxLength;
int m_cursel;
wxMenuItem* m_Separator;
EventListenerBinding<IniInterface> m_Listener_SettingsLoadSave;
public:
RecentIsoList( wxMenu* menu );
virtual ~RecentIsoList() throw();
void RemoveAllFromMenu();
void Repopulate();
void Add( const wxString& src );
protected:
void InsertIntoMenu( int id );
void DoSettingsLoadSave( IniInterface& ini );
void OnChangedSelection( wxCommandEvent& evt );
static void __evt_fastcall OnSettingsLoadSave( void* obj, IniInterface& evt );
};
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// AppImageIds - Config and Toolbar Images and Icons // AppImageIds - Config and Toolbar Images and Icons
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
@ -265,14 +324,11 @@ struct AppImageIds
Video, Video,
Cpu; Cpu;
ConfigIds() : ConfigIds()
Paths( -1 )
, Plugins( -1 )
, Speedhacks( -1 )
, Gamefixes( -1 )
, Video( -1 )
, Cpu( -1 )
{ {
Paths = Plugins =
Speedhacks = Gamefixes =
Video = Cpu = -1;
} }
} Config; } Config;
@ -285,13 +341,12 @@ struct AppImageIds
PluginAudio, PluginAudio,
PluginPad; PluginPad;
ToolbarIds() : ToolbarIds()
Settings( -1 )
, Play( -1 )
, PluginVideo( -1 )
, PluginAudio( -1 )
, PluginPad( -1 )
{ {
Settings = Play =
PluginVideo =
PluginAudio =
PluginPad = -1;
} }
} Toolbars; } Toolbars;
}; };
@ -324,12 +379,31 @@ public:
virtual ~AppIniLoader() {} virtual ~AppIniLoader() {}
}; };
// -------------------------------------------------------------------------------------- // =====================================================================================================
// Pcsx2App - main wxApp class // Pcsx2App - main wxApp class
// -------------------------------------------------------------------------------------- // =====================================================================================================
class Pcsx2App : public wxApp class Pcsx2App : public wxApp
{ {
// ----------------------------------------------------------------------------
// Event Sources!
// ----------------------------------------------------------------------------
// These need to be at the top of the App class, because a lot of other things depend
// on them and they are, themselves, fairly self-contained.
protected:
EventSource<PluginEventType>m_evtsrc_CorePluginStatus;
CmdEvt_Source m_evtsrc_CoreThreadStatus;
EventSource<int> m_evtsrc_SettingsApplied;
EventSource<IniInterface> m_evtsrc_SettingsLoadSave;
EventSource<AppEventType> m_evtsrc_AppStatus;
public:
CmdEvt_Source& Source_CoreThreadStatus() { return m_evtsrc_CoreThreadStatus; }
EventSource<int>& Source_SettingsApplied() { return m_evtsrc_SettingsApplied; }
EventSource<AppEventType>& Source_AppStatus() { return m_evtsrc_AppStatus; }
EventSource<PluginEventType>& Source_CorePluginStatus() { return m_evtsrc_CorePluginStatus; }
EventSource<IniInterface>& Source_SettingsLoadSave() { return m_evtsrc_SettingsLoadSave; }
public: public:
CommandDictionary GlobalCommands; CommandDictionary GlobalCommands;
AcceleratorDictionary GlobalAccels; AcceleratorDictionary GlobalAccels;
@ -342,6 +416,9 @@ protected:
ScopedPtr<PipeRedirectionBase> m_StdoutRedirHandle; ScopedPtr<PipeRedirectionBase> m_StdoutRedirHandle;
ScopedPtr<PipeRedirectionBase> m_StderrRedirHandle; ScopedPtr<PipeRedirectionBase> m_StderrRedirHandle;
ScopedPtr<wxMenu> m_RecentIsoMenu;
ScopedPtr<RecentIsoList> m_RecentIsoList;
public: public:
ScopedPtr<SysCoreAllocations> m_CoreAllocs; ScopedPtr<SysCoreAllocations> m_CoreAllocs;
ScopedPtr<PluginManager> m_CorePlugins; ScopedPtr<PluginManager> m_CorePlugins;
@ -368,7 +445,7 @@ public:
bool PrepForExit( bool canCancel ); bool PrepForExit( bool canCancel );
void SysExecute(); void SysExecute();
void SysExecute( CDVD_SourceType cdvdsrc ); void SysExecute( CDVD_SourceType cdvdsrc, const wxString& elf_override=wxEmptyString );
void SysReset(); void SysReset();
const wxBitmap& GetLogoBitmap(); const wxBitmap& GetLogoBitmap();
@ -376,6 +453,8 @@ public:
wxImageList& GetImgList_Toolbars(); wxImageList& GetImgList_Toolbars();
const AppImageIds& GetImgId() const { return m_ImageId; } const AppImageIds& GetImgId() const { return m_ImageId; }
wxMenu& GetRecentIsoMenu() { return *m_RecentIsoMenu; }
RecentIsoList& GetRecentIsoList() { return *m_RecentIsoList; }
MainEmuFrame& GetMainFrame() const; MainEmuFrame& GetMainFrame() const;
MainEmuFrame* GetMainFramePtr() const { return m_MainFrame; } MainEmuFrame* GetMainFramePtr() const { return m_MainFrame; }
@ -409,24 +488,6 @@ public:
void DisableDiskLogging() const; void DisableDiskLogging() const;
void OnProgramLogClosed(); void OnProgramLogClosed();
// ----------------------------------------------------------------------------
// Event Sources!
// ----------------------------------------------------------------------------
protected:
CmdEvt_Source m_evtsrc_CorePluginStatus;
CmdEvt_Source m_evtsrc_CoreThreadStatus;
EventSource<int> m_evtsrc_SettingsApplied;
EventSource<IniInterface> m_evtsrc_SettingsLoadSave;
EventSource<AppEventType> m_evtsrc_AppStatus;
public:
CmdEvt_Source& Source_CoreThreadStatus() { return m_evtsrc_CoreThreadStatus; }
CmdEvt_Source& Source_CorePluginStatus() { return m_evtsrc_CorePluginStatus; }
EventSource<int>& Source_SettingsApplied() { return m_evtsrc_SettingsApplied; }
EventSource<IniInterface>& Source_SettingsLoadSave() { return m_evtsrc_SettingsLoadSave; }
EventSource<AppEventType>& Source_AppStatus() { return m_evtsrc_AppStatus; }
protected: protected:
void InitDefaultGlobalAccelerators(); void InitDefaultGlobalAccelerators();
void BuildCommandHash(); void BuildCommandHash();

4
pcsx2/gui/AppConfig.cpp
View File

@ -323,6 +323,7 @@ AppConfig::AppConfig() :
, CloseGSonEsc( true ) , CloseGSonEsc( true )
, CurrentIso() , CurrentIso()
, CurrentELF()
, CdvdSource( CDVDsrc_Iso ) , CdvdSource( CDVDsrc_Iso )
, ProgLogBox() , ProgLogBox()
@ -394,6 +395,7 @@ void AppConfig::LoadSaveRootItems( IniInterface& ini )
IniEntry( Toolbar_ShowLabels ); IniEntry( Toolbar_ShowLabels );
IniEntry( CurrentIso ); IniEntry( CurrentIso );
IniEntry( CurrentELF );
ini.EnumEntry( L"CdvdSource", CdvdSource, CDVD_SourceLabels, defaults.CdvdSource ); ini.EnumEntry( L"CdvdSource", CdvdSource, CDVD_SourceLabels, defaults.CdvdSource );
} }
@ -459,6 +461,7 @@ AppConfig::FolderOptions::FolderOptions() :
, Logs( PathDefs::GetLogs() ) , Logs( PathDefs::GetLogs() )
, RunIso( PathDefs::GetDocuments() ) // raw default is always the Documents folder. , RunIso( PathDefs::GetDocuments() ) // raw default is always the Documents folder.
, RunELF( PathDefs::GetDocuments() ) // raw default is always the Documents folder.
{ {
} }
@ -488,6 +491,7 @@ void AppConfig::FolderOptions::LoadSave( IniInterface& ini )
IniEntry( Logs ); IniEntry( Logs );
IniEntry( RunIso ); IniEntry( RunIso );
IniEntry( RunELF );
if( ini.IsLoading() ) if( ini.IsLoading() )
{ {

2
pcsx2/gui/AppConfig.h
View File

@ -76,6 +76,7 @@ public:
Logs; Logs;
wxDirName RunIso; // last used location for Iso loading. wxDirName RunIso; // last used location for Iso loading.
wxDirName RunELF; // last used location for ELF loading.
FolderOptions(); FolderOptions();
void LoadSave( IniInterface& conf ); void LoadSave( IniInterface& conf );
@ -142,6 +143,7 @@ public:
bool CloseGSonEsc; bool CloseGSonEsc;
wxString CurrentIso; wxString CurrentIso;
wxString CurrentELF;
CDVD_SourceType CdvdSource; CDVD_SourceType CdvdSource;
McdOptions Mcd[2][4]; McdOptions Mcd[2][4];

6
pcsx2/gui/AppCoreThread.cpp
View File

@ -31,10 +31,6 @@ bool AppCoreThread::Suspend( bool isBlocking )
{ {
bool retval = _parent::Suspend( isBlocking ); bool retval = _parent::Suspend( isBlocking );
/*wxCommandEvent evt( pxEVT_CoreThreadStatus );
evt.SetInt( CoreStatus_Suspended );
wxGetApp().AddPendingEvent( evt );*/
// Clear the sticky key statuses, because hell knows what'll change while the PAD // Clear the sticky key statuses, because hell knows what'll change while the PAD
// plugin is suspended. // plugin is suspended.
@ -52,6 +48,8 @@ void AppCoreThread::Resume()
{ {
// Thread control (suspend / resume) should only be performed from the main/gui thread. // Thread control (suspend / resume) should only be performed from the main/gui thread.
if( !AllowFromMainThreadOnly() ) return; if( !AllowFromMainThreadOnly() ) return;
if( m_ExecMode == ExecMode_Opened ) return;
if( !pxAssert( g_plugins != NULL ) ) return;
if( sys_resume_lock > 0 ) if( sys_resume_lock > 0 )
{ {

12
pcsx2/gui/AppInit.cpp
View File

@ -263,10 +263,11 @@ bool Pcsx2App::OnInit()
try try
{ {
InitDefaultGlobalAccelerators(); InitDefaultGlobalAccelerators();
delete wxLog::SetActiveTarget( new pxLogConsole() ); delete wxLog::SetActiveTarget( new pxLogConsole() );
ReadUserModeSettings();
m_RecentIsoList = new RecentIsoList( m_RecentIsoMenu );
ReadUserModeSettings();
AppConfig_OnChangedSettingsFolder(); AppConfig_OnChangedSettingsFolder();
m_MainFrame = new MainEmuFrame( NULL, L"PCSX2" ); m_MainFrame = new MainEmuFrame( NULL, L"PCSX2" );
@ -396,9 +397,12 @@ Pcsx2App::Pcsx2App() :
, m_ConfigImagesAreLoaded( false ) , m_ConfigImagesAreLoaded( false )
, m_ToolbarImages( NULL ) , m_ToolbarImages( NULL )
, m_Bitmap_Logo( NULL ) , m_Bitmap_Logo( NULL )
, m_RecentIsoMenu( new wxMenu() )
{ {
SetAppName( L"pcsx2" ); SetAppName( L"pcsx2" );
BuildCommandHash(); BuildCommandHash();
m_RecentIsoMenu->Append( MenuId_IsoBrowse, _("Browse..."), _("Browse for an Iso that is not in your recent history.") );
} }
Pcsx2App::~Pcsx2App() Pcsx2App::~Pcsx2App()
@ -434,7 +438,7 @@ Pcsx2App::~Pcsx2App()
// this feature you need to execute pcsx in no-gui mode, and then not move the mouse or use // this feature you need to execute pcsx in no-gui mode, and then not move the mouse or use
// the keyboard until you get to the leak. >_< // the keyboard until you get to the leak. >_<
// //
// (but this tool is still still better than nothing!) // (but this tool is still better than nothing!)
#ifdef PCSX2_DEBUG #ifdef PCSX2_DEBUG
struct CrtDebugBreak struct CrtDebugBreak
@ -447,6 +451,6 @@ struct CrtDebugBreak
} }
}; };
//CrtDebugBreak breakAt( 7586 ); //CrtDebugBreak breakAt( 4327 );
#endif #endif

11
pcsx2/gui/AppMain.cpp
View File

@ -42,6 +42,7 @@ DEFINE_EVENT_TYPE( pxEVT_FreezeThreadFinished );
#include "Utilities/EventSource.inl" #include "Utilities/EventSource.inl"
EventSource_ImplementType( IniInterface ); EventSource_ImplementType( IniInterface );
EventSource_ImplementType( AppEventType ); EventSource_ImplementType( AppEventType );
EventSource_ImplementType( PluginEventType );
bool UseAdminMode = false; bool UseAdminMode = false;
wxDirName SettingsFolder; wxDirName SettingsFolder;
@ -442,6 +443,7 @@ void Pcsx2App::OnMainFrameClosed()
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
static int _sysexec_cdvdsrc_type = -1; static int _sysexec_cdvdsrc_type = -1;
static wxString _sysexec_elf_override;
static void _sendmsg_SysExecute() static void _sendmsg_SysExecute()
{ {
@ -461,6 +463,7 @@ static void OnSysExecuteAfterPlugins( const wxCommandEvent& loadevt )
void Pcsx2App::SysExecute() void Pcsx2App::SysExecute()
{ {
_sysexec_cdvdsrc_type = -1; _sysexec_cdvdsrc_type = -1;
_sysexec_elf_override = CoreThread.GetElfOverride();
if( !m_CorePlugins ) if( !m_CorePlugins )
{ {
LoadPluginsPassive( OnSysExecuteAfterPlugins ); LoadPluginsPassive( OnSysExecuteAfterPlugins );
@ -472,9 +475,11 @@ void Pcsx2App::SysExecute()
// Executes the specified cdvd source and optional elf file. This command performs a // Executes the specified cdvd source and optional elf file. This command performs a
// full closure of any existing VM state and starts a fresh VM with the requested // full closure of any existing VM state and starts a fresh VM with the requested
// sources. // sources.
void Pcsx2App::SysExecute( CDVD_SourceType cdvdsrc ) void Pcsx2App::SysExecute( CDVD_SourceType cdvdsrc, const wxString& elf_override )
{ {
_sysexec_cdvdsrc_type = (int)cdvdsrc; _sysexec_cdvdsrc_type = (int)cdvdsrc;
_sysexec_elf_override = elf_override;
if( !m_CorePlugins ) if( !m_CorePlugins )
{ {
LoadPluginsPassive( OnSysExecuteAfterPlugins ); LoadPluginsPassive( OnSysExecuteAfterPlugins );
@ -498,7 +503,9 @@ void Pcsx2App::OnSysExecute( wxCommandEvent& evt )
if( evt.GetInt() != -1 ) CoreThread.Reset(); else CoreThread.Suspend(); if( evt.GetInt() != -1 ) CoreThread.Reset(); else CoreThread.Suspend();
CDVDsys_SetFile( CDVDsrc_Iso, g_Conf->CurrentIso ); CDVDsys_SetFile( CDVDsrc_Iso, g_Conf->CurrentIso );
if( evt.GetInt() != -1 ) CDVDsys_ChangeSource( (CDVD_SourceType)evt.GetInt() ); if( evt.GetInt() != -1 ) CDVDsys_ChangeSource( (CDVD_SourceType)evt.GetInt() );
if( !CoreThread.HasValidState() )
CoreThread.SetElfOverride( _sysexec_elf_override );
CoreThread.Resume(); CoreThread.Resume();
} }

32
pcsx2/gui/ConsoleLogger.cpp
View File

@ -25,7 +25,6 @@
#ifdef __WXMSW__ #ifdef __WXMSW__
# include <wx/msw/wrapwin.h> // needed for OutputDebugStirng # include <wx/msw/wrapwin.h> // needed for OutputDebugStirng
# include <richedit.h>
#endif #endif
BEGIN_DECLARE_EVENT_TYPES() BEGIN_DECLARE_EVENT_TYPES()
@ -206,14 +205,14 @@ void ConsoleLogFrame::ColorArray::Cleanup()
// The contents of m_table were created with placement new, and must be // The contents of m_table were created with placement new, and must be
// disposed of manually: // disposed of manually:
for( int i=0; i<8; ++i ) for( int i=0; i<ConsoleColors_Count; ++i )
m_table[i].~wxTextAttr(); m_table[i].~wxTextAttr();
} }
// fixme - not implemented yet. // fixme - not implemented yet.
void ConsoleLogFrame::ColorArray::SetFont( const wxFont& font ) void ConsoleLogFrame::ColorArray::SetFont( const wxFont& font )
{ {
//for( int i=0; i<8; ++i ) //for( int i=0; i<ConsoleColors_Count; ++i )
// m_table[i].SetFont( font ); // m_table[i].SetFont( font );
} }
@ -257,13 +256,6 @@ ConsoleLogFrame::ConsoleLogFrame( MainEmuFrame *parent, const wxString& title, A
m_TextCtrl.SetBackgroundColour( wxColor( 230, 235, 242 ) ); m_TextCtrl.SetBackgroundColour( wxColor( 230, 235, 242 ) );
m_TextCtrl.SetDefaultStyle( m_ColorTable[DefaultConsoleColor] ); m_TextCtrl.SetDefaultStyle( m_ColorTable[DefaultConsoleColor] );
#ifdef __WXMSW__
// This improves Asian text display behavior on Windows. The IMF_DUALFONT flag helps
// the rich edit box reset back to the default font after displaying japanese characters.
// Other editing and messages have been disabled since our console is read-only anyway.
SendMessage( (HWND)m_TextCtrl.GetHWND(), EM_SETLANGOPTIONS, 0, IMF_AUTOFONT | IMF_DUALFONT );
#endif
// create Log menu (contains most options) // create Log menu (contains most options)
wxMenuBar *pMenuBar = new wxMenuBar(); wxMenuBar *pMenuBar = new wxMenuBar();
wxMenu& menuLog = *new wxMenu(); wxMenu& menuLog = *new wxMenu();
@ -301,12 +293,12 @@ ConsoleLogFrame::ConsoleLogFrame( MainEmuFrame *parent, const wxString& title, A
// Bind Events: // Bind Events:
Connect( wxID_OPEN, wxEVT_COMMAND_MENU_SELECTED, wxMenuEventHandler(ConsoleLogFrame::OnOpen) ); Connect( wxID_OPEN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ConsoleLogFrame::OnOpen) );
Connect( wxID_CLOSE, wxEVT_COMMAND_MENU_SELECTED, wxMenuEventHandler(ConsoleLogFrame::OnClose) ); Connect( wxID_CLOSE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ConsoleLogFrame::OnClose) );
Connect( wxID_SAVE, wxEVT_COMMAND_MENU_SELECTED, wxMenuEventHandler(ConsoleLogFrame::OnSave) ); Connect( wxID_SAVE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ConsoleLogFrame::OnSave) );
Connect( wxID_CLEAR, wxEVT_COMMAND_MENU_SELECTED, wxMenuEventHandler(ConsoleLogFrame::OnClear) ); Connect( wxID_CLEAR, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ConsoleLogFrame::OnClear) );
Connect( MenuID_FontSize_Small, MenuID_FontSize_Huge, wxEVT_COMMAND_MENU_SELECTED, wxMenuEventHandler( ConsoleLogFrame::OnFontSize ) ); Connect( MenuID_FontSize_Small, MenuID_FontSize_Huge, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ConsoleLogFrame::OnFontSize ) );
Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler(ConsoleLogFrame::OnCloseWindow) ); Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler(ConsoleLogFrame::OnCloseWindow) );
Connect( wxEVT_MOVE, wxMoveEventHandler(ConsoleLogFrame::OnMoveAround) ); Connect( wxEVT_MOVE, wxMoveEventHandler(ConsoleLogFrame::OnMoveAround) );
@ -461,17 +453,17 @@ void ConsoleLogFrame::OnCloseWindow(wxCloseEvent& event)
} }
} }
void ConsoleLogFrame::OnOpen(wxMenuEvent& WXUNUSED(event)) void ConsoleLogFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
{ {
Show(true); Show(true);
} }
void ConsoleLogFrame::OnClose( wxMenuEvent& event ) void ConsoleLogFrame::OnClose( wxCommandEvent& event )
{ {
DoClose(); DoClose();
} }
void ConsoleLogFrame::OnSave(wxMenuEvent& WXUNUSED(event)) void ConsoleLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
{ {
wxString filename; wxString filename;
wxFile file; wxFile file;
@ -497,12 +489,12 @@ void ConsoleLogFrame::OnSave(wxMenuEvent& WXUNUSED(event))
wxLogStatus(this, L"Log saved to the file '%s'.", filename.c_str()); wxLogStatus(this, L"Log saved to the file '%s'.", filename.c_str());
} }
void ConsoleLogFrame::OnClear(wxMenuEvent& WXUNUSED(event)) void ConsoleLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))
{ {
m_TextCtrl.Clear(); m_TextCtrl.Clear();
} }
void ConsoleLogFrame::OnFontSize( wxMenuEvent& evt ) void ConsoleLogFrame::OnFontSize( wxCommandEvent& evt )
{ {
int ptsize = 8; int ptsize = 8;
switch( evt.GetId() ) switch( evt.GetId() )

10
pcsx2/gui/ConsoleLogger.h
View File

@ -200,12 +200,12 @@ public:
protected: protected:
// menu callbacks // menu callbacks
virtual void OnOpen (wxMenuEvent& event); virtual void OnOpen (wxCommandEvent& event);
virtual void OnClose(wxMenuEvent& event); virtual void OnClose(wxCommandEvent& event);
virtual void OnSave (wxMenuEvent& event); virtual void OnSave (wxCommandEvent& event);
virtual void OnClear(wxMenuEvent& event); virtual void OnClear(wxCommandEvent& event);
void OnFontSize(wxMenuEvent& event); void OnFontSize(wxCommandEvent& event);
virtual void OnCloseWindow(wxCloseEvent& event); virtual void OnCloseWindow(wxCloseEvent& event);

281
pcsx2/gui/MainFrame.cpp
View File

@ -42,22 +42,6 @@ wxMenu* MainEmuFrame::MakeStatesSubMenu( int baseid ) const
return mnuSubstates; return mnuSubstates;
} }
// ------------------------------------------------------------------------
wxMenu* MainEmuFrame::MakeCdvdMenu()
{
wxMenu* mnuCdvd = new wxMenu();
mnuCdvd->Append( MenuId_Src_Iso, _("Iso"), wxEmptyString, wxITEM_RADIO );
mnuCdvd->Append( MenuId_Src_Plugin, _("Plugin"), wxEmptyString, wxITEM_RADIO );
mnuCdvd->Append( MenuId_Src_NoDisc, _("No disc"), wxEmptyString, wxITEM_RADIO );
mnuCdvd->AppendSeparator();
mnuCdvd->Append( MenuId_IsoBrowse, _("Iso Browser..."), _("Select the Iso source image.") );
mnuCdvd->Append( MenuId_Config_CDVD, _("Plugin settings..."),
_("Opens the CDVD plugin configuration dialog") );
return mnuCdvd;
}
void MainEmuFrame::UpdateIsoSrcSelection() void MainEmuFrame::UpdateIsoSrcSelection()
{ {
MenuIdentifiers cdsrc = MenuId_Src_Iso; MenuIdentifiers cdsrc = MenuId_Src_Iso;
@ -81,47 +65,8 @@ void MainEmuFrame::UpdateIsoSrcFile()
if( !exists ) if( !exists )
g_Conf->CurrentIso.Clear(); g_Conf->CurrentIso.Clear();
wxString label; //sMenuBar.SetLabel( MenuId_Src_Iso, wxsFormat( L"%s -> %s", _("Iso"),
label.Printf( L"%s -> %s", _("Iso"), // exists ? Path::GetFilename(g_Conf->CurrentIso).c_str() : _("Empty") ) );
exists ? g_Conf->CurrentIso.c_str() : _("Empty")
);
sMenuBar.SetLabel( MenuId_Src_Iso, label );
}
void MainEmuFrame::LoadSaveRecentIsoList( IniInterface& conf )
{
if( conf.IsLoading() )
m_RecentIsoList->Load( conf.GetConfig() );
else
m_RecentIsoList->Save( conf.GetConfig() );
}
// ------------------------------------------------------------------------
// Video / Audio / Pad "Extensible" Menus
// ------------------------------------------------------------------------
void MainEmuFrame::PopulateVideoMenu()
{
m_menuVideo.Append( MenuId_Video_Basics, _("Basic Settings..."), wxEmptyString, wxITEM_CHECK );
m_menuVideo.AppendSeparator();
// Populate options from the plugin here.
m_menuVideo.Append( MenuId_Video_Advanced, _("Advanced..."), wxEmptyString, wxITEM_NORMAL );
}
void MainEmuFrame::PopulateAudioMenu()
{
// Populate options from the plugin here.
m_menuAudio.Append( MenuId_Audio_Advanced, _("Advanced..."), wxEmptyString, wxITEM_NORMAL );
}
void MainEmuFrame::PopulatePadMenu()
{
// Populate options from the plugin here.
m_menuPad.Append( MenuId_Pad_Advanced, _("Advanced..."), wxEmptyString, wxITEM_NORMAL );
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -206,9 +151,8 @@ void MainEmuFrame::ConnectMenus()
ConnectMenuRange(MenuId_Config_GS, PluginId_Count, Menu_ConfigPlugin_Click); ConnectMenuRange(MenuId_Config_GS, PluginId_Count, Menu_ConfigPlugin_Click);
ConnectMenuRange(MenuId_Src_Iso, 3, Menu_CdvdSource_Click); ConnectMenuRange(MenuId_Src_Iso, 3, Menu_CdvdSource_Click);
ConnectMenu( MenuId_Video_Advanced, Menu_ConfigPlugin_Click); for( int i=0; i<PluginId_Count; ++i )
ConnectMenu( MenuId_Audio_Advanced, Menu_ConfigPlugin_Click); ConnectMenu( MenuId_PluginBase_Settings + (i*PluginMenuId_Interval), Menu_ConfigPlugin_Click);
ConnectMenu( MenuId_Pad_Advanced, Menu_ConfigPlugin_Click);
ConnectMenu( MenuId_Boot_CDVD, Menu_BootCdvd_Click ); ConnectMenu( MenuId_Boot_CDVD, Menu_BootCdvd_Click );
ConnectMenu( MenuId_Boot_ELF, Menu_OpenELF_Click ); ConnectMenu( MenuId_Boot_ELF, Menu_OpenELF_Click );
@ -258,20 +202,29 @@ void __evt_fastcall MainEmuFrame::OnCoreThreadStatusChanged( void* obj, wxComman
{ {
if( obj == NULL ) return; if( obj == NULL ) return;
MainEmuFrame* mframe = (MainEmuFrame*)obj; MainEmuFrame* mframe = (MainEmuFrame*)obj;
if( !pxAssertMsg( mframe->GetMenuBar()!=NULL, "Mainframe menu bar is NULL!" ) ) return;
mframe->ApplyCoreStatus(); mframe->ApplyCoreStatus();
} }
void __evt_fastcall MainEmuFrame::OnCorePluginStatusChanged( void* obj, wxCommandEvent& evt ) void __evt_fastcall MainEmuFrame::OnCorePluginStatusChanged( void* obj, PluginEventType& evt )
{ {
if( obj == NULL ) return; if( obj == NULL ) return;
MainEmuFrame* mframe = (MainEmuFrame*)obj; if( (evt != PluginsEvt_Loaded) && (evt != PluginsEvt_Unloaded) ) return; // everything else we don't care about
mframe->ApplyCoreStatus();
MainEmuFrame& mframe = *(MainEmuFrame*)obj;
if( !pxAssertMsg( mframe.GetMenuBar()!=NULL, "Mainframe menu bar is NULL!" ) ) return;
mframe.ApplyCoreStatus();
mframe.ApplyPluginStatus();
} }
void __evt_fastcall MainEmuFrame::OnSettingsApplied( void* obj, int& evt ) void __evt_fastcall MainEmuFrame::OnSettingsApplied( void* obj, int& evt )
{ {
if( obj == NULL ) return; if( obj == NULL ) return;
MainEmuFrame* mframe = (MainEmuFrame*)obj; MainEmuFrame* mframe = (MainEmuFrame*)obj;
if( !pxAssertMsg( mframe->GetMenuBar()!=NULL, "Mainframe menu bar is NULL!" ) ) return;
mframe->ApplySettings(); mframe->ApplySettings();
} }
@ -280,15 +233,22 @@ void __evt_fastcall MainEmuFrame::OnSettingsLoadSave( void* obj, IniInterface& e
if( obj == NULL ) return; if( obj == NULL ) return;
MainEmuFrame* mframe = (MainEmuFrame*)obj; MainEmuFrame* mframe = (MainEmuFrame*)obj;
mframe->LoadSaveRecentIsoList( evt ); }
static int GetPluginMenuId_Settings( PluginsEnum_t pid )
{
return MenuId_PluginBase_Settings + ((int)pid * PluginMenuId_Interval);
}
static int GetPluginMenuId_Name( PluginsEnum_t pid )
{
return MenuId_PluginBase_Name + ((int)pid * PluginMenuId_Interval);
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title): MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title):
wxFrame(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER) ), wxFrame(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER) ),
m_RecentIsoList( new wxFileHistory( g_Conf->RecentFileCount ) ),
m_statusbar( *CreateStatusBar(2, 0) ), m_statusbar( *CreateStatusBar(2, 0) ),
m_background( this, wxID_ANY, wxGetApp().GetLogoBitmap() ), m_background( this, wxID_ANY, wxGetApp().GetLogoBitmap() ),
@ -297,34 +257,34 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title):
m_menubar( *new wxMenuBar() ), m_menubar( *new wxMenuBar() ),
m_menuBoot ( *new wxMenu() ), m_menuBoot ( *new wxMenu() ),
m_menuEmu ( *new wxMenu() ), m_menuCDVD ( *new wxMenu() ),
m_menuSys ( *new wxMenu() ),
m_menuConfig( *new wxMenu() ), m_menuConfig( *new wxMenu() ),
m_menuMisc ( *new wxMenu() ), m_menuMisc ( *new wxMenu() ),
m_menuVideo ( *new wxMenu() ),
m_menuAudio ( *new wxMenu() ),
m_menuPad ( *new wxMenu() ),
m_menuDebug ( *new wxMenu() ), m_menuDebug ( *new wxMenu() ),
m_LoadStatesSubmenu( *MakeStatesSubMenu( MenuId_State_Load01 ) ), m_LoadStatesSubmenu( *MakeStatesSubMenu( MenuId_State_Load01 ) ),
m_SaveStatesSubmenu( *MakeStatesSubMenu( MenuId_State_Save01 ) ), m_SaveStatesSubmenu( *MakeStatesSubMenu( MenuId_State_Save01 ) ),
m_MenuItem_Console( *new wxMenuItem( &m_menuMisc, MenuId_Console, L"Show Console", wxEmptyString, wxITEM_CHECK ) ), m_MenuItem_Console( *new wxMenuItem( &m_menuMisc, MenuId_Console, L"Show Console", wxEmptyString, wxITEM_CHECK ) ),
m_Listener_CoreThreadStatus( wxGetApp().Source_CoreThreadStatus(), CmdEvt_Listener( this, OnCoreThreadStatusChanged ) ), m_Listener_CoreThreadStatus( wxGetApp().Source_CoreThreadStatus(), CmdEvt_Listener( this, OnCoreThreadStatusChanged ) ),
m_Listener_CorePluginStatus( wxGetApp().Source_CorePluginStatus(), CmdEvt_Listener( this, OnCorePluginStatusChanged ) ), m_Listener_CorePluginStatus( wxGetApp().Source_CorePluginStatus(), EventListener<PluginEventType>( this, OnCorePluginStatusChanged ) ),
m_Listener_SettingsApplied( wxGetApp().Source_SettingsApplied(), EventListener<int>( this, OnSettingsApplied ) ), m_Listener_SettingsApplied( wxGetApp().Source_SettingsApplied(), EventListener<int>( this, OnSettingsApplied ) ),
m_Listener_SettingsLoadSave( wxGetApp().Source_SettingsLoadSave(), EventListener<IniInterface>( this, OnSettingsLoadSave ) ) m_Listener_SettingsLoadSave( wxGetApp().Source_SettingsLoadSave(), EventListener<IniInterface>( this, OnSettingsLoadSave ) )
{ {
for( int i=0; i<PluginId_Count; ++i )
m_PluginMenuPacks[i].Populate( (PluginsEnum_t)i );
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Initial menubar setup. This needs to be done first so that the menu bar's visible size // Initial menubar setup. This needs to be done first so that the menu bar's visible size
// can be factored into the window size (which ends up being background+status+menus) // can be factored into the window size (which ends up being background+status+menus)
m_menubar.Append( &m_menuBoot, _("&Boot") ); m_menubar.Append( &m_menuBoot, _("&Boot") );
m_menubar.Append( &m_menuEmu, _("&System") ); m_menubar.Append( &m_menuCDVD, _("CD&VD") );
m_menubar.Append( &m_menuSys, _("&System") );
m_menubar.Append( &m_menuConfig, _("&Config") ); m_menubar.Append( &m_menuConfig, _("&Config") );
m_menubar.Append( &m_menuVideo, _("&Video") );
m_menubar.Append( &m_menuAudio, _("&Audio") );
m_menubar.Append( &m_menuMisc, _("&Misc") ); m_menubar.Append( &m_menuMisc, _("&Misc") );
m_menubar.Append( &m_menuDebug, _("&Debug") ); m_menubar.Append( &m_menuDebug, _("&Debug") );
SetMenuBar( &m_menubar ); SetMenuBar( &m_menubar );
@ -393,35 +353,43 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title):
wxMenu* recentRunMenu = new wxMenu(); wxMenu* recentRunMenu = new wxMenu();
m_menuBoot.Append(MenuId_Boot_Recent, _("Run Recent"), recentRunMenu); m_menuBoot.Append(MenuId_Boot_Recent, _("Run Recent"), recentRunMenu);
m_RecentIsoList->UseMenu( recentRunMenu );
m_RecentIsoList->AddFilesToMenu( recentRunMenu );
m_menuBoot.AppendSeparator();
m_menuBoot.Append(MenuId_Cdvd_Source, _("Select CDVD source"), MakeCdvdMenu() );
m_menuBoot.Append(MenuId_SkipBiosToggle,_("BIOS Skip Hack"),
_("Skips PS2 splash screens when booting from Iso or CDVD media"), wxITEM_CHECK );
m_menuBoot.AppendSeparator(); m_menuBoot.AppendSeparator();
m_menuBoot.Append(MenuId_Exit, _("Exit"), m_menuBoot.Append(MenuId_Exit, _("Exit"),
_("Closing PCSX2 may be hazardous to your health")); _("Closing PCSX2 may be hazardous to your health"));
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
m_menuEmu.Append(MenuId_Sys_SuspendResume, _("Suspend") )->Enable( SysHasValidState() ); wxMenu& isoRecents( wxGetApp().GetRecentIsoMenu() );
m_menuEmu.AppendSeparator(); //m_menuCDVD.AppendSeparator();
m_menuCDVD.Append( MenuId_IsoSelector, _("Iso Selector"), &isoRecents );
m_menuCDVD.Append( GetPluginMenuId_Settings(PluginId_CDVD), _("Plugin Menu"), m_PluginMenuPacks[PluginId_CDVD] );
//m_menuEmu.Append(MenuId_Sys_Close, _("Close"), m_menuCDVD.AppendSeparator();
m_menuCDVD.Append( MenuId_Src_Iso, _("Iso"), _("Makes the specified ISO image the CDVD source."), wxITEM_RADIO );
m_menuCDVD.Append( MenuId_Src_Plugin, _("Plugin"), _("Uses an external plugin as the CDVD source."), wxITEM_RADIO );
m_menuCDVD.Append( MenuId_Src_NoDisc, _("No disc"), _("Use this to boot into your virtual PS2's BIOS configuration."), wxITEM_RADIO );
m_menuCDVD.AppendSeparator();
m_menuCDVD.Append( MenuId_SkipBiosToggle,_("Enable Skip BIOS Hack"),
_("Skips PS2 splash screens when booting from Iso or CDVD media"), wxITEM_CHECK );
// ------------------------------------------------------------------------
m_menuSys.Append(MenuId_Sys_SuspendResume, _("Suspend") )->Enable( SysHasValidState() );
m_menuSys.AppendSeparator();
//m_menuSys.Append(MenuId_Sys_Close, _("Close"),
// _("Stops emulation and closes the GS window.")); // _("Stops emulation and closes the GS window."));
m_menuEmu.Append(MenuId_Sys_LoadStates, _("Load state"), &m_LoadStatesSubmenu); m_menuSys.Append(MenuId_Sys_LoadStates, _("Load state"), &m_LoadStatesSubmenu);
m_menuEmu.Append(MenuId_Sys_SaveStates, _("Save state"), &m_SaveStatesSubmenu); m_menuSys.Append(MenuId_Sys_SaveStates, _("Save state"), &m_SaveStatesSubmenu);
m_menuEmu.AppendSeparator(); m_menuSys.AppendSeparator();
m_menuEmu.Append(MenuId_EnablePatches, _("Enable Patches"), m_menuSys.Append(MenuId_EnablePatches, _("Enable Patches"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
m_menuEmu.AppendSeparator(); m_menuSys.AppendSeparator();
m_menuEmu.Append(MenuId_Sys_Reset, _("Reset"), m_menuSys.Append(MenuId_Sys_Reset, _("Reset"),
_("Resets emulation state and re-runs current image")); _("Resets emulation state and re-runs current image"));
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -429,13 +397,13 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title):
m_menuConfig.Append(MenuId_Config_Settings, _("General &Settings") ); m_menuConfig.Append(MenuId_Config_Settings, _("General &Settings") );
m_menuConfig.AppendSeparator(); m_menuConfig.AppendSeparator();
m_menuConfig.Append(MenuId_Config_PAD, _("PAD"), &m_menuPad );
// Query installed "tertiary" plugins for name and menu options. m_menuConfig.Append(MenuId_Config_GS, _("Video (GS)"), m_PluginMenuPacks[PluginId_GS]);
m_menuConfig.Append(MenuId_Config_CDVD, _("CDVD"), wxEmptyString); m_menuConfig.Append(MenuId_Config_SPU2, _("Audio (SPU2)"), m_PluginMenuPacks[PluginId_SPU2]);
m_menuConfig.Append(MenuId_Config_DEV9, _("Dev9"), wxEmptyString); m_menuConfig.Append(MenuId_Config_PAD, _("Controllers (PAD)"), m_PluginMenuPacks[PluginId_PAD]);
m_menuConfig.Append(MenuId_Config_USB, _("USB"), wxEmptyString); m_menuConfig.Append(MenuId_Config_DEV9, _("Dev9"), m_PluginMenuPacks[PluginId_DEV9]);
m_menuConfig.Append(MenuId_Config_FireWire, _("Firewire"), wxEmptyString); m_menuConfig.Append(MenuId_Config_USB, _("USB"), m_PluginMenuPacks[PluginId_USB]);
m_menuConfig.Append(MenuId_Config_FireWire, _("Firewire"), m_PluginMenuPacks[PluginId_FW]);
m_menuConfig.AppendSeparator(); m_menuConfig.AppendSeparator();
m_menuConfig.Append(MenuId_Config_Patches, _("Patches"), wxEmptyString); m_menuConfig.Append(MenuId_Config_Patches, _("Patches"), wxEmptyString);
@ -451,12 +419,6 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title):
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
PopulateVideoMenu();
PopulateAudioMenu();
PopulatePadMenu();
// ------------------------------------------------------------------------
m_menuMisc.Append( &m_MenuItem_Console ); m_menuMisc.Append( &m_MenuItem_Console );
m_menuMisc.Append(MenuId_Profiler, _("Show Profiler"), wxEmptyString, wxITEM_CHECK); m_menuMisc.Append(MenuId_Profiler, _("Show Profiler"), wxEmptyString, wxITEM_CHECK);
m_menuMisc.AppendSeparator(); m_menuMisc.AppendSeparator();
@ -487,36 +449,18 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title):
MainEmuFrame::~MainEmuFrame() throw() MainEmuFrame::~MainEmuFrame() throw()
{ {
try m_menuCDVD.Remove( MenuId_IsoSelector );
{
if( m_RecentIsoList && GetAppConfig() )
m_RecentIsoList->Save( *GetAppConfig() );
}
DESTRUCTOR_CATCHALL
} }
// This should be called whenever major changes to the ini configs have occurred, // This should be called whenever major changes to the ini configs have occurred,
// or when the recent file count mismatches the max filecount. // or when the recent file count mismatches the max filecount.
void MainEmuFrame::ReloadRecentLists() void MainEmuFrame::ReloadRecentLists()
{ {
// Always perform delete and reload of the Recent Iso List. This handles cases where
// the recent file count has been changed, and it's a helluva lot easier than trying
// to make a clone copy of this complex object. ;)
wxConfigBase* cfg = GetAppConfig();
pxAssert( cfg != NULL );
if( m_RecentIsoList )
m_RecentIsoList->Save( *cfg );
m_RecentIsoList.Reassign( new wxFileHistory(g_Conf->RecentFileCount) )->Load( *cfg );
UpdateIsoSrcFile();
cfg->Flush();
} }
void MainEmuFrame::ApplyCoreStatus() void MainEmuFrame::ApplyCoreStatus()
{ {
wxMenuBar& menubar( *GetMenuBar() ); wxMenuBar& menubar( *GetMenuBar() );
if( !pxAssertMsg( &menubar!=NULL, "Mainframe menu bar is NULL!" ) ) return;
wxMenuItem& susres( *menubar.FindItem( MenuId_Sys_SuspendResume ) ); wxMenuItem& susres( *menubar.FindItem( MenuId_Sys_SuspendResume ) );
if( !pxAssertMsg( &susres!=NULL, "Suspend/Resume Menubar Item is NULL!" ) ) return; if( !pxAssertMsg( &susres!=NULL, "Suspend/Resume Menubar Item is NULL!" ) ) return;
@ -544,19 +488,96 @@ void MainEmuFrame::ApplyCoreStatus()
menubar.Enable( MenuId_Sys_Reset, SysHasValidState() || (g_plugins!=NULL) ); menubar.Enable( MenuId_Sys_Reset, SysHasValidState() || (g_plugins!=NULL) );
} }
void MainEmuFrame::ApplyPluginStatus()
{
wxMenuBar& menubar( *GetMenuBar() );
if( g_plugins == NULL )
{
for( int i=0; i<PluginId_Count; ++i )
m_PluginMenuPacks[i].OnUnloaded();
}
else
{
for( int i=0; i<PluginId_Count; ++i )
m_PluginMenuPacks[i].OnLoaded();
// bleh this makes the menu too cluttered. --air
//m_menuCDVD.SetLabel( MenuId_Src_Plugin, wxsFormat( L"%s (%s)", _("Plugin"),
// g_plugins->GetName( PluginId_CDVD ).c_str() ) );
}
// Re-populate plugin menus.
// Delete any menu options added by plugins (typically a plugin will have already
// done its own proper cleanup when the plugin was shutdown or unloaded, but lets
// not trust them, shall we?)
}
void MainEmuFrame::ApplySettings() void MainEmuFrame::ApplySettings()
{ {
wxMenuBar& menubar( *GetMenuBar() ); wxMenuBar& menubar( *GetMenuBar() );
if( !pxAssertMsg( &menubar!=NULL, "Mainframe menu bar is NULL!" ) ) return;
menubar.Check( MenuId_SkipBiosToggle, g_Conf->EmuOptions.SkipBiosSplash ); menubar.Check( MenuId_SkipBiosToggle, g_Conf->EmuOptions.SkipBiosSplash );
menubar.Check( MenuId_Config_Multitap0Toggle, g_Conf->EmuOptions.MultitapPort0_Enabled ); menubar.Check( MenuId_Config_Multitap0Toggle, g_Conf->EmuOptions.MultitapPort0_Enabled );
menubar.Check( MenuId_Config_Multitap1Toggle, g_Conf->EmuOptions.MultitapPort1_Enabled ); menubar.Check( MenuId_Config_Multitap1Toggle, g_Conf->EmuOptions.MultitapPort1_Enabled );
if( m_RecentIsoList ) UpdateIsoSrcFile();
{
if( m_RecentIsoList->GetMaxFiles() != g_Conf->RecentFileCount )
ReloadRecentLists();
}
} }
// ------------------------------------------------------------------------
// "Extensible" Plugin Menus
// ------------------------------------------------------------------------
PerPluginMenuInfo::~PerPluginMenuInfo() throw()
{
}
void PerPluginMenuInfo::Populate( PluginsEnum_t pid )
{
if( !pxAssert(pid < PluginId_Count) ) return;
PluginId = pid;
MyMenu.Append( GetPluginMenuId_Name(PluginId), _("No plugin loaded") )->Enable( false );
MyMenu.AppendSeparator();
if( PluginId == PluginId_GS )
{
MyMenu.Append( MenuId_Video_CoreSettings, _("Core Settings..."),
_("Modify video emulation settings regulated by the PCSX2 core virtual machine."), wxITEM_CHECK );
MyMenu.AppendSeparator();
}
// Populate options from the plugin here.
MyMenu.Append( GetPluginMenuId_Settings(PluginId), _("Plugin Settings..."),
wxsFormat( _("Opens the %s plugin's advanced settings dialog."), tbl_PluginInfo[pid].GetShortname() )
);
}
// deletes menu items belonging to (created by) the plugin. Leaves menu items created
// by the PCSX2 core intact.
void PerPluginMenuInfo::OnUnloaded()
{
MenuItemAddonList& curlist( m_PluginMenuItems );
for( uint mx=0; mx<curlist.size(); ++mx )
MyMenu.Delete( curlist[mx].Item );
curlist.clear();
MyMenu.SetLabel( GetPluginMenuId_Name(PluginId), _("No plugin loaded") );
MyMenu.Enable( GetPluginMenuId_Settings(PluginId), false );
}
void PerPluginMenuInfo::OnLoaded()
{
MenuItemAddonList& curlist( m_PluginMenuItems );
MyMenu.SetLabel( GetPluginMenuId_Name(PluginId),
g_plugins->GetName( PluginId ) + L" " + g_plugins->GetVersion( PluginId )
);
MyMenu.Enable( GetPluginMenuId_Settings(PluginId), true );
}

80
pcsx2/gui/MainFrame.h
View File

@ -36,6 +36,59 @@ protected:
void OnKeyDown( wxKeyEvent& evt ); void OnKeyDown( wxKeyEvent& evt );
}; };
struct PluginMenuAddition
{
wxString Text;
wxString HelpText;
PS2E_MenuItemStyle Flags;
wxMenuItem* Item;
int ItemId;
// Optional user data pointer (or typecast integer value)
void* UserPtr;
void (PS2E_CALLBACK *OnClicked)( PS2E_THISPTR* thisptr, void* userptr );
};
// --------------------------------------------------------------------------------------
// PerPluginMenuInfo
// --------------------------------------------------------------------------------------
class PerPluginMenuInfo
{
protected:
typedef std::vector<PluginMenuAddition> MenuItemAddonList;
// A list of menu items belonging to this plugin's menu.
MenuItemAddonList m_PluginMenuItems;
// Base index for inserting items, usually points to the position
// after the heading entry and separator.
int m_InsertIndexBase;
// Current index for inserting menu items; increments with each item
// added by a plugin.
int m_InsertIndexCur;
public:
PluginsEnum_t PluginId;
wxMenu& MyMenu;
public:
PerPluginMenuInfo() : MyMenu( *new wxMenu() )
{
}
virtual ~PerPluginMenuInfo() throw();
void Populate( PluginsEnum_t pid );
void OnUnloaded();
void OnLoaded();
operator wxMenu*() { return &MyMenu; }
operator const wxMenu*() const { return &MyMenu; }
};
class MainEmuFrame : public wxFrame class MainEmuFrame : public wxFrame
{ {
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -43,31 +96,29 @@ class MainEmuFrame : public wxFrame
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
protected: protected:
ScopedPtr<wxFileHistory> m_RecentIsoList;
wxStatusBar& m_statusbar; wxStatusBar& m_statusbar;
wxStaticBitmap m_background; wxStaticBitmap m_background;
wxMenuBar& m_menubar; wxMenuBar& m_menubar;
wxMenu& m_menuBoot; wxMenu& m_menuBoot;
wxMenu& m_menuEmu; wxMenu& m_menuCDVD;
wxMenu& m_menuSys;
wxMenu& m_menuConfig; wxMenu& m_menuConfig;
wxMenu& m_menuMisc; wxMenu& m_menuMisc;
wxMenu& m_menuDebug; wxMenu& m_menuDebug;
wxMenu& m_menuVideo;
wxMenu& m_menuAudio;
wxMenu& m_menuPad;
wxMenu& m_LoadStatesSubmenu; wxMenu& m_LoadStatesSubmenu;
wxMenu& m_SaveStatesSubmenu; wxMenu& m_SaveStatesSubmenu;
wxMenuItem& m_MenuItem_Console; wxMenuItem& m_MenuItem_Console;
PerPluginMenuInfo m_PluginMenuPacks[PluginId_Count];
CmdEvt_ListenerBinding m_Listener_CoreThreadStatus; CmdEvt_ListenerBinding m_Listener_CoreThreadStatus;
CmdEvt_ListenerBinding m_Listener_CorePluginStatus; EventListenerBinding<PluginEventType> m_Listener_CorePluginStatus;
EventListenerBinding<int> m_Listener_SettingsApplied; EventListenerBinding<int> m_Listener_SettingsApplied;
EventListenerBinding<IniInterface> m_Listener_SettingsLoadSave; EventListenerBinding<IniInterface> m_Listener_SettingsLoadSave;
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// MainEmuFrame Constructors and Member Methods // MainEmuFrame Constructors and Member Methods
@ -86,13 +137,13 @@ public:
protected: protected:
static void __evt_fastcall OnCoreThreadStatusChanged( void* obj, wxCommandEvent& evt ); static void __evt_fastcall OnCoreThreadStatusChanged( void* obj, wxCommandEvent& evt );
static void __evt_fastcall OnCorePluginStatusChanged( void* obj, wxCommandEvent& evt ); static void __evt_fastcall OnCorePluginStatusChanged( void* obj, PluginEventType& evt );
static void __evt_fastcall OnSettingsApplied( void* obj, int& evt ); static void __evt_fastcall OnSettingsApplied( void* obj, int& evt );
static void __evt_fastcall OnSettingsLoadSave( void* obj, IniInterface& evt ); static void __evt_fastcall OnSettingsLoadSave( void* obj, IniInterface& evt );
void LoadSaveRecentIsoList( IniInterface& conf );
void ApplySettings(); void ApplySettings();
void ApplyCoreStatus(); void ApplyCoreStatus();
void ApplyPluginStatus();
void InitLogBoxPosition( AppConfig::ConsoleLogOptions& conf ); void InitLogBoxPosition( AppConfig::ConsoleLogOptions& conf );
@ -131,6 +182,7 @@ protected:
void Menu_ShowAboutBox(wxCommandEvent &event); void Menu_ShowAboutBox(wxCommandEvent &event);
bool _DoSelectIsoBrowser(); bool _DoSelectIsoBrowser();
bool _DoSelectELFBrowser();
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// MainEmuFram Internal API for Populating Main Menu Contents // MainEmuFram Internal API for Populating Main Menu Contents
@ -139,11 +191,7 @@ protected:
wxMenu* MakeStatesSubMenu( int baseid ) const; wxMenu* MakeStatesSubMenu( int baseid ) const;
wxMenu* MakeStatesMenu(); wxMenu* MakeStatesMenu();
wxMenu* MakeLanguagesMenu() const; wxMenu* MakeLanguagesMenu() const;
wxMenu* MakeCdvdMenu();
void PopulateVideoMenu();
void PopulateAudioMenu();
void PopulatePadMenu();
void ConnectMenus(); void ConnectMenus();
friend class Pcsx2App; friend class Pcsx2App;

59
pcsx2/gui/MainMenuClicks.cpp
View File

@ -65,8 +65,9 @@ bool MainEmuFrame::_DoSelectIsoBrowser()
{ {
g_Conf->Folders.RunIso = wxFileName( ctrl.GetPath() ).GetPath(); g_Conf->Folders.RunIso = wxFileName( ctrl.GetPath() ).GetPath();
g_Conf->CurrentIso = ctrl.GetPath(); g_Conf->CurrentIso = ctrl.GetPath();
AppSaveSettings(); sApp.GetRecentIsoList().Add( g_Conf->CurrentIso );
AppSaveSettings();
UpdateIsoSrcFile(); UpdateIsoSrcFile();
return true; return true;
} }
@ -74,6 +75,26 @@ bool MainEmuFrame::_DoSelectIsoBrowser()
return false; return false;
} }
bool MainEmuFrame::_DoSelectELFBrowser()
{
static const wxChar* elfFilterTypes =
L"ELF Files (.elf)|*.elf|"
L"All Files (*.*)|*.*";
wxFileDialog ctrl( this, _("Select ELF file..."), g_Conf->Folders.RunELF.ToString(), wxEmptyString,
elfFilterTypes, wxFD_OPEN | wxFD_FILE_MUST_EXIST );
if( ctrl.ShowModal() != wxID_CANCEL )
{
g_Conf->Folders.RunELF = wxFileName( ctrl.GetPath() ).GetPath();
g_Conf->CurrentELF = ctrl.GetPath();
AppSaveSettings();
return true;
}
return false;
}
void MainEmuFrame::Menu_BootCdvd_Click( wxCommandEvent &event ) void MainEmuFrame::Menu_BootCdvd_Click( wxCommandEvent &event )
{ {
CoreThread.Suspend(); CoreThread.Suspend();
@ -116,13 +137,12 @@ void MainEmuFrame::Menu_RunIso_Click( wxCommandEvent &event )
{ {
CoreThread.Suspend(); CoreThread.Suspend();
if( !_DoSelectIsoBrowser() ) if( _DoSelectIsoBrowser() )
{ {
CoreThread.Resume(); sApp.SysExecute( CDVDsrc_Iso );
return;
} }
sApp.SysExecute( CDVDsrc_Iso ); CoreThread.Resume();
} }
void MainEmuFrame::Menu_IsoRecent_Click(wxCommandEvent &event) void MainEmuFrame::Menu_IsoRecent_Click(wxCommandEvent &event)
@ -153,6 +173,13 @@ void MainEmuFrame::Menu_SkipBiosToggle_Click( wxCommandEvent &event )
void MainEmuFrame::Menu_OpenELF_Click(wxCommandEvent &event) void MainEmuFrame::Menu_OpenELF_Click(wxCommandEvent &event)
{ {
CoreThread.Suspend();
if( _DoSelectELFBrowser() )
{
sApp.SysExecute( g_Conf->CdvdSource, g_Conf->CurrentELF );
}
CoreThread.Resume();
} }
void MainEmuFrame::Menu_LoadStates_Click(wxCommandEvent &event) void MainEmuFrame::Menu_LoadStates_Click(wxCommandEvent &event)
@ -206,7 +233,9 @@ void MainEmuFrame::Menu_SysReset_Click(wxCommandEvent &event)
sApp.SysReset(); sApp.SysReset();
if( resume ) if( resume )
{
sApp.SysExecute(); sApp.SysExecute();
}
GetMenuBar()->Enable( MenuId_Sys_Reset, resume ); GetMenuBar()->Enable( MenuId_Sys_Reset, resume );
} }
@ -214,22 +243,10 @@ void MainEmuFrame::Menu_SysReset_Click(wxCommandEvent &event)
void MainEmuFrame::Menu_ConfigPlugin_Click(wxCommandEvent &event) void MainEmuFrame::Menu_ConfigPlugin_Click(wxCommandEvent &event)
{ {
typedef void (CALLBACK* PluginConfigureFnptr)(); typedef void (CALLBACK* PluginConfigureFnptr)();
const int eventId = event.GetId(); const int eventId = event.GetId() - MenuId_PluginBase_Settings;
PluginsEnum_t pid;
switch (eventId) { PluginsEnum_t pid = (PluginsEnum_t)(eventId / PluginMenuId_Interval);
case MenuId_Video_Advanced: if( !pxAssertDev( (eventId >= 0) || (pid < PluginId_Count), "Invalid plugin identifier passed to ConfigPlugin event handler." ) ) return;
pid = PluginId_GS;
break;
case MenuId_Audio_Advanced:
pid = PluginId_SPU2;
break;
case MenuId_Pad_Advanced:
pid = PluginId_PAD;
break;
default:
pid = (PluginsEnum_t)( event.GetId() - MenuId_Config_GS );
break;
}
LoadPluginsImmediate(); LoadPluginsImmediate();
if( g_plugins == NULL ) return; if( g_plugins == NULL ) return;

58
pcsx2/gui/Plugins.cpp
View File

@ -29,6 +29,54 @@ using namespace Threading;
static FnType_OnThreadComplete* Callback_PluginsLoadComplete = NULL; static FnType_OnThreadComplete* Callback_PluginsLoadComplete = NULL;
class AppPluginManager : public PluginManager
{
typedef PluginManager _parent;
public:
AppPluginManager( const wxString (&folders)[PluginId_Count] ) : PluginManager( folders )
{
}
virtual ~AppPluginManager() throw()
{
PluginEventType pevt = PluginsEvt_Unloaded;
sApp.Source_CorePluginStatus().Dispatch( pevt );
}
void Init()
{
_parent::Init();
PluginEventType pevt = PluginsEvt_Init;
sApp.Source_CorePluginStatus().Dispatch( pevt );
}
void Shutdown()
{
_parent::Shutdown();
PluginEventType pevt = PluginsEvt_Shutdown;
sApp.Source_CorePluginStatus().Dispatch( pevt );
}
void Close()
{
_parent::Close();
PluginEventType pevt = PluginsEvt_Close;
sApp.Source_CorePluginStatus().Dispatch( pevt );
}
void Open()
{
_parent::Open();
PluginEventType pevt = PluginsEvt_Open;
sApp.Source_CorePluginStatus().Dispatch( pevt );
}
};
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// LoadPluginsTask // LoadPluginsTask
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
@ -74,7 +122,7 @@ void LoadPluginsTask::ExecuteTaskInThread()
// This is for testing of the error handler... uncomment for fun? // This is for testing of the error handler... uncomment for fun?
//throw Exception::PluginError( PluginId_PAD, "This one is for testing the error handler!" ); //throw Exception::PluginError( PluginId_PAD, "This one is for testing the error handler!" );
Result = PluginManager_Create( m_folders ); Result = new AppPluginManager( m_folders );
} }
void LoadPluginsTask::OnCleanupInThread() void LoadPluginsTask::OnCleanupInThread()
@ -166,7 +214,9 @@ void Pcsx2App::OnLoadPluginsComplete( wxCommandEvent& evt )
if( fn_tmp != NULL ) fn_tmp( evt ); if( fn_tmp != NULL ) fn_tmp( evt );
//m_evtsrc_PluginLoadFinished.Dispatch( evt ); PluginEventType pevt = PluginsEvt_Loaded;
sApp.Source_CorePluginStatus().Dispatch( pevt );
Source_CorePluginStatus().Dispatch( pevt );
} }
// Posts a message to the App to reload plugins. Plugins are loaded via a background thread // Posts a message to the App to reload plugins. Plugins are loaded via a background thread
@ -206,12 +256,12 @@ void LoadPluginsImmediate()
wxString passins[PluginId_Count]; wxString passins[PluginId_Count];
ConvertPluginFilenames( passins ); ConvertPluginFilenames( passins );
wxGetApp().m_CorePlugins = PluginManager_Create( passins ); wxGetApp().m_CorePlugins = new AppPluginManager( passins );
} }
void UnloadPlugins() void UnloadPlugins()
{ {
CoreThread.Cancel(); CoreThread.Cancel();
wxGetApp().m_CorePlugins = NULL; sApp.m_CorePlugins = NULL;
} }

167
pcsx2/gui/RecentIsoList.cpp Normal file
View File

@ -0,0 +1,167 @@
/* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2009 PCSX2 Dev Team
*
* PCSX2 is free software: you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with PCSX2.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "MainFrame.h"
RecentIsoList::RecentIsoList( wxMenu* menu ) :
m_Menu( menu )
, m_MaxLength( g_Conf->RecentFileCount )
, m_cursel( 0 )
, m_Separator( NULL )
, m_Listener_SettingsLoadSave( wxGetApp().Source_SettingsLoadSave(), EventListener<IniInterface>( this, OnSettingsLoadSave ) )
{
m_Menu->Connect( wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(RecentIsoList::OnChangedSelection) );
}
RecentIsoList::~RecentIsoList() throw()
{
}
void RecentIsoList::OnChangedSelection( wxCommandEvent& evt )
{
uint cnt = m_Items.size();
uint i=0;
for( ; i<cnt; ++i )
{
if( (m_Items[i].ItemPtr == NULL) || (m_Items[i].ItemPtr->GetId() != evt.GetId()) ) continue;
}
if( i >= m_Items.size() ) return;
m_cursel = i;
g_Conf->CurrentIso = m_Items[i].Filename;
sMainFrame.UpdateIsoSrcFile();
}
void RecentIsoList::RemoveAllFromMenu()
{
if( m_Menu == NULL ) return;
int cnt = m_Items.size();
for( int i=0; i<cnt; ++i )
{
if( m_Items[i].ItemPtr == NULL ) continue;
m_Menu->Destroy( m_Items[i].ItemPtr );
m_Items[i].ItemPtr = NULL;
}
if( m_Separator != NULL )
{
m_Menu->Destroy( m_Separator );
m_Separator = NULL;
}
}
void RecentIsoList::Repopulate()
{
int cnt = m_Items.size();
if( cnt <= 0 ) return;
m_Separator = m_Menu->AppendSeparator();
for( int i=0; i<cnt; ++i )
InsertIntoMenu( i );
}
void RecentIsoList::Add( const wxString& src )
{
if( src.IsEmpty() ) return;
wxFileName temp( src );
temp.Normalize();
wxString normalized( temp.GetFullPath() );
int cnt = m_Items.size();
if( cnt <= 0 )
{
pxAssert( m_Separator == NULL );
m_Separator = m_Menu->AppendSeparator();
}
else
{
for( int i=0; i<cnt; ++i )
{
if( m_Items[i].Filename == normalized )
{
m_cursel = i;
if( m_Items[i].ItemPtr != NULL )
m_Items[i].ItemPtr->Check();
return;
}
}
}
m_Items.push_back( RecentItem( normalized ) );
InsertIntoMenu( m_cursel = (m_Items.size()-1) );
while( m_Items.size() > m_MaxLength )
{
m_Items.erase( m_Items.begin() );
}
}
void RecentIsoList::InsertIntoMenu( int id )
{
if( m_Menu == NULL ) return;
RecentItem& curitem( m_Items[id] );
curitem.ItemPtr = m_Menu->Append( wxID_ANY, Path::GetFilename(curitem.Filename), curitem.Filename, wxITEM_RADIO );
if( m_cursel == id )
curitem.ItemPtr->Check();
}
void RecentIsoList::DoSettingsLoadSave( IniInterface& ini )
{
ini.GetConfig().SetRecordDefaults( false );
if( ini.IsSaving() )
{
// Wipe existing recent iso list if we're saving, because our size might have changed
// and that could leave some residual entries in the config.
ini.GetConfig().DeleteGroup( L"RecentIso" );
IniScopedGroup groupie( ini, L"RecentIso" );
int cnt = m_Items.size();
for( int i=0; i<cnt; ++i )
{
ini.Entry( wxsFormat( L"Filename%02d", i ), m_Items[i].Filename );
}
}
else
{
RemoveAllFromMenu();
m_MaxLength = g_Conf->RecentFileCount;
IniScopedGroup groupie( ini, L"RecentIso" );
for( uint i=0; i<m_MaxLength; ++i )
{
wxString loadtmp;
ini.Entry( wxsFormat( L"Filename%02d", i ), loadtmp );
if( !loadtmp.IsEmpty() ) Add( loadtmp );
}
Add( g_Conf->CurrentIso );
}
ini.GetConfig().SetRecordDefaults( true );
}
void __evt_fastcall RecentIsoList::OnSettingsLoadSave( void* obj, IniInterface& ini )
{
if( obj == NULL ) return;
((RecentIsoList*)obj)->DoSettingsLoadSave( ini );
}

2
pcsx2/ps2/Iop/IopHwWrite.cpp
View File

@ -119,7 +119,7 @@ void __fastcall iopHwWrite8_Page3( u32 addr, mem8_t val )
( val == '\n' && g_pbufi != 0 ) ) ( val == '\n' && g_pbufi != 0 ) )
{ {
g_pbuf[g_pbufi] = 0; g_pbuf[g_pbufi] = 0;
Console.WriteLn( ConColor_IOP, g_pbuf ); Console.WriteLn( ConColor_IOP, "%s", g_pbuf );
g_pbufi = 0; g_pbufi = 0;
} }
else if( val != '\n' ) else if( val != '\n' )

4
pcsx2/windows/VCprojects/pcsx2_2008.vcproj
View File

@ -1844,6 +1844,10 @@
RelativePath="..\..\gui\Plugins.cpp" RelativePath="..\..\gui\Plugins.cpp"
> >
</File> </File>
<File
RelativePath="..\..\gui\RecentIsoList.cpp"
>
</File>
<File <File
RelativePath="..\..\RecoverySystem.cpp" RelativePath="..\..\RecoverySystem.cpp"
> >

2
plugins/spu2-x/src/spu2freeze.cpp
View File

@ -31,8 +31,6 @@ namespace Savestate
{ {
memset( pcm_cache_data, 0, pcm_BlockCount * sizeof(PcmCacheEntry) ); memset( pcm_cache_data, 0, pcm_BlockCount * sizeof(PcmCacheEntry) );
} }
static s16 old_state_sBuffer[pcm_DecodedSamplesPerBlock] = {0};
} }
struct Savestate::DataBlock struct Savestate::DataBlock