Changeset 216 for trunk/ICeCoffEE/ICeCoffEE

Timestamp:

05/01/06 09:11:28 (18 years ago)

Author:

Nicholas Riley

Message:

VERSION: Starting with 1.4.3d1.

APE.icns: Generic APE icon (not sure whether we care).

SmartCrashReportsAPI.[ho]: SCR 1.1.

ICeCoffEEWebKit.m: -elementAtPoint: isn't in current
development WebKit; switch to the version in WebHTMLView.

Info-APE Module.plist: Update version to 1.4.3d1.

ICeCoffEE.xcodeproj: Xcode 2 version of project, required fixing
script which copies the APE bundle into the installer. We're still
building for 10.3.9 and later on PowerPC only for this release.

English.lproj/APEInfo.rtfd: Small clarifications, update release notes
and version information.

English.lproj/InfoPlist.strings: Update version to 1.4.3d1.

ICeCoffEEShared.h: Use varargs macros to finally fix the stupid
warnings when ICCF_DEBUG is 0.

ICeCoffEE APE.xcode: Removed.

ICeCoffEETerminal.m: Fixes crash on clicking disabled close/minimize
widgets in Open dialog (invalid super method call) by implementing
overridden methods in the faked superclass.

ape_install: APE 1.5.1.

Info-APEManagerPrefPane.plist: Update version number.

APEMain.m: Implement SCR. Fix a comment typo. Remove some useless
uses of the comma operator so the new warning-less ICapeprintf works.

package-ICeCoffEE.sh: Use new xcodebuild syntax and build layout.
Remove a useless use of the semicolon. Nuke localizations on
development builds.

Location:

trunk/ICeCoffEE/ICeCoffEE

Files:

• APE.icns (added)
• APEMain.m (modified) (7 diffs)
• English.lproj/APEInfo.rtfd/TXT.rtf (modified) ( previous)
• English.lproj/InfoPlist.strings (modified) ( previous)
• ICeCoffEE APE.xcode (deleted)
• ICeCoffEE.xcodeproj (added)
• ICeCoffEE.xcodeproj/nicholas.mode1 (added)
• ICeCoffEE.xcodeproj/nicholas.mode2 (added)
• ICeCoffEE.xcodeproj/nicholas.pbxuser (added)
• ICeCoffEE.xcodeproj/nicholas.perspective (added)
• ICeCoffEE.xcodeproj/project.pbxproj (added)
• ICeCoffEEShared.h (modified) (1 diff)
• ICeCoffEETerminal.m (modified) (1 diff)
• ICeCoffEEWebKit.m (modified) (3 diffs)
• Info-APE Module.plist (modified) (2 diffs)
• Info-APEManagerPrefPane.plist (modified) (1 diff)
• Installer components/ICeCoffEE Installer.app/Contents/Resources/ape_install (modified) ( previous)
• SmartCrashReportsAPI.h (added)
• SmartCrashReportsAPI.o (added)
• VERSION (modified) (1 diff)

trunk/ICeCoffEE/ICeCoffEE/APEMain.m

@@ -16 +16 @@
 #import <ApplicationEnhancer/APETools.h>
 #import <objc/objc-runtime.h>
+#import "SmartCrashReportsAPI.h"
 #import "ICeCoffEE.h"
 #import "ICeCoffEETextEdit.h"
@@ -67 +68 @@
 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 appllications.
+// 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.
 Boolean ICCF_shouldLoad;
 
 void APEBundleMainEarlyLoad(CFBundleRef inBundle, CFStringRef inAPEToolsApplicationID)
 {
+    OSStatus err;
+
+    err = UnsanitySCR_RegisterMatchSpecifier(kICBundleIdentifier, CFSTR("Nicholas Riley"),
+                                             NULL, CFSTR("SCR-5E5C696784"), NULL);
+    if (err != noErr) {
+        apeprintf("ICeCoffEE APE: Can't register with Smart Crash Reports (error %ld)\n", err);
+    }
+    
     ICCF_MigratePrefs();
 
@@ -83 +92 @@
 
     CPSProcessSerNum psn;
-    OSStatus err = CPSGetCurrentProcess(&psn);
+    err = CPSGetCurrentProcess(&psn);
     if (err != noErr) {
 #if ICCF_DEBUG
@@ -92 +101 @@
 #endif
     }
-    
+
     CPSProcessInfoRec info;
     err = CPSGetProcessInfo(&psn, &info, NULL, 0, NULL, NULL, 0);
@@ -128 +137 @@
         if (ICCF_CFBundleIDMatches(bundleID, CFSTR("com.apple.xcode"))) {
             ICCF_PatchMethod("PBXTextView", "ICeCoffEEMenuOnly", "ICeCoffEEMenuSuper", "menuForEvent:");
-            ICapeprintf("ICeCoffEE APE: loaded in PBXTextView for PB!\n");
+            ICapeprintf("ICeCoffEE APE: loaded in PBXTextView for Xcode\n");
             shouldLoadInNSTextView = NO;
         } else if (ICCF_CFBundleIDMatches(bundleID, CFSTR("com.apple.terminal"))) {
@@ -137 +146 @@
             ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "mouseUp:") &&
             ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "draggingEntered:") &&
