copyright update

[wxWidgets.git] / src / common / log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index ebf14bf02c15df8b8925f7810746eede02bc501e..c9c4ab2776b8e87b8606a26cc2ef883493531c27 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -39,7 +39,6 @@
         #ifdef __WXMSW__
             #include "wx/msw/private.h"
         #endif
         #ifdef __WXMSW__
             #include "wx/msw/private.h"
         #endif

-        #include "wx/msgdlg.h"

     #endif
 #endif //WX_PRECOMP
 
     #endif
 #endif //WX_PRECOMP
 


@@ -61,9 +60,9 @@
   #include  "wx/msw/private.h"      // includes windows.h for OutputDebugString
 #endif
 
   #include  "wx/msw/private.h"      // includes windows.h for OutputDebugString
 #endif
 

-#if !defined(__WXMSW__) || defined(__WXMICROWIN__)
-  #include  <signal.h>
-#endif  //Win/Unix
+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif

 
 // ----------------------------------------------------------------------------
 // non member functions
 
 // ----------------------------------------------------------------------------
 // non member functions


@@ -423,84 +422,189 @@ wxLogStderr::wxLogStderr(FILE *fp)
         m_fp = fp;
 }
 
         m_fp = fp;
 }
 

-#if defined(__WXMAC__) && !defined(__UNIX__)
-#define kDebuggerSignature        'MWDB'
+#if defined(__WXMAC__) && !defined(__DARWIN__)

 
 

-static Boolean FindProcessBySignature(OSType signature, ProcessInfoRec* info)
-{
-    OSErr err;
-    ProcessSerialNumber psn;
-    Boolean found = false;
-    psn.highLongOfPSN = 0;
-    psn.lowLongOfPSN = kNoProcess;
+#ifndef __MetroNubUtils__
+#include "MetroNubUtils.h"
+#endif

 
 

-    if (!info) return false;
+#ifdef __cplusplus
+       extern "C" {
+#endif

 
 

-    info->processInfoLength = sizeof(ProcessInfoRec);
-    info->processName = NULL;
-    info->processAppSpec = NULL;
+#ifndef __GESTALT__
+#include <Gestalt.h>
+#endif

 
 

-    err = noErr;
-    while (!found && err == noErr)
-    {
-        err = GetNextProcess(&psn);
-        if (err == noErr)
-        {
-            err = GetProcessInformation(&psn, info);
-            found = err == noErr && info->processSignature == signature;
-        }
-    }
-    return found;
-}
+#ifndef true
+#define true 1
+#endif

 
 

-pascal Boolean MWDebuggerIsRunning(void)
-{
-    ProcessInfoRec info;
-    return FindProcessBySignature(kDebuggerSignature, &info);
+#ifndef false
+#define false 0
+#endif
+
+#if TARGET_API_MAC_CARBON
+
+       #include <CodeFragments.h>
+
+       EXTERN_API_C( long )
+       CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
+
+       ProcPtr gCallUniversalProc_Proc = NULL;
+       
+#endif
+
+static MetroNubUserEntryBlock* gMetroNubEntry = NULL;
+
+static long fRunOnce = false;
+
+Boolean IsCompatibleVersion(short inVersion);
+
+/* ---------------------------------------------------------------------------
+               IsCompatibleVersion
+   --------------------------------------------------------------------------- */
+
+Boolean IsCompatibleVersion(short inVersion)
+{
+       Boolean result = false;
+       
+       if (fRunOnce)
+       {
+               MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;
+               
+               result = (inVersion <= block->apiHiVersion);
+       }
+       
+       return result;  
+}
+
+/* ---------------------------------------------------------------------------
+               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

 }
 
 }
 

-pascal OSErr AmIBeingMWDebugged(Boolean* result)
+/* ---------------------------------------------------------------------------
+               IsMWDebuggerRunning                                                                                     [v1 API]
+   --------------------------------------------------------------------------- */
+
+Boolean IsMWDebuggerRunning()

 {
 {

-    OSErr err;
-    ProcessSerialNumber psn;
-    OSType sig = kDebuggerSignature;
-    AppleEvent    theAE = {typeNull, NULL};
-    AppleEvent    theReply = {typeNull, NULL};
-    AEAddressDesc addr  = {typeNull, NULL};
-    DescType actualType;
-    Size actualSize;
+       if (IsMetroNubInstalled())
+               return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);
+       else
+               return false;
+}

 
 

-    if (!result) return paramErr;
+/* ---------------------------------------------------------------------------
+               AmIBeingMWDebugged                                                                                      [v1 API]
+   --------------------------------------------------------------------------- */

 
 

-    err = AECreateDesc(typeApplSignature, &sig, sizeof(sig), &addr);
-    if (err != noErr) goto exit;
+Boolean AmIBeingMWDebugged()
+{
+       if (IsMetroNubInstalled())
+               return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);
+       else
+               return false;
+}

 
 

-    err = AECreateAppleEvent(kDebuggerSignature, 'Dbg?', &addr,
-                kAutoGenerateReturnID, kAnyTransactionID, &theAE);
-    if (err != noErr) goto exit;
+/* ---------------------------------------------------------------------------
+               UserSetWatchPoint                                                                                       [v2 API]
+   --------------------------------------------------------------------------- */

 
 

-    GetCurrentProcess(&psn);
-    err = AEPutParamPtr(&theAE, keyDirectObject, typeProcessSerialNumber,
-            &psn, sizeof(psn));
-    if (err != noErr) goto exit;
+OSErr UserSetWatchPoint (Ptr address, long length, WatchPointIDT* watchPointID)
+{
+       if (IsMetroNubInstalled() && IsCompatibleVersion(kMetroNubUserAPIVersion))
+               return CallUserSetWatchPointProc(gMetroNubEntry->userSetWatchPoint,
+                                                                                       address, length, watchPointID);
+       else
+               return errProcessIsNotClient;
+}

 
 

-    err = AESend(&theAE, &theReply, kAEWaitReply, kAENormalPriority,
-                    kAEDefaultTimeout, NULL, NULL);
-    if (err != noErr) goto exit;
+/* ---------------------------------------------------------------------------
+               ClearWatchPoint                                                                                         [v2 API]
+   --------------------------------------------------------------------------- */

 
 

-    err = AEGetParamPtr(&theReply, keyAEResult, typeBoolean, &actualType, result,
-                sizeof(Boolean), &actualSize);
+OSErr ClearWatchPoint (WatchPointIDT watchPointID)
+{
+       if (IsMetroNubInstalled() && IsCompatibleVersion(kMetroNubUserAPIVersion))
+               return CallClearWatchPointProc(gMetroNubEntry->clearWatchPoint,
+                                                                                       watchPointID);
+       else
+               return errProcessIsNotClient;
+}

 
 

-exit:
-    if (addr.dataHandle)
-        AEDisposeDesc(&addr);
-    if (theAE.dataHandle)
-        AEDisposeDesc(&theAE);
-    if (theReply.dataHandle)
-        AEDisposeDesc(&theReply);
+#ifdef __cplusplus
+       }
+#endif

 
 

