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

Timestamp:

04/18/05 05:30:49 (18 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE 1.4 and preliminary 1.4.1 changes. Sorry, I forgot to
commit version 1.4 when it was released, so the precise source for
that release has been lost.

See the release notes for details of what changed in these versions.
1.4 was a significant feature release; 1.4.1 is a bug fix for 10.3.9,
incorporating up-to-date Unsanity Installer and APE.

package-ICeCoffEE.sh: use xcodebuild instead of pbxbuild.

File:

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

trunk/ICeCoffEE/ICeCoffEE/APEMain.m

@@ -67 +67 @@
 CFBundleRef ICCF_bundle;
 
-void APEBundleMain(CFBundleRef inBundle)
+// 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 appllications.
+Boolean ICCF_shouldLoad;
+
+void APEBundleMainEarlyLoad(CFBundleRef inBundle, CFStringRef inAPEToolsApplicationID)
 {
     ICCF_MigratePrefs();
@@ -77 +80 @@
     SAFE_RELEASE(icVersionRef);
 
-    // first check if this application is in the exclude list;
-    // if it is, simply return and do not apply any patches.
-    // APETools will help us with that; APE Manager will take care of
-    // exclude list management for us.
-    if (APEToolsIsInExcludeList(kICBundleIdentifier, NULL)) {
-        ICapeprintf("ICeCoffEE APE: not loading as this application is excluded.\n");
-        return;
-    }
+    ICCF_shouldLoad = false;
 
     CPSProcessSerNum psn;
@@ -106 +102 @@
         return;
 #endif
-    }
-    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;
-    }
+    } 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;
+        }
+    }
+    ICCF_shouldLoad = true;
+}
+
+Boolean ICCF_CFBundleIDMatches(CFStringRef bundleID, CFStringRef test) {
+    return CFStringCompare(bundleID, test, kCFCompareCaseInsensitive) == kCFCompareEqualTo;
+}
+
+void APEBundleMainLateLoad(CFBundleRef inBundle, CFStringRef inAPEToolsApplicationID)
+{
+    if (!ICCF_shouldLoad) return;
 
     ICCF_bundle = CFBundleGetBundleWithIdentifier(kICBundleIdentifier);
@@ -119 +126 @@
     // XXX handle patching error return from ICCF_PatchMethod
     if (bundleID != NULL) {
-        if (CFStringCompare(bundleID, CFSTR("com.apple.projectbuilder"), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+        if (ICCF_CFBundleIDMatches(bundleID, CFSTR("com.apple.projectbuilder")) ||
+            ICCF_CFBundleIDMatches(bundleID, CFSTR("com.apple.xcode"))) {
             ICCF_PatchMethod("PBXTextView", "ICeCoffEEMenuOnly", "ICeCoffEEMenuSuper", "menuForEvent:");
             ICapeprintf("ICeCoffEE APE: loaded in PBXTextView for PB!\n");
             shouldLoadInNSTextView = NO;
-        } else if (CFStringCompare(bundleID, CFSTR("com.apple.terminal"), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+        } else if (ICCF_CFBundleIDMatches(bundleID, CFSTR("com.apple.terminal"))) {
             ICCF_PatchMethod("TermSubview", "ICeCoffEEMenuOnly", "ICeCoffEEMenuSuper", "menuForEvent:") &&
             ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "selectedRange") &&
@@ -132 +140 @@
             ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "_optionClickEvent:::") ,
             ICapeprintf("ICeCoffEE APE: loaded in TermSubview for Terminal!\n");
-        } else if (CFStringCompare(bundleID, CFSTR("com.apple.safari"), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
-#if ICCF_WEBKIT
-            ICCF_PatchMethod("WebHTMLView", "ICeCoffEEWebKit", "ICeCoffEEWebKitSuper", "mouseUp:") &&
-            ICCF_PatchMethod("WebHTMLView", "ICeCoffEEWebKit", "ICeCoffEEWebKitSuper", "mouseDown:") &&
-            ICCF_PatchMethod("WebHTMLView", "ICeCoffEEWebKit", "ICeCoffEEWebKitSuper", "menuForEvent:") , 
-            ICapeprintf("ICeCoffEE APE: loaded in WebHTMLView for Safari!\n");
-#endif
-        }
-    }
-
+        } else if (ICCF_CFBundleIDMatches(bundleID, CFSTR("org.mozilla.navigator"))) {
+            ICCF_PatchMethod("ChildView", "ICeCoffEEMenuOnly", "ICeCoffEEMenuSuper", "menuForEvent:");
+            ICapeprintf("ICeCoffEE APE: loaded in ChildView for Camino\n");
+        }
+    }
+
+    ICCF_PatchMethod("WebHTMLView", "ICeCoffEEWebKit", "ICeCoffEEWebKitSuper", "mouseUp:") &&
+        ICCF_PatchMethod("WebHTMLView", "ICeCoffEEWebKit", "ICeCoffEEWebKitSuper", "mouseDown:") &&
+        ICCF_PatchMethod("WebHTMLView", "ICeCoffEEWebKit", "ICeCoffEEWebKitSuper", "menuForEvent:"),
+        ICapeprintf("ICeCoffEE APE: loaded in WebHTMLView for WebKit/Safari\n");
+    
     if (shouldLoadInNSTextView) {
         ICCF_PatchMethod("NSTextView", "ICeCoffEE", "ICeCoffEESuper", "mouseDown:") &&