diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2019-09-01 05:02:47 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2019-09-01 05:02:47 (GMT) |
| commit | b47684b3d7c8ac79186f4928931bc520ea9fec42 (patch) | |
| tree | 65591ef65d12fc6f537124604e392a4979471928 /macosx/tkMacOSXHLEvents.c | |
| parent | 3331acc1d00f09d5b8fb46e3e922af98f88fecc6 (diff) | |
| download | tk-b47684b3d7c8ac79186f4928931bc520ea9fec42.zip tk-b47684b3d7c8ac79186f4928931bc520ea9fec42.tar.gz tk-b47684b3d7c8ac79186f4928931bc520ea9fec42.tar.bz2 | |
More refinements
Diffstat (limited to 'macosx/tkMacOSXHLEvents.c')
| -rw-r--r-- | macosx/tkMacOSXHLEvents.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c index 7f55ea7..72c7d08 100644 --- a/macosx/tkMacOSXHLEvents.c +++ b/macosx/tkMacOSXHLEvents.c @@ -229,7 +229,7 @@ static char* scriptTextProc = "::tk::mac::DoScriptText"; */ err = AEGetParamPtr(theDesc, keyDirectObject, typeFileURL, &type, (Ptr) URLBuffer, URL_MAX_LENGTH, &actual); - if (err == noErr && actual > 0){ + if (err == noErr && actual > 0) { URLBuffer[actual] = '\0'; NSString *urlString = [NSString stringWithUTF8String:(char*)URLBuffer]; NSURL *fileURL = [NSURL URLWithString:urlString]; @@ -266,19 +266,24 @@ static char* scriptTextProc = "::tk::mac::DoScriptText"; * if that procedure exists. */ char *data = ckalloc(actual + 1); + if (noErr == AEGetParamPtr(theDesc, keyDirectObject, typeUTF8Text, &type, data, actual, NULL)) { Tcl_DString *textScriptCommand = &staticAEInfo.command; Tcl_DStringInit(textScriptCommand); - if (Tcl_FindCommand(_eventInterp, scriptTextProc, NULL, 0)){ + if (Tcl_FindCommand(_eventInterp, scriptTextProc, NULL, 0)) { Tcl_DStringAppend(textScriptCommand, scriptTextProc, -1); } else { Tcl_DStringAppend(textScriptCommand, "eval", -1); } + NSLog(@"data is %s", data); Tcl_DStringAppendElement(textScriptCommand, data); - NSLog(@"data is %s", data); - tclErr = Tcl_EvalEx(_eventInterp,Tcl_DStringValue(textScriptCommand),Tcl_DStringLength(textScriptCommand), TCL_EVAL_GLOBAL); + int tclErr = Tcl_EvalEx(_eventInterp,Tcl_DStringValue(textScriptCommand),Tcl_DStringLength(textScriptCommand), TCL_EVAL_GLOBAL); + if (tclErr!= TCL_OK) { + Tcl_BackgroundException(_eventInterp, tclErr); + } + Tcl_DStringFree(textScriptCommand); ckfree(data); } else { /* @@ -291,7 +296,6 @@ static char* scriptTextProc = "::tk::mac::DoScriptText"; staticAEInfo.procedure = scriptTextProc; Tcl_DoWhenIdle(ProcessAppleEventEventually, (ClientData)&staticAEInfo); } - } /* |