X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90771fe589672f48bc070cb0863a497afa48203b..1f919f38c80cd29a1852afaa5f9e1a135f6c5d96:/src/mac/carbon/utilsexc.cpp

diff --git a/src/mac/carbon/utilsexc.cpp b/src/mac/carbon/utilsexc.cpp
index dc05dbab9c..f270694d38 100644
--- a/src/mac/carbon/utilsexc.cpp
+++ b/src/mac/carbon/utilsexc.cpp
@@ -32,24 +32,118 @@ extern "C" {
 #ifndef __DARWIN__
 #define wxEXECUTE_WIN_MESSAGE 10000
 
-long wxExecute(const wxString& command, int flags, wxProcess *handler)
+#include "wx/mac/private.h"
+
+/*
+Below FinderLaunch function comes from:
+http://developer.apple.com/technotes/tn/tn1002.html#fndrask
+*/
+    /* FinderLaunch converts a list of nTargets FSSpec records
+    pointed to by the targetList parameter and converts the
+    list to an Apple Event.  It then sends that event to the
+    Finder.  The array of FSSpec records pointed to by the
+    targetList parameter may contain references to files,
+    folders, or applications.  The net effect of this command
+    is equivalent to the user selecting an icon in one of the
+    Finder's windows and then choosing the open command from
+    the Finder's file menu. */
+static OSErr FinderLaunch(long nTargets, FSSpec *targetList) {
+    OSErr err;
+    AppleEvent theAEvent, theReply;
+    AEAddressDesc fndrAddress;
+    AEDescList targetListDesc;
+    OSType fndrCreator;
+    Boolean wasChanged;
+    AliasHandle targetAlias;
+    long index;
+
+        /* set up locals  */
+    AECreateDesc(typeNull, NULL, 0, &theAEvent);
+    AECreateDesc(typeNull, NULL, 0, &fndrAddress);
+    AECreateDesc(typeNull, NULL, 0, &theReply);
+    AECreateDesc(typeNull, NULL, 0, &targetListDesc);
+    targetAlias = NULL;
+    fndrCreator = 'MACS';
+
+        /* verify parameters */
+    if ((nTargets == 0) || (targetList == NULL)) {
+        err = paramErr;
+        goto bail;
+    }
+
+        /* create an open documents event targeting the
+        finder */
+    err = AECreateDesc(typeApplSignature, (Ptr) &fndrCreator,
+        sizeof(fndrCreator), &fndrAddress);
+    if (err != noErr) goto bail;
+    err = AECreateAppleEvent(kCoreEventClass, kAEOpenDocuments,
+        &fndrAddress, kAutoGenerateReturnID,
+        kAnyTransactionID, &theAEvent);
+    if (err != noErr) goto bail;
+
+        /* create the list of files to open */
+    err = AECreateList(NULL, 0, false, &targetListDesc);
+    if (err != noErr) goto bail;
+    for ( index=0; index < nTargets; index++) {
+        if (targetAlias == NULL)
+            err = NewAlias(NULL, (targetList + index),
+                  &targetAlias);
+        else err = UpdateAlias(NULL, (targetList + index),
+                   targetAlias, &wasChanged);
+        if (err != noErr) goto bail;
+        HLock((Handle) targetAlias);
+        err = AEPutPtr(&targetListDesc, (index + 1),
+              typeAlias, *targetAlias,
+              GetHandleSize((Handle) targetAlias));
+        HUnlock((Handle) targetAlias);
+        if (err != noErr) goto bail;
+    }
+
+        /* add the file list to the Apple Event */
+    err = AEPutParamDesc(&theAEvent, keyDirectObject,
+          &targetListDesc);
+    if (err != noErr) goto bail;
+
+        /* send the event to the Finder */
+    err = AESend(&theAEvent, &theReply, kAENoReply,
+        kAENormalPriority, kAEDefaultTimeout, NULL, NULL);
+
+        /* clean up and leave */
+bail:
+    if (targetAlias != NULL) DisposeHandle((Handle) targetAlias);
+    AEDisposeDesc(&targetListDesc);
+    AEDisposeDesc(&theAEvent);
+    AEDisposeDesc(&fndrAddress);
+    AEDisposeDesc(&theReply);
+    return err;
+}
+
+long wxExecute(const wxString& command, int flags, wxProcess *WXUNUSED(handler))
 {
-    // TODO
-    wxFAIL_MSG( _T("wxExecute() not yet implemented") );
-    return 0;
+    wxASSERT_MSG( flags == wxEXEC_ASYNC,
+        wxT("wxExecute: Only wxEXEC_ASYNC is supported") );
+
+    FSSpec fsSpec;
+    wxMacFilename2FSSpec(command, &fsSpec);
+
+    // 0 means execution failed. Returning non-zero is a PID, but not
+    // on Mac where PIDs are 64 bits and won't fit in a long, so we
+    // return a dummy value for now.
+    return ( FinderLaunch(1 /*one file*/, &fsSpec) == noErr ) ? -1 : 0;
 }
+
 #endif
 
 #ifdef __DARWIN__
 void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data)
 {
 	wxEndProcessData *proc_data = (wxEndProcessData*)data;
-	wxLogDebug("Wow.. this actually worked!");
+	wxLogDebug(wxT("Wow.. this actually worked!"));
 	int status = 0;
 	int rc = waitpid(abs(proc_data->pid), &status, WNOHANG);
 	if(!rc)
 	{
-		wxLogDebug("Mach port was invalidated, but process hasn't terminated!");
+		wxLogDebug(wxT("Mach port was invalidated, but process hasn't terminated!"));
 		return;
 	}
 	if((rc != -1) && WIFEXITED(status))
@@ -69,14 +163,14 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
     taskOfOurProcess = mach_task_self();
     if(taskOfOurProcess == MACH_PORT_NULL)
     {
-        wxLogDebug("No mach_task_self()");
+        wxLogDebug(wxT("No mach_task_self()"));
         return -1;
     }
-    wxLogDebug("pid=%d",pid);
+    wxLogDebug(wxT("pid=%d"),pid);
     kernResult = task_for_pid(taskOfOurProcess,pid, &machPortForProcess);
     if(kernResult != KERN_SUCCESS)
     {
-        wxLogDebug("no task_for_pid()");
+        wxLogDebug(wxT("no task_for_pid()"));
         // try seeing if it is already dead or something
         // FIXME: a better method would be to call the callback function
         // from idle time until the process terminates. Of course, how
@@ -97,7 +191,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
     CFMachPortForProcess = CFMachPortCreateWithPort(NULL, machPortForProcess, NULL, &termcb_contextinfo, &ShouldFreePort);
     if(!CFMachPortForProcess)
     {
-        wxLogDebug("No CFMachPortForProcess");
+        wxLogDebug(wxT("No CFMachPortForProcess"));
         mach_port_deallocate(taskOfOurProcess, machPortForProcess);
         return -1;
     }
@@ -106,7 +200,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
         kernResult = mach_port_deallocate(taskOfOurProcess, machPortForProcess);
         if(kernResult!=KERN_SUCCESS)
         {
-            wxLogDebug("Couldn't deallocate mach port");
+            wxLogDebug(wxT("Couldn't deallocate mach port"));
             return -1;
         }
     }
@@ -115,7 +209,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
     runloopsource = CFMachPortCreateRunLoopSource(NULL,CFMachPortForProcess, (CFIndex)0);
     if(!runloopsource)
     {
-        wxLogDebug("Couldn't create runloopsource");
+        wxLogDebug(wxT("Couldn't create runloopsource"));
         return -1;
     }
     
@@ -123,7 +217,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
 
     CFRunLoopAddSource(CFRunLoopGetCurrent(),runloopsource,kCFRunLoopDefaultMode);
     CFRelease(runloopsource);
-    wxLogDebug("Successfully added notification to the runloop");
+    wxLogDebug(wxT("Successfully added notification to the runloop"));
     return 0;
 }
 #endif