X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..a8680e3e0e5066d35a8f4fd43294ba4bfcaf4ba7:/src/mac/utils.cpp diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp index f308faf2df..7e7a9c99b8 100644 --- a/src/mac/utils.cpp +++ b/src/mac/utils.cpp @@ -6,7 +6,7 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -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,69 +52,65 @@ bool wxGetFullHostName(wxChar *buf, int maxSize) } // Get hostname only (without domain name) -bool wxGetHostName(char *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); - UseResFile(oldResFile); - - if (chooserName && *chooserName) - { - int length = (*chooserName)[0] ; - if ( length + 1 > maxSize ) - { - length = maxSize - 1 ; - } - strncpy( buf , (char*) &(*chooserName)[1] , length ) ; - buf[length] = 0 ; - } - else - buf[0] = 0 ; +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); + UseResFile(oldResFile); + + if (chooserName && *chooserName) + { + HLock( (Handle) chooserName ) ; + wxString name = wxMacMakeStringFromPascal( *chooserName ) ; + HUnlock( (Handle) chooserName ) ; + ReleaseResource( (Handle) chooserName ) ; + wxStrncpy( buf , name , maxSize - 1 ) ; + } + else + buf[0] = 0 ; return TRUE; } // Get user ID e.g. jacs -bool wxGetUserId(char *buf, int maxSize) +bool wxGetUserId(wxChar *buf, int maxSize) { return wxGetUserName( buf , maxSize ) ; } const wxChar* wxGetHomeDir(wxString *pstr) { - *pstr = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ; - return pstr->c_str() ; + *pstr = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ; + return pstr->c_str() ; } // Get user name e.g. Stefan Csomor -bool wxGetUserName(char *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); - UseResFile(oldResFile); - - if (chooserName && *chooserName) - { - int length = (*chooserName)[0] ; - if ( length + 1 > maxSize ) - { - length = maxSize - 1 ; - } - strncpy( buf , (char*) &(*chooserName)[1] , length ) ; - buf[length] = 0 ; - } - else - buf[0] = 0 ; +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); + UseResFile(oldResFile); + + if (chooserName && *chooserName) + { + HLock( (Handle) chooserName ) ; + wxString name = wxMacMakeStringFromPascal( *chooserName ) ; + HUnlock( (Handle) chooserName ) ; + ReleaseResource( (Handle) chooserName ) ; + wxStrncpy( buf , name , maxSize - 1 ) ; + } + else + buf[0] = 0 ; return TRUE; } @@ -123,15 +123,15 @@ int wxKill(long pid, wxSignal sig , wxKillError *rc ) WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value) { - // TODO : under classic there is no environement support, under X yes - return false ; + // TODO : under classic there is no environement support, under X yes + return false ; } // set the env var name to the given value, return TRUE on success WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value) { - // TODO : under classic there is no environement support, under X yes - return false ; + // TODO : under classic there is no environement support, under X yes + return false ; } // @@ -161,8 +161,8 @@ void wxUsleep(unsigned long milliseconds) clock_t start = clock() ; do { - YieldToAnyThread() ; - } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ; + YieldToAnyThread() ; + } while( clock() - start < milliseconds / 1000.0 * CLOCKS_PER_SEC ) ; } void wxSleep(int nSecs) @@ -180,34 +180,34 @@ void wxFlushEvents() // 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); + 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(); + 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(); + wxMessageBox(wxString::Format(wxT("%s: %s"),title,msg)); + wxExit(); } #endif // WXWIN_COMPATIBILITY_2_2 @@ -225,13 +225,13 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn) long theSystem ; // are there x-platform conventions ? - + Gestalt(gestaltSystemVersion, &theSystem) ; if (minorVsn != NULL) { - *minorVsn = (theSystem & 0xFF ) ; + *minorVsn = (theSystem & 0xFF ) ; } if (majorVsn != NULL) { - *majorVsn = (theSystem >> 8 ) ; + *majorVsn = (theSystem >> 8 ) ; } #ifdef __DARWIN__ return wxMAC_DARWIN; @@ -250,23 +250,26 @@ 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); - return wxWriteResource(section, entry, buf, file); + 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); - return wxWriteResource(section, entry, buf, file); + 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); - return wxWriteResource(section, entry, buf, file); + wxString buf; + buf.Printf(wxT("%d"), value); + + return wxWriteResource(section, entry, buf, file); } bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file) @@ -277,81 +280,81 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value, bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file) { - char *s = NULL; - bool succ = wxGetResource(section, entry, (char **)&s, file); - if (succ) - { - *value = (float)strtod(s, NULL); - delete[] s; - return TRUE; - } - else return FALSE; + char *s = NULL; + bool succ = wxGetResource(section, entry, (char **)&s, file); + if (succ) + { + *value = (float)strtod(s, NULL); + delete[] s; + return TRUE; + } + else return FALSE; } bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file) { - char *s = NULL; - bool succ = wxGetResource(section, entry, (char **)&s, file); - if (succ) - { - *value = strtol(s, NULL, 10); - delete[] s; - return TRUE; - } - else return FALSE; + char *s = NULL; + bool succ = wxGetResource(section, entry, (char **)&s, file); + if (succ) + { + *value = strtol(s, NULL, 10); + delete[] s; + return TRUE; + } + else return FALSE; } bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file) { - char *s = NULL; - bool succ = wxGetResource(section, entry, (char **)&s, file); - if (succ) - { - *value = (int)strtol(s, NULL, 10); - delete[] s; - return TRUE; - } - else return FALSE; + char *s = NULL; + bool succ = wxGetResource(section, entry, (char **)&s, file); + if (succ) + { + *value = (int)strtol(s, NULL, 10); + delete[] s; + return TRUE; + } + else return FALSE; } #endif // wxUSE_RESOURCES int gs_wxBusyCursorCount = 0; -extern wxCursor gMacCurrentCursor ; -wxCursor gMacStoredActiveCursor ; +extern wxCursor gMacCurrentCursor ; +wxCursor gMacStoredActiveCursor ; // Set the cursor to the busy cursor for all windows void wxBeginBusyCursor(wxCursor *cursor) { - if (gs_wxBusyCursorCount++ == 0) - { - gMacStoredActiveCursor = gMacCurrentCursor ; - cursor->MacInstall() ; - } - //else: nothing to do, already set + if (gs_wxBusyCursorCount++ == 0) + { + gMacStoredActiveCursor = gMacCurrentCursor ; + cursor->MacInstall() ; + } + //else: nothing to do, already set } // Restore cursor to normal void wxEndBusyCursor() { wxCHECK_RET( gs_wxBusyCursorCount > 0, - wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") ); - - if (--gs_wxBusyCursorCount == 0) - { - gMacStoredActiveCursor.MacInstall() ; - gMacStoredActiveCursor = wxNullCursor ; - } + wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") ); + + if (--gs_wxBusyCursorCount == 0) + { + gMacStoredActiveCursor.MacInstall() ; + gMacStoredActiveCursor = wxNullCursor ; + } } // TRUE if we're between the above two calls bool wxIsBusy() { - return (gs_wxBusyCursorCount > 0); + return (gs_wxBusyCursorCount > 0); } wxString wxMacFindFolder( short vol, - OSType folderType, - Boolean createFolder) + OSType folderType, + Boolean createFolder) { short vRefNum ; long dirID ; @@ -369,7 +372,7 @@ wxString wxMacFindFolder( short vol, } #ifndef __DARWIN__ -char *wxGetUserHome (const wxString& user) +wxChar *wxGetUserHome (const wxString& user) { // TODO return NULL; @@ -390,7 +393,7 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) p = p.Mid(1,pos) ; } - p = p + ":" ; + p = p + wxT(":") ; Str255 volumeName ; XVolumeParam pb ; @@ -437,24 +440,24 @@ bool wxColourDisplay() // Returns depth of screen int wxDisplayDepth() { - Rect globRect ; - SetRect(&globRect, -32760, -32760, 32760, 32760); - GDHandle theMaxDevice; + Rect globRect ; + SetRect(&globRect, -32760, -32760, 32760, 32760); + GDHandle theMaxDevice; - int theDepth = 8; - theMaxDevice = GetMaxDevice(&globRect); - if (theMaxDevice != nil) - theDepth = (**(**theMaxDevice).gdPMap).pixelSize; + int theDepth = 8; + theMaxDevice = GetMaxDevice(&globRect); + if (theMaxDevice != nil) + theDepth = (**(**theMaxDevice).gdPMap).pixelSize; - return theDepth ; + return theDepth ; } // Get size of display void wxDisplaySize(int *width, int *height) { - BitMap screenBits; - GetQDGlobalsScreenBits( &screenBits ); - + BitMap screenBits; + GetQDGlobalsScreenBits( &screenBits ); + *width = screenBits.bounds.right - screenBits.bounds.left ; *height = screenBits.bounds.bottom - screenBits.bounds.top ; } @@ -501,7 +504,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,35 +596,210 @@ void wxMacConvertToPC( const char *from , char *to , int len ) } } -wxString wxMacMakeMacStringFromPC( const char * p ) +TECObjectRef s_TECNativeCToUnicode = NULL ; +TECObjectRef s_TECUnicodeToNativeC = NULL ; +TECObjectRef s_TECPCToNativeC = NULL ; +TECObjectRef s_TECNativeCToPC = 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... + + OSStatus status = noErr ; + status = TECCreateConverter(&s_TECNativeCToUnicode, + wxApp::s_macDefaultEncodingIsPC ? kTextEncodingWindowsLatin1 : kTextEncodingMacRoman, kTextEncodingUnicodeDefault); + + + status = TECCreateConverter(&s_TECUnicodeToNativeC, + kTextEncodingUnicodeDefault, wxApp::s_macDefaultEncodingIsPC ? kTextEncodingWindowsLatin1 : kTextEncodingMacRoman); + + if ( !wxApp::s_macDefaultEncodingIsPC ) + { + status = TECCreateConverter(&s_TECPCToNativeC, + kTextEncodingWindowsLatin1, wxApp::s_macDefaultEncodingIsPC ? kTextEncodingWindowsLatin1 : kTextEncodingMacRoman); + + + status = TECCreateConverter(&s_TECNativeCToPC, + wxApp::s_macDefaultEncodingIsPC ? kTextEncodingWindowsLatin1 : kTextEncodingMacRoman , kTextEncodingWindowsLatin1 ); + } +} + +void wxMacCleanupConverters() +{ + OSStatus status = noErr ; + status = TECDisposeConverter(s_TECNativeCToUnicode); + + status = TECDisposeConverter(s_TECUnicodeToNativeC); + + status = TECDisposeConverter(s_TECPCToNativeC); + + status = TECDisposeConverter(s_TECNativeCToPC); +} + +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 ; + 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 + { + OSStatus status = noErr ; + ByteCount byteOutLen ; + ByteCount byteInLen = len ; + ByteCount byteBufferLen = byteInLen ; + + status = TECConvertText(s_TECNativeCToPC, (ConstTextPtr)from , byteInLen, &byteInLen, + (TextPtr)buf, byteBufferLen, &byteOutLen); + } +#endif + buf[len] = 0 ; + result.UngetWriteBuf() ; + return result ; +} + +wxString wxMacMakeStringFromCString( const char * from ) { - wxString result ; - int len = strlen ( p ) ; - if ( len > 0 ) - { - wxChar* ptr = result.GetWriteBuf(len) ; - wxMacConvertFromPC( p , ptr , len ) ; - ptr[len] = 0 ; - result.UngetWriteBuf( len ) ; - } + 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_TECPCToNativeC, (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 wxMacMakePCStringFromMac( const char * p ) +wxString wxMacMakeStringFromPascal( ConstStringPtr from ) { - wxString result ; - int len = strlen ( p ) ; - if ( len > 0 ) - { - wxChar* ptr = result.GetWriteBuf(len) ; - wxMacConvertToPC( p , ptr , len ) ; - ptr[len] = 0 ; - result.UngetWriteBuf( len ) ; - } + 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) ; + wxMacConvertFromPC( p , ptr , len ) ; + ptr[len] = 0 ; + result.UngetWriteBuf( len ) ; + } + return result ; +} + +wxString wxMacMakePCStringFromMac( const wxChar * p ) +{ + wxString result ; + int len = wxStrlen ( p ) ; + if ( len > 0 ) + { + wxChar* ptr = result.GetWriteBuf(len) ; + wxMacConvertToPC( p , ptr , len ) ; + ptr[len] = 0 ; + result.UngetWriteBuf( len ) ; + } return result ; } -wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) +wxString wxMacMakeStringFromMacString( const wxChar* from , bool mac2pcEncoding ) { if (mac2pcEncoding) { @@ -639,9 +817,9 @@ wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) wxString wxMacMakeStringFromPascal( ConstStringPtr from , bool mac2pcEncoding ) { - // this is safe since a pascal string can never be larger than 256 bytes - char s[256] ; - CopyPascalStringToC( from , s ) ; + // this is safe since a pascal string can never be larger than 256 bytes + char s[256] ; + CopyPascalStringToC( from , s ) ; if (mac2pcEncoding) { return wxMacMakePCStringFromMac( s ) ; @@ -652,7 +830,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 +841,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