use MoreFilesX instead of MoreFiles when building with Apple Developer Tools

[wxWidgets.git] / src / mac / carbon / utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 6723ed2ad4432cf16167aa1c8660cffc3372523a..d651da7ca985db19dee49cc9c370f085d457ebd1 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -11,7 +11,6 @@
 
 #ifdef __GNUG__
 // Note: this is done in utilscmn.cpp now.
 
 #ifdef __GNUG__
 // Note: this is done in utilscmn.cpp now.

-// #pragma implementation

 // #pragma implementation "utils.h"
 #endif
 
 // #pragma implementation "utils.h"
 #endif
 


@@ -27,7 +26,19 @@
 #include <string.h>
 #include <stdarg.h>
 
 #include <string.h>
 #include <stdarg.h>
 

-#ifndef __UNIX__
+#ifdef __DARWIN__
+#  include "MoreFilesX.h"
+#else
+#  include "MoreFiles.h"
+#  include "MoreFilesExtras.h"
+#endif
+
+#ifndef __DARWIN__
+#include <Threads.h>
+#include <Sound.h>
+#endif
+
+#ifndef __DARWIN__

 // defined in unix/utilsunx.cpp for Mac OS X
 
 // get full hostname (with domain name if possible)
 // defined in unix/utilsunx.cpp for Mac OS X
 
 // get full hostname (with domain name if possible)


@@ -39,15 +50,35 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
 // Get hostname only (without domain name)
 bool wxGetHostName(char *buf, int maxSize)
 {
 // Get hostname only (without domain name)
 bool wxGetHostName(char *buf, int maxSize)
 {

-    // TODO
-    return FALSE;
+       // 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 ;
+
+  return TRUE;

 }
 
 // Get user ID e.g. jacs
 bool wxGetUserId(char *buf, int maxSize)
 {
 }
 
 // Get user ID e.g. jacs
 bool wxGetUserId(char *buf, int maxSize)
 {

-    // TODO
-    return FALSE;
+  return wxGetUserName( buf , maxSize ) ;

 }
 
 const wxChar* wxGetHomeDir(wxString *pstr)
 }
 
 const wxChar* wxGetHomeDir(wxString *pstr)


@@ -56,21 +87,53 @@ const wxChar* wxGetHomeDir(wxString *pstr)
        return pstr->c_str() ;
 }
 
        return pstr->c_str() ;
 }
 

-
-

 // Get user name e.g. AUTHOR
 bool wxGetUserName(char *buf, int maxSize)
 {
 // Get user name e.g. AUTHOR
 bool wxGetUserName(char *buf, int maxSize)
 {

-    // TODO
-    return FALSE;
+       // 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 ;
+
+  return TRUE;

 }
 
 }
 

-int wxKill(long pid, int sig)
+int wxKill(long pid, wxSignal sig , wxKillError *rc )

 {
     // TODO
     return 0;
 }
 
 {
     // TODO
     return 0;
 }
 

+WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
+{
+  // 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 ;
+}
+

 //
 // Execute a program in an Interactive Shell
 //
 //
 // Execute a program in an Interactive Shell
 //


@@ -80,16 +143,31 @@ bool wxShell(const wxString& command)
     return FALSE;
 }
 
     return FALSE;
 }
 

+// Shutdown or reboot the PC 
+bool wxShutdown(wxShutdownFlags wFlags)
+{
+    // TODO
+    return FALSE;
+}
+

 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 long wxGetFreeMemory()
 {
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 long wxGetFreeMemory()
 {

-    // TODO
-    return 0;
+    return FreeMem() ;
+}
+
+void wxUsleep(unsigned long milliseconds)
+{
+    clock_t start = clock() ;
+    do 
+    {
+       YieldToAnyThread() ;
+    } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;

 }
 
 void wxSleep(int nSecs)
 {
 }
 
 void wxSleep(int nSecs)
 {

-    // TODO
+    wxUsleep(1000*nSecs);

 }
 
 // Consume all events until no more left
 }
 
 // Consume all events until no more left


@@ -97,6 +175,8 @@ void wxFlushEvents()
 {
 }
 
 {
 }
 

