traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for #1905: PythonLauncher not working correctly on OSX 10.5/Leopard 

This fixes both Python Launchar and the terminalcommand module.
This commit is contained in:
Ronald Oussoren 2008-05-02 21:42:35 +00:00
parent 6780a9dd9f
commit f2ef92cee7
4 changed files with 45 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/plat-mac/Carbon/AppleEvents.py
View File

@ -1,6 +1,7 @@
# Generated from 'AEDataModel.h' # Generated from 'AEDataModel.h'
def FOUR_CHAR_CODE(x): return x def FOUR_CHAR_CODE(x): return x
typeApplicationBundleID = FOUR_CHAR_CODE('bund')
typeBoolean = FOUR_CHAR_CODE('bool') typeBoolean = FOUR_CHAR_CODE('bool')
typeChar = FOUR_CHAR_CODE('TEXT') typeChar = FOUR_CHAR_CODE('TEXT')
typeSInt16 = FOUR_CHAR_CODE('shor') typeSInt16 = FOUR_CHAR_CODE('shor')

2
Lib/plat-mac/terminalcommand.py
View File

@ -27,7 +27,7 @@ SEND_MODE = kAENoReply # kAEWaitReply hangs when run from Terminal.app itself
def run(command): def run(command):
"""Run a shell command in a new Terminal.app window.""" """Run a shell command in a new Terminal.app window."""
termAddress = AE.AECreateDesc(typeApplSignature, TERMINAL_SIG) termAddress = AE.AECreateDesc(typeApplicationBundleID, "com.apple.Terminal")
theEvent = AE.AECreateAppleEvent(kAECoreSuite, kAEDoScript, termAddress, theEvent = AE.AECreateAppleEvent(kAECoreSuite, kAEDoScript, termAddress,
kAutoGenerateReturnID, kAnyTransactionID) kAutoGenerateReturnID, kAnyTransactionID)
commandDesc = AE.AECreateDesc(typeChar, command) commandDesc = AE.AECreateDesc(typeChar, command)

4
Mac/PythonLauncher/MyDocument.m
View File

@ -121,8 +121,8 @@
return YES; return YES;
} else { } else {
[self run]; [self run];
[self close]; [self performSelector:@selector(close) withObject:nil afterDelay:0.0];
return NO; return YES;
} }
} }

135
Mac/PythonLauncher/doscript.m
View File

@ -11,108 +11,49 @@
#import <ApplicationServices/ApplicationServices.h> #import <ApplicationServices/ApplicationServices.h>
#import "doscript.h" #import "doscript.h"
/* I assume I could pick these up from somewhere, but where... */
#define CREATOR 'trmx'
#define ACTIVATE_CMD 'misc'
#define ACTIVATE_SUITE 'actv'
#define DOSCRIPT_CMD 'dosc'
#define DOSCRIPT_SUITE 'core'
#define WITHCOMMAND 'cmnd'
/* ... and there's probably also a better way to do this... */
#define START_TERMINAL "/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal &"
extern int extern int
doscript(const char *command) doscript(const char *command)
{ {
OSErr err; char *bundleID = "com.apple.Terminal";
AppleEvent theAEvent, theReply; AppleEvent evt, res;
AEAddressDesc terminalAddress; AEDesc desc;
AEDesc commandDesc; OSStatus err;
OSType terminalCreator = CREATOR;
/* set up locals */ [[NSWorkspace sharedWorkspace] launchApplication:@"/Applications/Utilities/Terminal.app/"];
AECreateDesc(typeNull, NULL, 0, &theAEvent);
AECreateDesc(typeNull, NULL, 0, &terminalAddress);
AECreateDesc(typeNull, NULL, 0, &theReply);
AECreateDesc(typeNull, NULL, 0, &commandDesc);
/* create the "activate" event for Terminal */ // Build event
err = AECreateDesc(typeApplSignature, (Ptr) &terminalCreator, err = AEBuildAppleEvent(kAECoreSuite, kAEDoScript,
sizeof(terminalCreator), &terminalAddress); typeApplicationBundleID,
if (err != noErr) { bundleID, strlen(bundleID),
NSLog(@"doscript: AECreateDesc: error %d\n", err); kAutoGenerateReturnID,
goto bail; kAnyTransactionID,
} &evt, NULL,
err = AECreateAppleEvent(ACTIVATE_SUITE, ACTIVATE_CMD, "'----':utf8(@)", strlen(command),
&terminalAddress, kAutoGenerateReturnID, command);
kAnyTransactionID, &theAEvent);
if (err != noErr) {
NSLog(@"doscript: AECreateAppleEvent(activate): error %d\n", err);
goto bail;
}
/* send the event */
err = AESend(&theAEvent, &theReply, kAEWaitReply,
kAENormalPriority, kAEDefaultTimeout, NULL, NULL);
if ( err == -600 ) {
int count=10;
/* If it failed with "no such process" try to start Terminal */
err = system(START_TERMINAL);
if (err) { if (err) {
NSLog(@"doscript: system(): %s\n", strerror(errno)); NSLog(@"AEBuildAppleEvent failed: %d\n", err);
goto bail; return err;
} }
do {
sleep(1); // Send event and check for any Apple Event Manager errors
/* send the event again */ err = AESendMessage(&evt, &res, kAEWaitReply, kAEDefaultTimeout);
err = AESend(&theAEvent, &theReply, kAEWaitReply, AEDisposeDesc(&evt);
kAENormalPriority, kAEDefaultTimeout, NULL, NULL); if (err) {
} while (err == -600 && --count > 0); NSLog(@"AESendMessage failed: %d\n", err);
if ( err == -600 ) return err;
NSLog(@"doscript: Could not activate Terminal\n"); }
} // Check for any application errors
if (err != noErr) { err = AEGetParamDesc(&res, keyErrorNumber, typeSInt32, &desc);
NSLog(@"doscript: AESend(activate): error %d\n", err); AEDisposeDesc(&res);
goto bail; if (!err) {
} AEGetDescData(&desc, &err, sizeof(err));
NSLog(@"Terminal returned an error: %d", err);
/* create the "doscript with command" event for Terminal */ AEDisposeDesc(&desc);
err = AECreateAppleEvent(DOSCRIPT_SUITE, DOSCRIPT_CMD, } else if (err == errAEDescNotFound) {
&terminalAddress, kAutoGenerateReturnID, err = noErr;
kAnyTransactionID, &theAEvent); } else {
if (err != noErr) { NSLog(@"AEGetPArmDesc returned an error: %d", err);
NSLog(@"doscript: AECreateAppleEvent(doscript): error %d\n", err); }
goto bail;
}
/* add the command to the apple event */
err = AECreateDesc(typeChar, command, strlen(command), &commandDesc);
if (err != noErr) {
NSLog(@"doscript: AECreateDesc(command): error %d\n", err);
goto bail;
}
err = AEPutParamDesc(&theAEvent, WITHCOMMAND, &commandDesc);
if (err != noErr) {
NSLog(@"doscript: AEPutParamDesc: error %d\n", err);
goto bail;
}
/* send the command event to Terminal.app */
err = AESend(&theAEvent, &theReply, kAEWaitReply,
kAENormalPriority, kAEDefaultTimeout, NULL, NULL);
if (err != noErr) {
NSLog(@"doscript: AESend(docommand): error %d\n", err);
goto bail;
}
/* clean up and leave */
bail:
AEDisposeDesc(&commandDesc);
AEDisposeDesc(&theAEvent);
AEDisposeDesc(&terminalAddress);
AEDisposeDesc(&theReply);
return err; return err;
} }