-    return err;
-}

 #endif
 
 void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 #endif
 
 void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))


@@ -519,35 +623,25 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
     str += wxT("\r\n") ;
     OutputDebugString(str.c_str());
 #endif // MSW
     str += wxT("\r\n") ;
     OutputDebugString(str.c_str());
 #endif // MSW

-#if defined(__WXMAC__) && !defined(__WXMAC_X__) && wxUSE_GUI
+#if defined(__WXMAC__) && !defined(__DARWIN__) && wxUSE_GUI

     Str255 pstr ;
     strcpy( (char*) pstr , str.c_str() ) ;
     strcat( (char*) pstr , ";g" ) ;
     c2pstr( (char*) pstr ) ;
     Str255 pstr ;
     strcpy( (char*) pstr , str.c_str() ) ;
     strcat( (char*) pstr , ";g" ) ;
     c2pstr( (char*) pstr ) ;

-#if __WXDEBUG__
+

     Boolean running = false ;
 
     Boolean running = false ;
 

-/*
-    if ( MWDebuggerIsRunning() )
+    if ( IsMWDebuggerRunning() && AmIBeingMWDebugged() )

     {
     {

-        AmIBeingMWDebugged( &running ) ;
+        running = true ;

     }
     }

-*/
+

     if (running)
     {
 #ifdef __powerc
         DebugStr(pstr);
 #else
         SysBreakStr(pstr);
     if (running)
     {
 #ifdef __powerc
         DebugStr(pstr);
 #else
         SysBreakStr(pstr);

-#endif
-    }
-    else
-#endif
-    {
-#ifdef __powerc
-        DebugStr(pstr);
-#else
-        DebugStr(pstr);

 #endif
     }
 #endif // Mac
 #endif
     }
 #endif // Mac


@@ -620,6 +714,24 @@ void wxLogChain::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
     }
 }
 
     }
 }
 

+// ----------------------------------------------------------------------------
+// wxLogPassThrough
+// ----------------------------------------------------------------------------
+
+#ifdef __VISUALC__
+    // "'this' : used in base member initializer list" - so what?
+    #pragma warning(disable:4355)
+#endif // VC++
+
+wxLogPassThrough::wxLogPassThrough()
+                : wxLogChain(this)
+{
+}
+
+#ifdef __VISUALC__
+    #pragma warning(default:4355)
+#endif // VC++
+

 // ============================================================================
 // Global functions/variables
 // ============================================================================
 // ============================================================================
 // Global functions/variables
 // ============================================================================