+#if WXWIN_COMPATIBILITY_2_2
+

 // Output a debug message, in a system dependent fashion.
 void wxDebugMsg(const char *fmt ...)
 {
 // Output a debug message, in a system dependent fashion.
 void wxDebugMsg(const char *fmt ...)
 {


@@ -108,8 +188,10 @@ void wxDebugMsg(const char *fmt ...)
 
   va_start(ap, fmt);
 
 
   va_start(ap, fmt);
 

-  // wvsprintf(buffer,fmt,ap) ;
-  // TODO: output buffer
+  vsprintf(buffer,fmt,ap) ;
+  strcat(buffer,";g") ;
+  c2pstr(buffer) ;
+  DebugStr((unsigned char*) buffer) ;

 
   va_end(ap);
 }
 
   va_end(ap);
 }


@@ -117,27 +199,47 @@ void wxDebugMsg(const char *fmt ...)
 // Non-fatal error: pop up message box and (possibly) continue
 void wxError(const wxString& msg, const wxString& title)
 {
 // Non-fatal error: pop up message box and (possibly) continue
 void wxError(const wxString& msg, const wxString& title)
 {

-    // TODO
+  wxSprintf(wxBuffer, wxT("%s\nContinue?"), WXSTRINGCAST msg);
+  if (wxMessageBox(wxBuffer, title, wxYES_NO) == wxID_NO )

     wxExit();
 }
 
 // Fatal error: pop up message box and abort
 void wxFatalError(const wxString& msg, const wxString& title)
 {
     wxExit();
 }
 
 // Fatal error: pop up message box and abort
 void wxFatalError(const wxString& msg, const wxString& title)
 {

-    // TODO
+  wxSprintf(wxBuffer, wxT("%s: %s"), WXSTRINGCAST title, WXSTRINGCAST msg);
+  wxMessageBox(wxBuffer);
+  wxExit();

 }
 }

-#endif // !__UNIX__
+
+#endif // WXWIN_COMPATIBILITY_2_2
+
+#endif // !__DARWIN__

 
 // Emit a beeeeeep
 void wxBell()
 {
 
 // Emit a beeeeeep
 void wxBell()
 {

-    // TODO
+    SysBeep(30);

 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {

-    // TODO
-    return 0;
+    long theSystem ;
+    
+    // are there x-platform conventions ?
+
+    Gestalt(gestaltSystemVersion, &theSystem) ;
+    if (minorVsn != NULL) {
+       *minorVsn = (theSystem & 0xFF ) ;
+    }
+    if (majorVsn != NULL) {
+       *majorVsn = (theSystem >> 8 ) ;
+    }
+#ifdef __DARWIN__
+    return wxMAC_DARWIN;
+#else
+    return wxMAC;
+#endif

 }
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 }
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)


@@ -208,7 +310,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
   if (succ)
   {
     *value = (int)strtol(s, NULL, 10);
   if (succ)
   {
     *value = (int)strtol(s, NULL, 10);

-    delete[] s; 
+    delete[] s;

     return TRUE;
   }
   else return FALSE;
     return TRUE;
   }
   else return FALSE;


