X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e40298d54ecd5b109222a7c60aa2ef084a304d69..11c084163e3702692586f70a9414dca97bb2a2d6:/src/mac/carbon/utils.cpp diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index a3f95679a9..126527c1be 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -38,6 +38,10 @@ #include #endif +#include "ATSUnicode.h" +#include "TextCommon.h" +#include "TextEncodingConverter.h" + #ifndef __DARWIN__ // defined in unix/utilsunx.cpp for Mac OS X @@ -48,12 +52,12 @@ bool wxGetFullHostName(wxChar *buf, int maxSize) } // Get hostname only (without domain name) -bool wxGetHostName(char *buf, int maxSize) +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); @@ -61,13 +65,11 @@ bool wxGetHostName(char *buf, int maxSize) if (chooserName && *chooserName) { - int length = (*chooserName)[0] ; - if ( length + 1 > maxSize ) - { - length = maxSize - 1 ; - } - strncpy( buf , (char*) &(*chooserName)[1] , length ) ; - buf[length] = 0 ; + HLock( (Handle) chooserName ) ; + wxString name = wxMacMakeStringFromPascal( *chooserName ) ; + HUnlock( (Handle) chooserName ) ; + ReleaseResource( (Handle) chooserName ) ; + wxStrncpy( buf , name , maxSize - 1 ) ; } else buf[0] = 0 ; @@ -76,7 +78,7 @@ bool wxGetHostName(char *buf, int maxSize) } // Get user ID e.g. jacs -bool wxGetUserId(char *buf, int maxSize) +bool wxGetUserId(wxChar *buf, int maxSize) { return wxGetUserName( buf , maxSize ) ; } @@ -88,12 +90,12 @@ const wxChar* wxGetHomeDir(wxString *pstr) } // Get user name e.g. Stefan Csomor -bool wxGetUserName(char *buf, int maxSize) +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); @@ -101,13 +103,11 @@ bool wxGetUserName(char *buf, int maxSize) if (chooserName && *chooserName) { - int length = (*chooserName)[0] ; - if ( length + 1 > maxSize ) - { - length = maxSize - 1 ; - } - strncpy( buf , (char*) &(*chooserName)[1] , length ) ; - buf[length] = 0 ; + HLock( (Handle) chooserName ) ; + wxString name = wxMacMakeStringFromPascal( *chooserName ) ; + HUnlock( (Handle) chooserName ) ; + ReleaseResource( (Handle) chooserName ) ; + wxStrncpy( buf , name , maxSize - 1 ) ; } else buf[0] = 0 ; @@ -143,7 +143,7 @@ bool wxShell(const wxString& command) return FALSE; } -// Shutdown or reboot the PC +// Shutdown or reboot the PC bool wxShutdown(wxShutdownFlags wFlags) { // TODO @@ -159,10 +159,10 @@ long wxGetFreeMemory() void wxUsleep(unsigned long milliseconds) { clock_t start = clock() ; - do + do { YieldToAnyThread() ; - } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ; + } while( clock() - start < milliseconds / 1000.0 * CLOCKS_PER_SEC ) ; } void wxSleep(int nSecs) @@ -182,17 +182,17 @@ 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); } @@ -223,9 +223,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 ) ; @@ -250,22 +250,25 @@ bool wxWriteResource(const wxString& section, const wxString& entry, const wxStr bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file) { - char buf[50]; - sprintf(buf, "%.4f", value); + wxString buf; + buf.Printf(wxT("%.4f"), value); + return wxWriteResource(section, entry, buf, file); } bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file) { - char buf[50]; - sprintf(buf, "%ld", value); + wxString buf; + buf.Printf(wxT("%ld"), value); + return wxWriteResource(section, entry, buf, file); } bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file) { - char buf[50]; - sprintf(buf, "%d", value); + wxString buf; + buf.Printf(wxT("%d"), value); + return wxWriteResource(section, entry, buf, file); } @@ -335,7 +338,7 @@ void wxEndBusyCursor() { wxCHECK_RET( gs_wxBusyCursorCount > 0, wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") ); - + if (--gs_wxBusyCursorCount == 0) { gMacStoredActiveCursor.MacInstall() ; @@ -356,7 +359,7 @@ wxString wxMacFindFolder( short vol, short vRefNum ; long dirID ; wxString strDir ; - + if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr) { FSSpec file ; @@ -369,7 +372,7 @@ wxString wxMacFindFolder( short vol, } #ifndef __DARWIN__ -char *wxGetUserHome (const wxString& user) +wxChar *wxGetUserHome (const wxString& user) { // TODO return NULL; @@ -379,19 +382,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 + ":" ; - + + p = p + wxT(":") ; + Str255 volumeName ; XVolumeParam pb ; @@ -454,9 +457,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) @@ -464,8 +471,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) @@ -476,8 +488,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 @@ -485,8 +501,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 ; } @@ -501,7 +519,7 @@ wxString wxGetOsDescription() // use configure generated description if available return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")"); #else - return "MacOS" ; //TODO:define further + return wxT("MacOS") ; //TODO:define further #endif } @@ -593,10 +611,192 @@ void wxMacConvertToPC( const char *from , char *to , int len ) } } -wxString wxMacMakeMacStringFromPC( const char * p ) +TECObjectRef s_TECNativeCToUnicode = NULL ; +TECObjectRef s_TECUnicodeToNativeC = NULL ; +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... + const int kEncoding = wxApp::s_macDefaultEncodingIsPC + ? (int)kTextEncodingWindowsLatin1 + : (int)kTextEncodingMacRoman; + + OSStatus status = noErr ; + status = TECCreateConverter(&s_TECNativeCToUnicode, + kEncoding, + kTextEncodingUnicodeDefault); + + + status = TECCreateConverter(&s_TECUnicodeToNativeC, + kTextEncodingUnicodeDefault, + kEncoding); + + if ( wxApp::s_macDefaultEncodingIsPC ) + { + status = TECCreateConverter(&s_TECPlatformToNativeC, + kTextEncodingMacRoman, + kTextEncodingWindowsLatin1); + + + status = TECCreateConverter(&s_TECNativeCToPlatform, + kTextEncodingWindowsLatin1, + kTextEncodingMacRoman); + } +} + +void wxMacCleanupConverters() +{ + OSStatus status = noErr ; + status = TECDisposeConverter(s_TECNativeCToUnicode); + + status = TECDisposeConverter(s_TECUnicodeToNativeC); + + status = TECDisposeConverter(s_TECPlatformToNativeC); + + status = TECDisposeConverter(s_TECNativeCToPlatform); +} + +wxWCharBuffer wxMacStringToWString( const wxString &from ) +{ +#if wxUSE_UNICODE + wxWCharBuffer result( from.wc_str() ) ; +#else + OSStatus status = noErr ; + ByteCount byteOutLen ; + ByteCount byteInLen = from.Length() ; + ByteCount byteBufferLen = byteInLen *2 ; + wxWCharBuffer result( from.Length() ) ; + status = TECConvertText(s_TECNativeCToUnicode, (ConstTextPtr)from.c_str() , byteInLen, &byteInLen, + (TextPtr)result.data(), byteBufferLen, &byteOutLen); + result.data()[byteOutLen/2] = 0 ; +#endif + return result ; +} + +wxString wxMacMakeStringFromCString( const char * from , int len ) +{ + OSStatus status = noErr ; wxString result ; - int len = strlen ( p ) ; + wxChar* buf = result.GetWriteBuf( len ) ; +#if wxUSE_UNICODE + ByteCount byteOutLen ; + ByteCount byteInLen = len ; + ByteCount byteBufferLen = len *2 ; + + status = TECConvertText(s_TECNativeCToUnicode, (ConstTextPtr)from , byteInLen, &byteInLen, + (TextPtr)buf, byteBufferLen, &byteOutLen); +#else + if ( !wxApp::s_macDefaultEncodingIsPC ) + memcpy( buf , from , len ) ; + else + { + ByteCount byteOutLen ; + ByteCount byteInLen = len ; + ByteCount byteBufferLen = byteInLen ; + + status = TECConvertText(s_TECPlatformToNativeC, (ConstTextPtr)from , byteInLen, &byteInLen, + (TextPtr)buf, byteBufferLen, &byteOutLen); + } +#endif + buf[len] = 0 ; + result.UngetWriteBuf() ; + return result ; +} + +wxString wxMacMakeStringFromCString( const char * from ) +{ + return wxMacMakeStringFromCString( from , strlen(from) ) ; +} + +wxCharBuffer wxMacStringToCString( const wxString &from ) +{ +#if wxUSE_UNICODE + OSStatus status = noErr ; + ByteCount byteOutLen ; + ByteCount byteInLen = from.Length() * 2 ; + ByteCount byteBufferLen = from.Length() ; + wxCharBuffer result( from.Length() ) ; + status = TECConvertText(s_TECUnicodeToNativeC , (ConstTextPtr)from.wc_str() , byteInLen, &byteInLen, + (TextPtr)result.data(), byteBufferLen, &byteOutLen); + return result ; +#else + if ( !wxApp::s_macDefaultEncodingIsPC ) + return wxCharBuffer( from.c_str() ) ; + else + { + wxCharBuffer result( from.Length() ) ; + OSStatus status = noErr ; + ByteCount byteOutLen ; + ByteCount byteInLen = from.Length() ; + ByteCount byteBufferLen = 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 ) +{ + wxCharBuffer buf = wxMacStringToCString( from ) ; + int len = strlen(buf) ; + + if ( len > 255 ) + len = 255 ; + to[0] = len ; + memcpy( (char*) &to[1] , buf , len ) ; +} + +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 ) +{ +#if wxUSE_UNICODE + m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault, + (const unsigned short*)str.wc_str(), str.Len() ); +#else + m_cfs = CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() , + wxApp::s_macDefaultEncodingIsPC ? + kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ; +#endif + m_release = true ; +} + +wxString wxMacCFStringHolder::AsString() +{ + wxString result ; + Size len = CFStringGetLength( m_cfs ) ; + wxChar* buf = result.GetWriteBuf( len ) ; +#if wxUSE_UNICODE + CFStringGetCharacters( m_cfs , CFRangeMake( 0 , len ) , (UniChar*) buf ) ; +#else + CFStringGetCString( m_cfs , buf , len+1 , wxApp::s_macDefaultEncodingIsPC ? + kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ; +#endif + buf[len] = 0 ; + result.UngetWriteBuf() ; + return result ; +} + +#if 0 + +wxString wxMacMakeMacStringFromPC( const wxChar * p ) +{ + wxString result ; + int len = wxStrlen ( p ) ; if ( len > 0 ) { wxChar* ptr = result.GetWriteBuf(len) ; @@ -607,10 +807,10 @@ wxString wxMacMakeMacStringFromPC( const char * p ) return result ; } -wxString wxMacMakePCStringFromMac( const char * p ) +wxString wxMacMakePCStringFromMac( const wxChar * p ) { wxString result ; - int len = strlen ( p ) ; + int len = wxStrlen ( p ) ; if ( len > 0 ) { wxChar* ptr = result.GetWriteBuf(len) ; @@ -621,7 +821,7 @@ wxString wxMacMakePCStringFromMac( const char * p ) return result ; } -wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) +wxString wxMacMakeStringFromMacString( const wxChar* from , bool mac2pcEncoding ) { if (mac2pcEncoding) { @@ -633,7 +833,7 @@ wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) } } -// +// // Pascal Strings // @@ -652,7 +852,7 @@ wxString wxMacMakeStringFromPascal( ConstStringPtr from , bool mac2pcEncoding ) } } -void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding ) +void wxMacStringToPascal( const wxChar * from , StringPtr to , bool pc2macEncoding ) { if (pc2macEncoding) { @@ -663,19 +863,8 @@ void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding CopyCStringToPascal( from , to ) ; } } +#endif -// -// CFStringRefs (Carbon only) -// - -#if TARGET_CARBON -// converts this string into a carbon foundation string with optional pc 2 mac encoding -CFStringRef wxMacCreateCFString( const wxString &str , bool pc2macEncoding ) -{ - return CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() , - pc2macEncoding ? - kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ; -} #endif //TARGET_CARBON