-            ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "_optionClickEvent:::") ,
-            ICapeprintf("ICeCoffEE APE: loaded in TermSubview for Terminal!\n");
-        } else if (ICCF_CFBundleIDMatches(bundleID, CFSTR("org.mozilla.navigator"))) {
+            ICCF_PatchMethod("TermSubview", "ICeCoffEETerminal", "ICECoffEETermSubviewSuper", "_optionClickEvent:::");
+            ICapeprintf("ICeCoffEE APE: loaded in TermSubview for Terminal\n");
+        } else if (ICCF_CFBundleIDMatches(bundleID, CFSTR("org.mozilla.camino"))) {
             ICCF_PatchMethod("ChildView", "ICeCoffEEMenuOnly", "ICeCoffEEMenuSuper", "menuForEvent:");
             ICapeprintf("ICeCoffEE APE: loaded in ChildView for Camino\n");
@@ -147 +156 @@
     ICCF_PatchMethod("WebHTMLView", "ICeCoffEEWebKit", "ICeCoffEEWebKitSuper", "mouseUp:") &&
         ICCF_PatchMethod("WebHTMLView", "ICeCoffEEWebKit", "ICeCoffEEWebKitSuper", "mouseDown:") &&
-        ICCF_PatchMethod("WebHTMLView", "ICeCoffEEWebKit", "ICeCoffEEWebKitSuper", "menuForEvent:"),
+        ICCF_PatchMethod("WebHTMLView", "ICeCoffEEWebKit", "ICeCoffEEWebKitSuper", "menuForEvent:");
         ICapeprintf("ICeCoffEE APE: loaded in WebHTMLView for WebKit/Safari\n");
     
     if (shouldLoadInNSTextView) {
         ICCF_PatchMethod("NSTextView", "ICeCoffEE", "ICeCoffEESuper", "mouseDown:") &&
-        ICCF_PatchMethod("NSTextView", "ICeCoffEE", "ICeCoffEESuper", "menuForEvent:") ,
+        ICCF_PatchMethod("NSTextView", "ICeCoffEE", "ICeCoffEESuper", "menuForEvent:");
         ICapeprintf("ICeCoffEE APE: loaded generic NSTextView support\n");
     }

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEShared.h

@@ -19 +19 @@
 #define ICapeprintf apeprintf
 #else
-#define ICLog (void)
-#define ICapeprintf (void)
+#define ICLog(args...) ;
+#define ICapeprintf(args...) ;
 #endif
 

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETerminal.m

@@ -56 +56 @@
 // misc. other stuff
 - (void)_optionClickEvent:(NSEvent *)event:(unsigned int)row:(unsigned short)column {}
-- (void)setNeedsDisplay; {}
+- (void)setNeedsDisplay {}
+// NSView methods (needed to avoid crash in super invocation)
+- (void)mouseUp:(NSEvent *)e { [super mouseUp: e]; }
+- (void)mouseDown:(NSEvent *)e { [super mouseDown: e]; }
 @end
 

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m

@@ -13 +13 @@
 @interface WebCoreBridge : NSObject
 
-- (NSDictionary *)elementAtPoint:(NSPoint)point;
 - (NSString *)selectedString;
 - (NSRect)selectionRect;
@@ -28 +27 @@
 
 - (NSRange)selectedRange;
+
+- (NSDictionary *)elementAtPoint:(NSPoint)point;
 
 @end
@@ -69 +70 @@
 
         NS_DURING
+            NSPoint viewClickPt = [self convertPoint: downPt fromView: nil];
+            NSDictionary *elementDict = [(WebHTMLView *)self elementAtPoint: viewClickPt];
             WebCoreBridge *bridge = [(WebHTMLView *)self _bridge];
-            NSPoint viewClickPt = [self convertPoint: downPt fromView: nil];
-            NSDictionary *elementDict = [bridge elementAtPoint: viewClickPt];
             ICLog(@"elementDict: %@", elementDict);
             NSAssert([elementDict count] != 0, @"Internal error: Got empty element dictionary from WebHTMLView");

trunk/ICeCoffEE/ICeCoffEE/Info-APE Module.plist

@@ -19 +19 @@
         <string></string>
         <key>CFBundleIconFile</key>
-        <string></string>
+        <string>APE</string>
         <key>CFBundleIdentifier</key>
         <string>net.sabi.ICeCoffEE</string>
@@ -33 +33 @@
         <string>ICCF</string>
         <key>CFBundleVersion</key>
-        <string>1.4.2</string>
+        <string>1.4.3d1</string>
 </dict>
 </plist>

trunk/ICeCoffEE/ICeCoffEE/Info-APEManagerPrefPane.plist

@@ -24 +24 @@
         <string>????</string>
         <key>CFBundleVersion</key>
-        <string>1.4.2</string>
+        <string>1.4.3d1</string>
         <key>NSMainNibFile</key>
         <string>APE Manager plugin</string>

trunk/ICeCoffEE/ICeCoffEE/VERSION

@@ -1 @@
-1.4.2
+1.4.3d1