@@ -239,7 +341,7 @@ void wxEndBusyCursor()
 {
   if (wxBusyCursorCount == 0)
     return;
 {
   if (wxBusyCursorCount == 0)
     return;

-    
+

   wxBusyCursorCount --;
   if (wxBusyCursorCount == 0)
   {
   wxBusyCursorCount --;
   if (wxBusyCursorCount == 0)
   {


@@ -258,35 +360,67 @@ void wxEndBusyCursor()
 bool wxIsBusy()
 {
   return (wxBusyCursorCount > 0);
 bool wxIsBusy()
 {
   return (wxBusyCursorCount > 0);

-}    
-
-#ifndef __UNIX__
-wxString wxMacFindFolder( short                                        vol,
-                                                                OSType                                 folderType,
-                                                                Boolean                                createFolder)
-{
-       short           vRefNum  ;
-       long            dirID ;
-       wxString strDir ;
-               
-       if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr)
-       {
-               FSSpec file ;
-               if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
-               {
-                       strDir = wxMacFSSpec2UnixFilename( &file ) + "/" ;
-               }
-       }
-       return strDir ;

 }
 }

-#endif

 
 

-#ifndef __UNIX__
+wxString wxMacFindFolder( short        vol,
+                         OSType       folderType,
+                         Boolean      createFolder)
+{
+    short    vRefNum  ;
+    long     dirID ;
+    wxString strDir ;
+    
+    if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr)
+    {
+        FSSpec file ;
+        if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
+        {
+            strDir = wxMacFSSpec2MacFilename( &file ) + wxFILE_SEP_PATH ;
+        }
+    }
+    return strDir ;
+}
+
+#ifndef __DARWIN__

 char *wxGetUserHome (const wxString& user)
 {
     // TODO
     return NULL;
 }
 char *wxGetUserHome (const wxString& user)
 {
     // TODO
     return NULL;
 }

+
+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 + ":" ;
+    
+    Str255 volumeName ;
+    XVolumeParam pb ;
+
+    wxMacStringToPascal( p  , volumeName ) ;
+    OSErr err = XGetVolumeInfoNoName( volumeName , 0 , &pb ) ;
+    if ( err == noErr ) {
+      if ( pTotal ) {
+        (*pTotal) = wxLongLong( pb.ioVTotalBytes ) ;
+      }
+      if ( pFree ) {
+        (*pFree) = wxLongLong( pb.ioVFreeBytes ) ;
+      }
+    }
+
+    return err == noErr ;
+}

 #endif
 
 // Check whether this window wants to process messages, e.g. Stop button
 #endif
 
 // Check whether this window wants to process messages, e.g. Stop button


@@ -300,7 +434,7 @@ bool wxCheckForInterrupt(wxWindow *wnd)
 void wxGetMousePosition( int* x, int* y )
 {
     Point pt ;
 void wxGetMousePosition( int* x, int* y )
 {
     Point pt ;

-    
+

     GetMouse( &pt ) ;
     LocalToGlobal( &pt ) ;
     *x = pt.h ;
     GetMouse( &pt ) ;
     LocalToGlobal( &pt ) ;
     *x = pt.h ;


@@ -316,7 +450,7 @@ bool wxColourDisplay()
 // Returns depth of screen
 int wxDisplayDepth()
 {
 // Returns depth of screen
 int wxDisplayDepth()
 {

-       Rect globRect ; 
+       Rect globRect ;

        SetRect(&globRect, -32760, -32760, 32760, 32760);
        GDHandle        theMaxDevice;
 
        SetRect(&globRect, -32760, -32760, 32760, 32760);
        GDHandle        theMaxDevice;
 


@@ -324,33 +458,63 @@ int wxDisplayDepth()
        theMaxDevice = GetMaxDevice(&globRect);
        if (theMaxDevice != nil)
                theDepth = (**(**theMaxDevice).gdPMap).pixelSize;
        theMaxDevice = GetMaxDevice(&globRect);
        if (theMaxDevice != nil)
                theDepth = (**(**theMaxDevice).gdPMap).pixelSize;

-               
+

        return theDepth ;
 }
 
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {
        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  ;
 
     *width = screenBits.bounds.right - screenBits.bounds.left  ;

-    *height = screenBits.bounds.bottom - screenBits.bounds.top ; 
-#if TARGET_CARBON
-       SInt16 mheight ;
-       GetThemeMenuBarHeight( &mheight ) ;
-     *height -= mheight ;
-#else
-     *height -= LMGetMBarHeight() ;
-#endif
+    *height = screenBits.bounds.bottom - screenBits.bounds.top ;

 }
 
 void wxDisplaySizeMM(int *width, int *height)
 {
 }
 
 void wxDisplaySizeMM(int *width, int *height)
 {

-   wxDisplaySize(width, 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 );
+}
+
+void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+{
+    BitMap screenBits;
+    GetQDGlobalsScreenBits( &screenBits );
+
+    if (x) *x = 0;
+    if (y) *y = 0;
+
+    *width = screenBits.bounds.right - screenBits.bounds.left  ;
+    *height = screenBits.bounds.bottom - screenBits.bounds.top ;
+
+    SInt16 mheight ;
+#if TARGET_CARBON
+    GetThemeMenuBarHeight( &mheight ) ;
+#else
+    mheight = LMGetMBarHeight() ;
+#endif
+    *height -= mheight ;
+    if ( y )
+        *y = mheight ;

 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 {
     return wxGenericFindWindowAtPoint(pt);
 }
 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 {
     return wxGenericFindWindowAtPoint(pt);
 }

+
+wxString wxGetOsDescription()
+{
+#ifdef WXWIN_OS_DESCRIPTION
+    // use configure generated description if available
+    return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")");
+#else
+    return "MacOS" ; //TODO:define further
+#endif
+}
+