X-Git-Url: http://git.ithinksw.org/ITFoundation.git/blobdiff_plain/ef72d5f07dbddb7d236637465aecee328748964e..65c2a944b9f6d3acc94b06dd73d4ca89ce03515d:/ITAppleEventCenter.m

diff --git a/ITAppleEventCenter.m b/ITAppleEventCenter.m
index 30d14b1..50c7b88 100755
--- a/ITAppleEventCenter.m
+++ b/ITAppleEventCenter.m
@@ -1,12 +1,6 @@
 #import "ITAppleEventCenter.h"
-
-Boolean MyAEIdleCallback (
-					 EventRecord * theEvent,
-					 SInt32 * sleepTime,
-					 RgnHandle * mouseRgn
-					 );
-
-Boolean MyAEIdleCallback (
+//oh, wait, i forgot i had this open.
+static Boolean MyAEIdleCallback (
 					 EventRecord * theEvent,
 					 SInt32 * sleepTime,
 					 RgnHandle * mouseRgn
@@ -30,10 +24,9 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 
 - (id)init
 {
-    if (self = [super init])
-	   {
-	   idleUPP = NewAEIdleUPP(MyAEIdleCallback);
-	   }
+    if (self = [super init]) {
+        idleUPP = NewAEIdleUPP(MyAEIdleCallback);
+    }
     return self;
 }
 
@@ -60,20 +53,20 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-	    NSLog(@"Error getting PID of application! Exiting.");
+	    //NSLog(@"Error getting PID of application! Exiting.");
 	    return nil;
 	}
-	*/
+	
     //NSLog(@"_sendString: %s", sendString);
 
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
-
+//joe add the ITFDEBUG stuff back?
     //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
@@ -81,7 +74,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
         unichar *result = 0;
 
@@ -89,12 +82,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         result = malloc(resultSize);
 
         if (err2) {
-            NSLog(@"Error After AESizeOfParam: %i", err2);
+            //NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
 
             if (err3) {
-                NSLog(@"Error After AEGetParamPtr: %i", err3);
+                //NSLog(@"Error After AEGetParamPtr: %i", err3);
             } else {
                 _finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
             }
@@ -125,28 +118,28 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-	    NSLog(@"Error getting PID of application! Exiting.");
+	    //NSLog(@"Error getting PID of application! Exiting.");
 	    return nil;
 	}
-	*/
-    NSLog(@"_sendString: %s", sendString);
+	
+    //NSLog(@"_sendString: %s", sendString);
 
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
-    [self printCarbonDesc:&sendEvent];
+    //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
         unichar *result = 0;
 
@@ -154,12 +147,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         result = malloc(resultSize);
 
         if (err2) {
-            NSLog(@"Error After AESizeOfParam: %i", err2);
+            //NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
 
             if (err3) {
-                NSLog(@"Error After AEGetParamPtr: %i", err3);
+                //NSLog(@"Error After AEGetParamPtr: %i", err3);
             } else {
                 _finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
             }
@@ -191,12 +184,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-	    NSLog(@"Error getting PID of application! Exiting.");
+	    //NSLog(@"Error getting PID of application! Exiting.");
 	    return nil;
 	}
-	*/
+	
     //NSLog(@"_sendString: %s", sendString);
 
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
@@ -204,25 +197,25 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
         err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
 
         if (err2) {
-            NSLog(@"Error After AESizeOfParam: %i", err2);
+            //NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
 
             if (err3) {
-                NSLog(@"Error After AEGetParamPtr: %i", err3);
+                //NSLog(@"Error After AEGetParamPtr: %i", err3);
             }
         }
     }
@@ -251,11 +244,11 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-	    NSLog(@"Error getting PID of application! Exiting.");
+	    //NSLog(@"Error getting PID of application! Exiting.");
 	    return nil;
-	}*/
+	}
 
     //NSLog(@"_sendString: %s", sendString);
 
@@ -264,7 +257,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
@@ -272,7 +265,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
         unichar *result = 0;
 
@@ -280,12 +273,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         result = malloc(resultSize);
 
         if (err2) {
-            NSLog(@"Error After AESizeOfParam: %i", err2);
+            //NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
 
             if (err3) {
-                NSLog(@"Error After AEGetParamPtr: %i", err3);
+                //NSLog(@"Error After AEGetParamPtr: %i", err3);
             } else {
                 _finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
             }
@@ -317,38 +310,38 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-	    NSLog(@"Error getting PID of application! Exiting.");
+	    //NSLog(@"Error getting PID of application! Exiting.");
 	    return nil;
 	}
