Changeset 389 for trunk/ICeCoffEE/ICeCoffEE/APEMain.m

Timestamp:

02/22/08 21:43:27 (16 years ago)

Author:

Nicholas Riley

Message:

Remove unnecessary CPS usage and CFBundleGetBundleWithIdentifier.

File:

• trunk/ICeCoffEE/ICeCoffEE/APEMain.m (modified) (4 diffs)

trunk/ICeCoffEE/ICeCoffEE/APEMain.m

@@ -17 +17 @@
 #import <objc/objc-runtime.h>
 #import "ICeCoffEE.h"
-#import "CPS.h"
 
 //¥¥¥ Our settings
@@ -66 +65 @@
 CFBundleRef ICCF_bundle;
 
-// With APE 1.3, if we're in the exclude list, APEBundleMainEarlyLoad doesn't get invoked; don't need to use APETools.  But we need to do our own management to avoid loading in non-GUI applications.
+// With APE 1.3, if we're in the exclude list, APEBundleMainEarlyLoad doesn't get invoked; don't need to use APETools.  But we need to do our own management to avoid loading in background-only applications.
 Boolean ICCF_shouldLoad;
+
+static Boolean ICCF_IsOne(CFTypeRef value) {
+    if (value == NULL)
+        return false;
+    CFTypeID typeID = CFGetTypeID(value);
+    if (typeID == CFBooleanGetTypeID())
+        return CFBooleanGetValue((CFBooleanRef)value);
+    else if (typeID == CFNumberGetTypeID()) {
+        static const int one = 1;
+        static CFNumberRef oneRef = NULL;
+        if (oneRef == NULL) oneRef = CFNumberCreate(NULL, kCFNumberIntType, &one);
+        return CFNumberCompare((CFNumberRef)value, oneRef, NULL) == kCFCompareEqualTo;
+    } else if (typeID == CFStringGetTypeID()) {
+        return CFStringCompare((CFStringRef)value, CFSTR("1"), 0) == kCFCompareEqualTo;
+    }
+    return false;
+}
 
 void APEBundleMainEarlyLoad(CFBundleRef inBundle, CFStringRef inAPEToolsApplicationID)
@@ -80 +96 @@
 
     ICCF_shouldLoad = false;
-
-    CPSProcessSerNum psn;
-    OSStatus err = CPSGetCurrentProcess(&psn);
-    if (err != noErr) {
-#if ICCF_DEBUG
-        apeprintf("ICeCoffEE APE: Can't get process serial number for current process (error %ld); still loading because of ICCF_DEBUG\n", err);
-#else
-        apeprintf("ICeCoffEE APE: Can't get process serial number for current process (error %ld); not loading in this application\n", err);
-        return;
-#endif
-    }
-
-    CPSProcessInfoRec info;
-    err = CPSGetProcessInfo(&psn, &info, NULL, 0, NULL, NULL, 0);
-    if (err != noErr) {
-#if ICCF_DEBUG
-        apeprintf("ICeCoffEE APE: Can't get process information (error %ld); still loading because of ICCF_DEBUG\n", err);
-#else
-        apeprintf("ICeCoffEE APE: Can't get process information (error %ld); not loading in this application\n", err);
-        return;
-#endif
-    } else {
-        ICapeprintf("ICeCoffEE APE: got process attributes = 0x%lx\n", info.Attributes);
-        if (info.Attributes & (kCPSBGOnlyAttr | kCPSUIElementAttr | kCPSFullScreenAttr)) {
-            ICapeprintf("ICeCoffEE APE: not loading as this application is background-only\n");
-            return;
-        }
+    
+    CFBundleRef appBundle = CFBundleGetMainBundle();
+    if (appBundle == NULL) {
+        apeprintf("ICeCoffEE APE: Can't get CFBundle for current process; not loading\n");
+        return;
+    }
+    
+    if (ICCF_IsOne(CFBundleGetValueForInfoDictionaryKey(appBundle, CFSTR("LSUIElement"))) ||
+        ICCF_IsOne(CFBundleGetValueForInfoDictionaryKey(appBundle, CFSTR("NSUIElement"))) ||
+        ICCF_IsOne(CFBundleGetValueForInfoDictionaryKey(appBundle, CFSTR("LSBackgroundOnly"))) ||
+        ICCF_IsOne(CFBundleGetValueForInfoDictionaryKey(appBundle, CFSTR("NSBackgroundOnly")))) {
+        ICapeprintf("ICeCoffEE APE: not loading as this application is background-only\n");
+        return;
     }
     ICCF_shouldLoad = true;
 }
 
-Boolean ICCF_CFBundleIDMatches(CFStringRef bundleID, CFStringRef test) {
+static Boolean ICCF_CFBundleIDMatches(CFStringRef bundleID, CFStringRef test) {
     return CFStringCompare(bundleID, test, kCFCompareCaseInsensitive) == kCFCompareEqualTo;
 }
@@ -119 +121 @@
     if (!ICCF_shouldLoad) return;
 
-    ICCF_bundle = CFBundleGetBundleWithIdentifier(kICBundleIdentifier);
+    ICCF_bundle = inBundle;
     CFStringRef bundleID = CFBundleGetIdentifier(CFBundleGetMainBundle());
     BOOL shouldLoadInNSTextView = YES;