Changeset 336 for releases/ICeCoffEE/1.4.4b1/ICeCoffEE/ICeCoffEEWebKit.m

Timestamp:

08/13/07 01:08:40 (17 years ago)

Author:

Nicholas Riley

Message:

VERSION: Starting with 1.4.4b1, should be close to final.

ICeCoffEEServicePrefController.m: Display correct key equivalents, backported from [319].

ICeCoffEEWebKit.m: Fix Safari 3 beta compatibility; better comment WebKit interfaces.

Info-APE Module.plist: Update version to 1.4.4b1.

ICeCoffEE.xcodeproj: Remove obsolete WebKit header.

English.lproj/APEInfo.rtfd: Backported updates from [320]; release notes.

English.lproj/InfoPlist.strings: Update version to 1.4.4b1.

English.lproj/Localizable.strings: Fix an "APE Manager" reference I didn't catch before.

ape_install: Updated to APE 2.0.3.

ui.plist: Update version to 1.4.4b1.

Info-APEManagerPrefPane.plist: Update version to 1.4.4b1.

File:

• releases/ICeCoffEE/1.4.4b1/ICeCoffEE/ICeCoffEEWebKit.m (modified) (3 diffs)

releases/ICeCoffEE/1.4.4b1/ICeCoffEE/ICeCoffEEWebKit.m

@@ -10 +10 @@
 #import <unistd.h>
 
-// from WebCoreBridge.h
+// WebCoreBridge, from WebCoreBridge.h (Safari 2)
+// Web(Core)FrameBridge, from WebCoreFrameBridge.h (Safari 3)
 @interface WebCoreBridge : NSObject
 
-- (NSString *)selectedString;
-- (NSRect)selectionRect;
+- (NSString *)selectedString; // public
 
-- (void)selectNSRange:(NSRange)range;
-- (void)deselectAll;
+- (void)selectNSRange:(NSRange)range; // private, Safari 2 & 3
 
 @end
@@ -24 +23 @@
 @interface WebHTMLView : NSObject
 
-- (WebCoreBridge *)_bridge;
+- (WebCoreBridge *)_bridge; // private, in Safari 2 & 3; WebFrameBridge in Safari 3 (see above)
 
-- (NSRange)selectedRange;
+- (NSRange)selectedRange; // WebNSTextInputSupport, Safari 2 & 3
 
-- (NSDictionary *)elementAtPoint:(NSPoint)point;
+- (NSRect)selectionRect; // Safari 3 only
+- (NSRect)_selectionRect; // Safari 2, supported in Safari 3 only for use with Mail
+// (see <http://trac.webkit.org/projects/webkit/browser/trunk/WebKit/WebView/WebHTMLView.mm?rev=25024#L1430>)
+
+- (void)drawSingleRect:(NSRect)rect;
+
+- (void)deselectAll; // Safari 2 & 3
+
+- (NSDictionary *)elementAtPoint:(NSPoint)point; // private, Safari 2 & 3
 
 @end
@@ -91 +98 @@
             if (ICCF_LaunchURL(selectedString, ICCF_KeyboardAction(downEvent)) && ICCF_prefs.textBlinkEnabled && canSetSelection) {
                 int i;
-                NSRect selectionRect = [bridge selectionRect];
+                NSRect selectionRect;
+                if ([self respondsToSelector: @selector(selectionRect)])
+                    selectionRect = [(WebHTMLView *)self selectionRect];
+                else if ([self respondsToSelector: @selector(_selectionRect)])
+                    selectionRect = [(WebHTMLView *)self _selectionRect];
                 ICLog(@"selectedRange %@ selectionRect %@ textBlinkCount %d", NSStringFromRange(selectedRange), NSStringFromRect(selectionRect), ICCF_prefs.textBlinkCount);
                 for (i = 0 ; i < ICCF_prefs.textBlinkCount ; i++) {
-                    [bridge deselectAll];
+                    [(WebHTMLView *)self deselectAll];
                     [self setNeedsDisplayInRect: selectionRect];
                     [self display];