2009-09-08 12:08:10 +00:00
|
|
|
/* PCSX2 - PS2 Emulator for PCs
|
|
|
|
* Copyright (C) 2002-2009 PCSX2 Dev Team
|
2009-10-04 09:00:07 +00:00
|
|
|
*
|
2009-09-08 12:08:10 +00:00
|
|
|
* 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.
|
2009-04-02 11:30:23 +00:00
|
|
|
*
|
2009-09-08 12:08:10 +00:00
|
|
|
* 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.
|
2009-04-02 11:30:23 +00:00
|
|
|
*
|
2009-09-08 12:08:10 +00:00
|
|
|
* You should have received a copy of the GNU General Public License along with PCSX2.
|
|
|
|
* If not, see <http://www.gnu.org/licenses/>.
|
2009-04-02 11:30:23 +00:00
|
|
|
*/
|
2009-10-04 09:00:07 +00:00
|
|
|
|
2009-04-02 11:30:23 +00:00
|
|
|
#include "PrecompiledHeader.h"
|
2009-07-03 00:49:40 +00:00
|
|
|
|
|
|
|
const wxRect wxDefaultRect( wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord );
|
2009-04-02 11:30:23 +00:00
|
|
|
|
Lots of new code maintenance stuffs:
* Completely new assertion macros: pxAssert, pxAssertMsg, and pxFail, pxAssertDev (both which default to using a message). These replace *all* wxASSERT, DevAssert, and jASSUME varieties of macros. New macros borrow the best of all assertion worlds: MSVCRT, wxASSERT, and AtlAssume. :)
* Rewrote the Console namespace as a structure called IConsoleWriter, and created several varieties of ConsoleWriters for handling different states of log and console availability (should help reduce overhead of console logging nicely).
* More improvements to the PersistentThread model, using safely interlocked "Do*" style callbacks for starting and cleaning up threads.
* Fixed console logs so that they're readable in Win32 notepad again (the log writer adds CRs to naked LFs).
* Added AppInit.cpp -- contains constructor, destructor, OnInit, and command line parsing mess.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1950 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-10-04 08:27:27 +00:00
|
|
|
|
|
|
|
__forceinline wxString fromUTF8( const char* src )
|
|
|
|
{
|
|
|
|
return wxString::FromUTF8( src );
|
|
|
|
}
|
|
|
|
|
|
|
|
__forceinline wxString fromAscii( const char* src )
|
|
|
|
{
|
|
|
|
return wxString::FromAscii( src );
|
|
|
|
}
|
|
|
|
|
2009-04-02 11:30:23 +00:00
|
|
|
// Splits a string into parts and adds the parts into the given SafeList.
|
|
|
|
// This list is not cleared, so concatenating many splits into a single large list is
|
|
|
|
// the 'default' behavior, unless you manually clear the SafeList prior to subsequent calls.
|
|
|
|
//
|
|
|
|
// Note: wxWidgets 2.9 / 3.0 has a wxSplit function, but we're using 2.8 so I had to make
|
|
|
|
// my own.
|
|
|
|
void SplitString( SafeList<wxString>& dest, const wxString& src, const wxString& delims )
|
|
|
|
{
|
|
|
|
wxStringTokenizer parts( src, delims );
|
|
|
|
while( parts.HasMoreTokens() )
|
|
|
|
dest.Add( parts.GetNextToken() );
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:23:02 +00:00
|
|
|
void SplitString( wxArrayString& dest, const wxString& src, const wxString& delims )
|
|
|
|
{
|
|
|
|
wxStringTokenizer parts( src, delims );
|
|
|
|
while( parts.HasMoreTokens() )
|
|
|
|
dest.Add( parts.GetNextToken() );
|
|
|
|
}
|
|
|
|
|
2009-04-02 11:30:23 +00:00
|
|
|
// Joins a list of strings into one larger string, using the given string concatenation
|
|
|
|
// character as a separator. If you want to be able to split the string later then the
|
|
|
|
// concatenation string needs to be a single character.
|
|
|
|
//
|
|
|
|
// Note: wxWidgets 2.9 / 3.0 has a wxJoin function, but we're using 2.8 so I had to make
|
|
|
|
// my own.
|
|
|
|
void JoinString( wxString& dest, const SafeList<wxString>& src, const wxString& separator )
|
|
|
|
{
|
|
|
|
for( int i=0, len=src.GetLength(); i<len; ++i )
|
|
|
|
{
|
|
|
|
if( i != 0 )
|
|
|
|
dest += separator;
|
|
|
|
dest += src[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:23:02 +00:00
|
|
|
void JoinString( wxString& dest, const wxArrayString& src, const wxString& separator )
|
|
|
|
{
|
|
|
|
for( int i=0, len=src.GetCount(); i<len; ++i )
|
|
|
|
{
|
|
|
|
if( i != 0 )
|
|
|
|
dest += separator;
|
|
|
|
dest += src[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-04-02 11:30:23 +00:00
|
|
|
// Attempts to parse and return a value for the given template type, and throws a ParseError
|
|
|
|
// exception if the parse fails. The template type can be anything that is supported/
|
|
|
|
// implemented via one of the TryParse() method overloads.
|
|
|
|
//
|
|
|
|
// This, so far, include types such as wxPoint, wxRect, and wxSize.
|
|
|
|
//
|
|
|
|
template< typename T >
|
2009-05-01 02:15:18 +00:00
|
|
|
T Parse( const wxString& src, const wxString& separators=L",")
|
2009-04-02 11:30:23 +00:00
|
|
|
{
|
|
|
|
T retval;
|
|
|
|
if( !TryParse( retval, src, separators ) )
|
2009-10-29 13:51:49 +00:00
|
|
|
throw Exception::ParseError( "Parse failure on call to " + fromUTF8(__WXFUNCTION__) + ": " + src );
|
2009-04-02 11:30:23 +00:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-09-16 17:23:02 +00:00
|
|
|
// --------------------------------------------------------------------------------------
|
|
|
|
// ToString helpers for wxString!
|
|
|
|
// --------------------------------------------------------------------------------------
|
2009-04-02 11:30:23 +00:00
|
|
|
|
|
|
|
// Converts a wxPoint into a comma-delimited string!
|
|
|
|
wxString ToString( const wxPoint& src, const wxString& separator )
|
|
|
|
{
|
|
|
|
return wxString() << src.x << separator << src.y;
|
|
|
|
}
|
|
|
|
|
|
|
|
wxString ToString( const wxSize& src, const wxString& separator )
|
|
|
|
{
|
|
|
|
return wxString() << src.GetWidth() << separator << src.GetHeight();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Converts a wxRect into a comma-delimited string!
|
|
|
|
// Example: 32,64,128,5
|
|
|
|
wxString ToString( const wxRect& src, const wxString& separator )
|
|
|
|
{
|
|
|
|
return ToString( src.GetLeftTop(), separator ) << separator << ToString( src.GetSize(), separator );
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:23:02 +00:00
|
|
|
// --------------------------------------------------------------------------------------
|
|
|
|
// Parse helpers for wxString!
|
|
|
|
// --------------------------------------------------------------------------------------
|
2009-04-02 11:30:23 +00:00
|
|
|
|
|
|
|
bool TryParse( wxPoint& dest, wxStringTokenizer& parts )
|
|
|
|
{
|
|
|
|
long result[2];
|
|
|
|
|
|
|
|
if( !parts.HasMoreTokens() || !parts.GetNextToken().ToLong( &result[0] ) ) return false;
|
|
|
|
if( !parts.HasMoreTokens() || !parts.GetNextToken().ToLong( &result[1] ) ) return false;
|
|
|
|
dest.x = result[0];
|
|
|
|
dest.y = result[1];
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool TryParse( wxSize& dest, wxStringTokenizer& parts )
|
|
|
|
{
|
|
|
|
long result[2];
|
|
|
|
|
|
|
|
if( !parts.HasMoreTokens() || !parts.GetNextToken().ToLong( &result[0] ) ) return false;
|
|
|
|
if( !parts.HasMoreTokens() || !parts.GetNextToken().ToLong( &result[1] ) ) return false;
|
|
|
|
dest.SetWidth( result[0] );
|
|
|
|
dest.SetHeight( result[1] );
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Tries to parse the given string into a wxPoint value at 'dest.' If the parse fails, the
|
|
|
|
// method aborts and returns false.
|
|
|
|
bool TryParse( wxPoint& dest, const wxString& src, const wxPoint& defval, const wxString& separators )
|
|
|
|
{
|
|
|
|
dest = defval;
|
|
|
|
wxStringTokenizer parts( src, separators );
|
|
|
|
return TryParse( dest, parts );
|
|
|
|
}
|
|
|
|
|
|
|
|
bool TryParse( wxSize& dest, const wxString& src, const wxSize& defval, const wxString& separators )
|
|
|
|
{
|
|
|
|
dest = defval;
|
|
|
|
wxStringTokenizer parts( src, separators );
|
|
|
|
return TryParse( dest, parts );
|
|
|
|
}
|
|
|
|
|
|
|
|
bool TryParse( wxRect& dest, const wxString& src, const wxRect& defval, const wxString& separators )
|
|
|
|
{
|
|
|
|
dest = defval;
|
|
|
|
|
|
|
|
wxStringTokenizer parts( src, separators );
|
2009-10-04 09:00:07 +00:00
|
|
|
|
2009-04-02 11:30:23 +00:00
|
|
|
wxPoint point;
|
|
|
|
wxSize size;
|
|
|
|
|
|
|
|
if( !TryParse( point, parts ) ) return false;
|
|
|
|
if( !TryParse( size, parts ) ) return false;
|
|
|
|
|
|
|
|
dest = wxRect( point, size );
|
|
|
|
return true;
|
|
|
|
}
|
Lots of new code maintenance stuffs:
* Completely new assertion macros: pxAssert, pxAssertMsg, and pxFail, pxAssertDev (both which default to using a message). These replace *all* wxASSERT, DevAssert, and jASSUME varieties of macros. New macros borrow the best of all assertion worlds: MSVCRT, wxASSERT, and AtlAssume. :)
* Rewrote the Console namespace as a structure called IConsoleWriter, and created several varieties of ConsoleWriters for handling different states of log and console availability (should help reduce overhead of console logging nicely).
* More improvements to the PersistentThread model, using safely interlocked "Do*" style callbacks for starting and cleaning up threads.
* Fixed console logs so that they're readable in Win32 notepad again (the log writer adds CRs to naked LFs).
* Added AppInit.cpp -- contains constructor, destructor, OnInit, and command line parsing mess.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1950 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-10-04 08:27:27 +00:00
|
|
|
|
2009-10-04 09:00:07 +00:00
|
|
|
// Performs a cross-platform puts operation, which adds CRs to naked LFs on Win32 platforms,
|
Lots of new code maintenance stuffs:
* Completely new assertion macros: pxAssert, pxAssertMsg, and pxFail, pxAssertDev (both which default to using a message). These replace *all* wxASSERT, DevAssert, and jASSUME varieties of macros. New macros borrow the best of all assertion worlds: MSVCRT, wxASSERT, and AtlAssume. :)
* Rewrote the Console namespace as a structure called IConsoleWriter, and created several varieties of ConsoleWriters for handling different states of log and console availability (should help reduce overhead of console logging nicely).
* More improvements to the PersistentThread model, using safely interlocked "Do*" style callbacks for starting and cleaning up threads.
* Fixed console logs so that they're readable in Win32 notepad again (the log writer adds CRs to naked LFs).
* Added AppInit.cpp -- contains constructor, destructor, OnInit, and command line parsing mess.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1950 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-10-04 08:27:27 +00:00
|
|
|
// so that Notepad won't throw a fit and Rama can read the logs again! On Unix and Mac platforms,
|
|
|
|
// the input string is written unmodified.
|
|
|
|
//
|
|
|
|
// PCSX2 generally uses Unix-style newlines -- LF (\n) only -- hence there's no need to strip CRs
|
|
|
|
// from incoming data. Mac platforms may need an implementation of their own that converts
|
|
|
|
// newlines to CRs...?
|
|
|
|
//
|
|
|
|
void px_fputs( FILE* fp, const char* src )
|
|
|
|
{
|
|
|
|
if( fp == NULL ) return;
|
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
// Windows needs CR's partnered with all newlines, or else notepad.exe can't view
|
|
|
|
// the stupid logfile. Best way is to write one char at a time.. >_<
|
2009-10-04 09:00:07 +00:00
|
|
|
|
Lots of new code maintenance stuffs:
* Completely new assertion macros: pxAssert, pxAssertMsg, and pxFail, pxAssertDev (both which default to using a message). These replace *all* wxASSERT, DevAssert, and jASSUME varieties of macros. New macros borrow the best of all assertion worlds: MSVCRT, wxASSERT, and AtlAssume. :)
* Rewrote the Console namespace as a structure called IConsoleWriter, and created several varieties of ConsoleWriters for handling different states of log and console availability (should help reduce overhead of console logging nicely).
* More improvements to the PersistentThread model, using safely interlocked "Do*" style callbacks for starting and cleaning up threads.
* Fixed console logs so that they're readable in Win32 notepad again (the log writer adds CRs to naked LFs).
* Added AppInit.cpp -- contains constructor, destructor, OnInit, and command line parsing mess.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1950 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-10-04 08:27:27 +00:00
|
|
|
const char* curchar = src;
|
|
|
|
bool prevcr = false;
|
|
|
|
while( *curchar != 0 )
|
|
|
|
{
|
|
|
|
if( *curchar == '\r' )
|
|
|
|
{
|
|
|
|
prevcr = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Only write a CR/LF pair if the current LF is not prefixed nor
|
|
|
|
// post-fixed by a CR.
|
|
|
|
if( *curchar == '\n' && !prevcr && (*(curchar+1) != '\r') )
|
|
|
|
fputs( "\r\n", fp );
|
|
|
|
else
|
|
|
|
fputc( *curchar, fp );
|
|
|
|
|
|
|
|
prevcr = false;
|
|
|
|
}
|
|
|
|
++curchar;
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
// Linux is happy with plain old LFs. Not sure about Macs... does OSX still
|
|
|
|
// go by the old school Mac style of using Crs only?
|
|
|
|
|
2009-10-04 09:00:07 +00:00
|
|
|
fputs( src, fp ); // fputs does not do automatic newlines, so it's ok!
|
Lots of new code maintenance stuffs:
* Completely new assertion macros: pxAssert, pxAssertMsg, and pxFail, pxAssertDev (both which default to using a message). These replace *all* wxASSERT, DevAssert, and jASSUME varieties of macros. New macros borrow the best of all assertion worlds: MSVCRT, wxASSERT, and AtlAssume. :)
* Rewrote the Console namespace as a structure called IConsoleWriter, and created several varieties of ConsoleWriters for handling different states of log and console availability (should help reduce overhead of console logging nicely).
* More improvements to the PersistentThread model, using safely interlocked "Do*" style callbacks for starting and cleaning up threads.
* Fixed console logs so that they're readable in Win32 notepad again (the log writer adds CRs to naked LFs).
* Added AppInit.cpp -- contains constructor, destructor, OnInit, and command line parsing mess.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1950 96395faa-99c1-11dd-bbfe-3dabce05a288
2009-10-04 08:27:27 +00:00
|
|
|
#endif
|
2009-10-04 09:00:07 +00:00
|
|
|
}
|