X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/427ff66291af2d8dd34ff5ee68c81436997144a1..32b38f99ce96cb698567b23971b70ba225becc42:/src/mac/utils.cpp?ds=sidebyside diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp index 014225901c..18e1822aa1 100644 --- a/src/mac/utils.cpp +++ b/src/mac/utils.cpp @@ -42,6 +42,15 @@ #include "TextCommon.h" #include "TextEncodingConverter.h" +#if defined(__WXMAC__) + #include "wx/mac/private.h" // includes mac headers +#endif + +#if defined(__MWERKS__) && wxUSE_UNICODE + #include +#endif + + #ifndef __DARWIN__ // defined in unix/utilsunx.cpp for Mac OS X @@ -57,7 +66,7 @@ bool wxGetHostName(wxChar *buf, int maxSize) // Gets Chooser name of user by examining a System resource. const short kComputerNameID = -16413; - + short oldResFile = CurResFile() ; UseResFile(0); StringHandle chooserName = (StringHandle)::GetString(kComputerNameID); @@ -95,7 +104,7 @@ bool wxGetUserName(wxChar *buf, int maxSize) // Gets Chooser name of user by examining a System resource. const short kChooserNameID = -16096; - + short oldResFile = CurResFile() ; UseResFile(0); StringHandle chooserName = (StringHandle)::GetString(kChooserNameID); @@ -143,7 +152,7 @@ bool wxShell(const wxString& command) return FALSE; } -// Shutdown or reboot the PC +// Shutdown or reboot the PC bool wxShutdown(wxShutdownFlags wFlags) { // TODO @@ -159,7 +168,7 @@ long wxGetFreeMemory() void wxUsleep(unsigned long milliseconds) { clock_t start = clock() ; - do + do { YieldToAnyThread() ; } while( clock() - start < milliseconds / 1000.0 * CLOCKS_PER_SEC ) ; @@ -175,43 +184,6 @@ void wxFlushEvents() { } -#if WXWIN_COMPATIBILITY_2_2 - -// Output a debug message, in a system dependent fashion. -void wxDebugMsg(const char *fmt ...) -{ - va_list ap; - static char buffer[512]; - - if (!wxTheApp->GetWantDebugOutput()) - return ; - - va_start(ap, fmt); - - vsprintf(buffer,fmt,ap) ; - strcat(buffer,";g") ; - c2pstr(buffer) ; - DebugStr((unsigned char*) buffer) ; - - va_end(ap); -} - -// Non-fatal error: pop up message box and (possibly) continue -void wxError(const wxString& msg, const wxString& title) -{ - if (wxMessageBox(wxString::Format(wxT("%s\nContinue?"),msg), title, wxYES_NO) == wxID_NO ) - wxExit(); -} - -// Fatal error: pop up message box and abort -void wxFatalError(const wxString& msg, const wxString& title) -{ - wxMessageBox(wxString::Format(wxT("%s: %s"),title,msg)); - wxExit(); -} - -#endif // WXWIN_COMPATIBILITY_2_2 - #endif // !__DARWIN__ // Emit a beeeeeep @@ -223,9 +195,9 @@ void wxBell() int wxGetOsVersion(int *majorVsn, int *minorVsn) { long theSystem ; - + // are there x-platform conventions ? - + Gestalt(gestaltSystemVersion, &theSystem) ; if (minorVsn != NULL) { *minorVsn = (theSystem & 0xFF ) ; @@ -338,7 +310,7 @@ void wxEndBusyCursor() { wxCHECK_RET( gs_wxBusyCursorCount > 0, wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") ); - + if (--gs_wxBusyCursorCount == 0) { gMacStoredActiveCursor.MacInstall() ; @@ -359,7 +331,7 @@ wxString wxMacFindFolder( short vol, short vRefNum ; long dirID ; wxString strDir ; - + if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr) { FSSpec file ; @@ -382,19 +354,19 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) { if ( path.empty() ) return FALSE; - + wxString p = path ; if (p[0] == ':' ) { p = wxGetCwd() + p ; } - + int pos = p.Find(':') ; if ( pos != wxNOT_FOUND ) { p = p.Mid(1,pos) ; } - + p = p + wxT(":") ; - + Str255 volumeName ; XVolumeParam pb ; @@ -457,9 +429,13 @@ void wxDisplaySize(int *width, int *height) { BitMap screenBits; GetQDGlobalsScreenBits( &screenBits ); - - *width = screenBits.bounds.right - screenBits.bounds.left ; - *height = screenBits.bounds.bottom - screenBits.bounds.top ; + + if (width != NULL) { + *width = screenBits.bounds.right - screenBits.bounds.left ; + } + if (height != NULL) { + *height = screenBits.bounds.bottom - screenBits.bounds.top ; + } } void wxDisplaySizeMM(int *width, int *height) @@ -467,8 +443,13 @@ void wxDisplaySizeMM(int *width, int *height) wxDisplaySize(width, height); // on mac 72 is fixed (at least now ;-) float cvPt2Mm = 25.4 / 72; - *width = int( *width * cvPt2Mm ); - *height = int( *height * cvPt2Mm ); + + if (width != NULL) { + *width = int( *width * cvPt2Mm ); + } + if (height != NULL) { + *height = int( *height * cvPt2Mm ); + } } void wxClientDisplayRect(int *x, int *y, int *width, int *height) @@ -479,8 +460,12 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height) if (x) *x = 0; if (y) *y = 0; - *width = screenBits.bounds.right - screenBits.bounds.left ; - *height = screenBits.bounds.bottom - screenBits.bounds.top ; + if (width != NULL) { + *width = screenBits.bounds.right - screenBits.bounds.left ; + } + if (height != NULL) { + *height = screenBits.bounds.bottom - screenBits.bounds.top ; + } SInt16 mheight ; #if TARGET_CARBON @@ -488,8 +473,10 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height) #else mheight = LMGetMBarHeight() ; #endif - *height -= mheight ; - if ( y ) + if (height != NULL) { + *height -= mheight ; + } + if (y) *y = mheight ; } @@ -598,29 +585,37 @@ void wxMacConvertToPC( const char *from , char *to , int len ) TECObjectRef s_TECNativeCToUnicode = NULL ; TECObjectRef s_TECUnicodeToNativeC = NULL ; -TECObjectRef s_TECPCToNativeC = NULL ; -TECObjectRef s_TECNativeCToPC = NULL ; -void wxMacSetupConverters() +TECObjectRef s_TECPlatformToNativeC = NULL ; +TECObjectRef s_TECNativeCToPlatform = NULL ; +void wxMacSetupConverters() { - // if we assume errors are happening here we need low level debugging since the high level assert will use the encoders that - // are not yet setup... - + // if we assume errors are happening here we need low level debugging + // since the high level assert will use the encoders that are not yet + // setup... + const int kEncoding = wxApp::s_macDefaultEncodingIsPC + ? (int)kTextEncodingWindowsLatin1 + : (int)kTextEncodingMacRoman; + OSStatus status = noErr ; - status = TECCreateConverter(&s_TECNativeCToUnicode, - wxApp::s_macDefaultEncodingIsPC ? kTextEncodingWindowsLatin1 : kTextEncodingMacRoman, kTextEncodingUnicodeDefault); + status = TECCreateConverter(&s_TECNativeCToUnicode, + kEncoding, + kTextEncodingUnicodeDefault); - status = TECCreateConverter(&s_TECUnicodeToNativeC, - kTextEncodingUnicodeDefault, wxApp::s_macDefaultEncodingIsPC ? kTextEncodingWindowsLatin1 : kTextEncodingMacRoman); + status = TECCreateConverter(&s_TECUnicodeToNativeC, + kTextEncodingUnicodeDefault, + kEncoding); - if ( !wxApp::s_macDefaultEncodingIsPC ) + if ( wxApp::s_macDefaultEncodingIsPC ) { - status = TECCreateConverter(&s_TECPCToNativeC, - kTextEncodingWindowsLatin1, wxApp::s_macDefaultEncodingIsPC ? kTextEncodingWindowsLatin1 : kTextEncodingMacRoman); + status = TECCreateConverter(&s_TECPlatformToNativeC, + kTextEncodingMacRoman, + kTextEncodingWindowsLatin1); + - - status = TECCreateConverter(&s_TECNativeCToPC, - wxApp::s_macDefaultEncodingIsPC ? kTextEncodingWindowsLatin1 : kTextEncodingMacRoman , kTextEncodingWindowsLatin1 ); + status = TECCreateConverter(&s_TECNativeCToPlatform, + kTextEncodingWindowsLatin1, + kTextEncodingMacRoman); } } @@ -631,12 +626,12 @@ void wxMacCleanupConverters() status = TECDisposeConverter(s_TECUnicodeToNativeC); - status = TECDisposeConverter(s_TECPCToNativeC); + status = TECDisposeConverter(s_TECPlatformToNativeC); - status = TECDisposeConverter(s_TECNativeCToPC); + status = TECDisposeConverter(s_TECNativeCToPlatform); } -wxWCharBuffer wxMacStringToWString( const wxString &from ) +wxWCharBuffer wxMacStringToWString( const wxString &from ) { #if wxUSE_UNICODE wxWCharBuffer result( from.wc_str() ) ; @@ -653,7 +648,7 @@ wxWCharBuffer wxMacStringToWString( const wxString &from ) return result ; } -wxString wxMacMakeStringFromCString( const char * from , int len ) +wxString wxMacMakeStringFromCString( const char * from , int len ) { OSStatus status = noErr ; wxString result ; @@ -666,16 +661,15 @@ wxString wxMacMakeStringFromCString( const char * from , int len ) status = TECConvertText(s_TECNativeCToUnicode, (ConstTextPtr)from , byteInLen, &byteInLen, (TextPtr)buf, byteBufferLen, &byteOutLen); #else - if ( wxApp::s_macDefaultEncodingIsPC ) + if ( !wxApp::s_macDefaultEncodingIsPC ) memcpy( buf , from , len ) ; else { - OSStatus status = noErr ; ByteCount byteOutLen ; ByteCount byteInLen = len ; ByteCount byteBufferLen = byteInLen ; - status = TECConvertText(s_TECNativeCToPC, (ConstTextPtr)from , byteInLen, &byteInLen, + status = TECConvertText(s_TECPlatformToNativeC, (ConstTextPtr)from , byteInLen, &byteInLen, (TextPtr)buf, byteBufferLen, &byteOutLen); } #endif @@ -689,7 +683,7 @@ wxString wxMacMakeStringFromCString( const char * from ) return wxMacMakeStringFromCString( from , strlen(from) ) ; } -wxCharBuffer wxMacStringToCString( const wxString &from ) +wxCharBuffer wxMacStringToCString( const wxString &from ) { #if wxUSE_UNICODE OSStatus status = noErr ; @@ -701,7 +695,7 @@ wxCharBuffer wxMacStringToCString( const wxString &from ) (TextPtr)result.data(), byteBufferLen, &byteOutLen); return result ; #else - if ( wxApp::s_macDefaultEncodingIsPC ) + if ( !wxApp::s_macDefaultEncodingIsPC ) return wxCharBuffer( from.c_str() ) ; else { @@ -711,14 +705,14 @@ wxCharBuffer wxMacStringToCString( const wxString &from ) ByteCount byteInLen = from.Length() ; ByteCount byteBufferLen = byteInLen ; - status = TECConvertText(s_TECPCToNativeC, (ConstTextPtr)from.c_str() , byteInLen, &byteInLen, + status = TECConvertText(s_TECNativeCToPlatform, (ConstTextPtr)from.c_str() , byteInLen, &byteInLen, (TextPtr)result.data(), byteBufferLen, &byteOutLen); return result ; } #endif } -void wxMacStringToPascal( const wxString&from , StringPtr to ) +void wxMacStringToPascal( const wxString&from , StringPtr to ) { wxCharBuffer buf = wxMacStringToCString( from ) ; int len = strlen(buf) ; @@ -729,31 +723,31 @@ void wxMacStringToPascal( const wxString&from , StringPtr to ) memcpy( (char*) &to[1] , buf , len ) ; } -wxString wxMacMakeStringFromPascal( ConstStringPtr from ) +wxString wxMacMakeStringFromPascal( ConstStringPtr from ) { return wxMacMakeStringFromCString( (char*) &from[1] , from[0] ) ; } -// +// // CFStringRefs (Carbon only) // #if TARGET_CARBON // converts this string into a carbon foundation string with optional pc 2 mac encoding -void wxMacCFStringHolder::Assign( const wxString &str ) +void wxMacCFStringHolder::Assign( const wxString &str ) { #if wxUSE_UNICODE - m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault, + m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault, (const unsigned short*)str.wc_str(), str.Len() ); #else m_cfs = CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() , - wxApp::s_macDefaultEncodingIsPC ? + wxApp::s_macDefaultEncodingIsPC ? kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ; #endif m_release = true ; } -wxString wxMacCFStringHolder::AsString() +wxString wxMacCFStringHolder::AsString() { wxString result ; Size len = CFStringGetLength( m_cfs ) ; @@ -761,7 +755,7 @@ wxString wxMacCFStringHolder::AsString() #if wxUSE_UNICODE CFStringGetCharacters( m_cfs , CFRangeMake( 0 , len ) , (UniChar*) buf ) ; #else - CFStringGetCString( m_cfs , buf , len+1 , s_macDefaultEncodingIsPC ? + CFStringGetCString( m_cfs , buf , len+1 , wxApp::s_macDefaultEncodingIsPC ? kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ; #endif buf[len] = 0 ; @@ -811,7 +805,7 @@ wxString wxMacMakeStringFromMacString( const wxChar* from , bool mac2pcEncoding } } -// +// // Pascal Strings // @@ -846,3 +840,144 @@ void wxMacStringToPascal( const wxChar * from , StringPtr to , bool pc2macEncodi #endif //TARGET_CARBON +// ---------------------------------------------------------------------------- +// debugging support +// ---------------------------------------------------------------------------- + +#if defined(__WXMAC__) && !defined(__DARWIN__) && defined(__MWERKS__) && (__MWERKS__ >= 0x2400) + +// MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds... + +#ifndef __MetroNubUtils__ +#include "MetroNubUtils.h" +#endif + +#ifndef __GESTALT__ +#include +#endif + +#if TARGET_API_MAC_CARBON + + #include + + EXTERN_API_C( long ) + CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...); + + ProcPtr gCallUniversalProc_Proc = NULL; + +#endif + +static MetroNubUserEntryBlock* gMetroNubEntry = NULL; + +static long fRunOnce = false; + +/* --------------------------------------------------------------------------- + IsMetroNubInstalled + --------------------------------------------------------------------------- */ + +Boolean IsMetroNubInstalled() +{ + if (!fRunOnce) + { + long result, value; + + fRunOnce = true; + gMetroNubEntry = NULL; + + if (Gestalt(gestaltSystemVersion, &value) == noErr && value < 0x1000) + { + /* look for MetroNub's Gestalt selector */ + if (Gestalt(kMetroNubUserSignature, &result) == noErr) + { + + #if TARGET_API_MAC_CARBON + if (gCallUniversalProc_Proc == NULL) + { + CFragConnectionID connectionID; + Ptr mainAddress; + Str255 errorString; + ProcPtr symbolAddress; + OSErr err; + CFragSymbolClass symbolClass; + + symbolAddress = NULL; + err = GetSharedLibrary("\pInterfaceLib", kPowerPCCFragArch, kFindCFrag, + &connectionID, &mainAddress, errorString); + + if (err != noErr) + { + gCallUniversalProc_Proc = NULL; + goto end; + } + + err = FindSymbol(connectionID, "\pCallUniversalProc", + (Ptr *) &gCallUniversalProc_Proc, &symbolClass); + + if (err != noErr) + { + gCallUniversalProc_Proc = NULL; + goto end; + } + } + #endif + + { + MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result; + + /* make sure the version of the API is compatible */ + if (block->apiLowVersion <= kMetroNubUserAPIVersion && + kMetroNubUserAPIVersion <= block->apiHiVersion) + gMetroNubEntry = block; /* success! */ + } + + } + } + } + +end: + +#if TARGET_API_MAC_CARBON + return (gMetroNubEntry != NULL && gCallUniversalProc_Proc != NULL); +#else + return (gMetroNubEntry != NULL); +#endif +} + +/* --------------------------------------------------------------------------- + IsMWDebuggerRunning [v1 API] + --------------------------------------------------------------------------- */ + +Boolean IsMWDebuggerRunning() +{ + if (IsMetroNubInstalled()) + return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning); + else + return false; +} + +/* --------------------------------------------------------------------------- + AmIBeingMWDebugged [v1 API] + --------------------------------------------------------------------------- */ + +Boolean AmIBeingMWDebugged() +{ + if (IsMetroNubInstalled()) + return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged); + else + return false; +} + +extern bool WXDLLEXPORT wxIsDebuggerRunning() +{ + return IsMWDebuggerRunning() && AmIBeingMWDebugged(); +} + +#else + +extern bool WXDLLEXPORT wxIsDebuggerRunning() +{ + return false; +} + +#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ >= 0x2400) +