@@ -719,17 +831,23 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
             0, NULL);
 
     // copy it to our buffer and free memory
             0, NULL);
 
     // copy it to our buffer and free memory

-    wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
-    s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
-    LocalFree(lpMsgBuf);
-
-    // returned string is capitalized and ended with '\r\n' - bad
-    s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
-    size_t len = wxStrlen(s_szBuf);
-    if ( len > 0 ) {
-        // truncate string
-        if ( s_szBuf[len - 2] == wxT('\r') )
-            s_szBuf[len - 2] = wxT('\0');
+    if( lpMsgBuf != 0 ) {
+        wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
+        s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
+
+        LocalFree(lpMsgBuf);
+
+        // returned string is capitalized and ended with '\r\n' - bad
+        s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
+        size_t len = wxStrlen(s_szBuf);
+        if ( len > 0 ) {
+            // truncate string
+            if ( s_szBuf[len - 2] == wxT('\r') )
+                s_szBuf[len - 2] = wxT('\0');
+        }
+    }
+    else {
+        s_szBuf[0] = wxT('\0');

     }
 
     return s_szBuf;
     }
 
     return s_szBuf;


@@ -748,122 +866,4 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
 #endif  // Win/Unix
 }
 
 #endif  // Win/Unix
 }
 

-// ----------------------------------------------------------------------------
-// debug helper
-// ----------------------------------------------------------------------------
-
-#ifdef  __WXDEBUG__
-
-// wxASSERT() helper
-bool wxAssertIsEqual(int x, int y)
-{
-    return x == y;
-}
-
-// break into the debugger
-void wxTrap()
-{
-#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
-    DebugBreak();
-#elif defined(__WXMAC__)
-#if __powerc
-    Debugger();
-#else
-    SysBreak();
-#endif
-#elif defined(__UNIX__)
-    raise(SIGTRAP);
-#else
-    // TODO
-#endif // Win/Unix
-}
-
-// this function is called when an assert fails
-void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
-{
-    // this variable can be set to true to suppress "assert failure" messages
-    static bool s_bNoAsserts = FALSE;
-    static bool s_bInAssert = FALSE;        // FIXME MT-unsafe
-
-    if ( s_bInAssert ) {
-        // He-e-e-e-elp!! we're trapped in endless loop
-        wxTrap();
-
-        s_bInAssert = FALSE;
-
-        return;
-    }
-
-    s_bInAssert = TRUE;
-
-    wxChar szBuf[LOG_BUFFER_SIZE];
-
-    // make life easier for people using VC++ IDE: clicking on the message
-    // will take us immediately to the place of the failed assert
-    wxSnprintf(szBuf, WXSIZEOF(szBuf),
-#ifdef __VISUALC__
-               wxT("%s(%d): assert failed"),
-#else  // !VC++
-    // make the error message more clear for all the others
-               wxT("Assert failed in file %s at line %d"),
-#endif // VC/!VC
-               szFile, nLine);
-
-    if ( szMsg != NULL ) {
-        wxStrcat(szBuf, wxT(": "));
-        wxStrcat(szBuf, szMsg);
-    }
-    else {
-        wxStrcat(szBuf, wxT("."));
-    }
-
-    if ( !s_bNoAsserts ) {
-        // send it to the normal log destination
-        wxLogDebug(szBuf);
-
-#if (wxUSE_GUI && wxUSE_MSGDLG) || defined(__WXMSW__)
-        // this message is intentionally not translated - it is for
-        // developpers only
-        wxStrcat(szBuf, wxT("\nDo you want to stop the program?\nYou can also choose [Cancel] to suppress further warnings."));
-
-        // use the native message box if available: this is more robust than
-        // using our own
-#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
-        switch ( ::MessageBox(NULL, szBuf, _T("Debug"),
-                              MB_YESNOCANCEL | MB_ICONSTOP ) ) {
-            case IDYES:
-                wxTrap();
-                break;
-
-            case IDCANCEL:
-                s_bNoAsserts = TRUE;
-                break;
-
-            //case IDNO: nothing to do
-        }
-#else // !MSW
-        switch ( wxMessageBox(szBuf, wxT("Debug"),
-                              wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
-            case wxYES:
-                wxTrap();
-                break;
-
-            case wxCANCEL:
-                s_bNoAsserts = TRUE;
-                break;
-
-            //case wxNO: nothing to do
-        }
-#endif // GUI or MSW
-
-#else // !GUI
-        wxTrap();
-#endif // GUI/!GUI
-    }
-
-    s_bInAssert = FALSE;
-}
-
-#endif  //WXDEBUG
-

 #endif //wxUSE_LOG
 #endif //wxUSE_LOG