-	*/
-    // NSLog(@"_sendString: %s", sendString);
+	
+    // //NSLog(@"_sendString: %s", sendString);
 
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
     //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
         err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
 
         if (err2) {
-            NSLog(@"Error After AESizeOfParam: %i", err2);
+            //NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
 
             if (err3) {
-                NSLog(@"Error After AEGetParamPtr: %i", err3);
+                //NSLog(@"Error After AEGetParamPtr: %i", err3);
             }
         }
     }
@@ -385,12 +378,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     }
     buildString = [@"'----':obj " stringByAppendingString:buildString];
     sendString = [buildString UTF8String];
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-	    NSLog(@"Error getting PID of application! Exiting.");
+	    //NSLog(@"Error getting PID of application! Exiting.");
 	    return nil;
 	}
-	*/
+	
     //NSLog(@"_sendString: %s", sendString);
 
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
@@ -398,7 +391,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[buildString substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[buildString substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
@@ -406,7 +399,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
         unichar *result = 0;
 
@@ -414,11 +407,11 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         result=malloc(resultSize);
 
         if (err2) {
-            NSLog(@"Error After AESizeOfParam: %i", err2);
+            //NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
             if (err3) {
-                NSLog(@"Error After AEGetParamPtr: %i", err3);
+                //NSLog(@"Error After AEGetParamPtr: %i", err3);
             } else {
                 _finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
             }
@@ -437,20 +430,25 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AppleEvent event, reply;
 
     //AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
-    AECreateDesc(typeProcessSerialNumber,(ProcessSerialNumber*)&psn,sizeof(ProcessSerialNumber),&dest);
+    if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+	    //NSLog(@"Error getting PID of application! Exiting.");
+	    return nil;
+	}
+	AECreateDesc(typeProcessSerialNumber,(ProcessSerialNumber*)&psn,sizeof(ProcessSerialNumber),&dest);
     AECreateAppleEvent(eClass,eID,&dest,kAutoGenerateReturnID,kAnyTransactionID,&event);
+//[self printCarbonDesc:&event];
     AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, idleUPP, nil);
-
+//[self printCarbonDesc:&reply];
     AEDisposeDesc(&dest);
     AEDisposeDesc(&event);
     AEDisposeDesc(&reply);
 }
 
 - (void)printCarbonDesc:(AEDesc*)desc {
-    /*Handle xx;
+    Handle xx;
     AEPrintDescToHandle(desc,&xx);
     NSLog(@"Handle: %s", *xx);
-    DisposeHandle(xx);*/
+    DisposeHandle(xx);
 }
 
 
@@ -471,21 +469,25 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     OSStatus err;
 
     //NSLog(@"_sendString: %s", sendString);
-
+if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+	    //NSLog(@"Error getting PID of application! Exiting.");
+	    return nil;
+	}
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
     //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
     }
 
+
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
     //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
 	   SInt32 count, resultCount;
 
@@ -509,56 +511,57 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
 
     const char *sendString = [string UTF8String];
-    long result = 0;
+    SInt32 result = 0;
 
     AppleEvent sendEvent, replyEvent;
 
     DescType resultType;
     Size resultSize, charResultSize;
-    
+
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-	    NSLog(@"Error getting PID of application! Exiting.");
+	    //NSLog(@"Error getting PID of application! Exiting.");
 	    return nil;
 	}
-	*/
+	
     //NSLog(@"_sendString: %s", sendString);
 
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
-    [self printCarbonDesc:&sendEvent];
+    //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
         err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
 
         if (err2) {
-            NSLog(@"Error After AESizeOfParam: %i", err2);
+            //NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
 
             if (err3) {
-                NSLog(@"Error After AEGetParamPtr: %i", err3);
+                //NSLog(@"Error After AEGetParamPtr: %i", err3);
             }
         }
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
 
-    return result;
+AEDisposeDesc(&sendEvent);
+AEDisposeDesc(&replyEvent);
+//NSLog(@"waffles say %d",result);
+return result;
 }
 
 - (AEArrayDataPointer)sendAEWithSendStringForArray:(NSString*)string eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn
@@ -574,12 +577,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 
     AEBuildError buildError;
     OSStatus err;
-    /*
+    
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-	    NSLog(@"Error getting PID of application! Exiting.");
+	    //NSLog(@"Error getting PID of application! Exiting.");
 	    return nil;
 	}
-	*/
+	
     //NSLog(@"_sendString: %s", sendString);
 
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
@@ -587,15 +590,15 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //[self printCarbonDesc:&sendEvent];
 
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]);
+        //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
 
     if (err) {
-        NSLog(@"Send Error: %i",err);
+        //NSLog(@"Send Error: %i",err);
     } else {
 	   SInt32 count, resultCount;
 
@@ -611,4 +614,4 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 
     return result;
 }
-@end
+@end
\ No newline at end of file