Changeset 320 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m

Timestamp:

06/15/07 05:15:03 (17 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE.m: I was wrong in [319] about the selection extension stuff
being dumb; explain why in code, even though it's not fixed.
Implement some of the same parens support I did in Terminal. Update
for more robust service info dictionary format.

ICeCoffEEServicePrefController.m: Update for more robust service info
dictionary format.

ICeCoffEEServices.[hm]: Renamed from ICeCoffEESetServicesMenu.[hm],
since we do more now. Service info dictionary-creating code now makes
more sense and no longer has naming collision issues.

ICeCoffEEWebKit.m: Some preliminary Safari 3 compatibility stuff, not
quite working yet. An outstanding question - is it better to rely on
"public" WebCore API or private WebKit API? So far it seems the
latter is more stable.

English.lproj/APEInfo.rtfd: The Bored Zo has a name: use it. Remove
now-erroneous reference to SimpleText since TextEdit support is gone.

File:

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

trunk/ICeCoffEE/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
+
+// can only use setMarkedText:selectedRange: if WebHTMLView is editable
+// or, should we move to DOM-based accessors, i.e. "setMarkDOMRange"?
+- (void)selectNSRange:(NSRange)range;
+
+@end
+
+// from WebKit, private -- XXX maybe I'm better off going back the other way, relying on public methods in the bridge?
+@interface WebHTMLView : NSObject
 
 - (NSString *)selectedString;
 - (NSRect)selectionRect;
-
-- (void)selectNSRange:(NSRange)range;
+- (NSRect)_selectionRect; // Safari 2, supported in Safari 3 only for use with Mail
+- (NSRange)selectedRange; // XXX same as selectedNSRange in WebCoreFrameBridge.h?
 - (void)deselectAll;
 
-@end
-
-// from WebKit, private
-@interface WebHTMLView : NSObject
-
-- (WebCoreBridge *)_bridge;
-
-- (NSRange)selectedRange;
+- (WebCoreBridge *)_bridge; /* WebFrameBridge in Safari 3 (see above) */
 
 - (NSDictionary *)elementAtPoint:(NSPoint)point;
@@ -48 +51 @@
     [downEvent release]; downEvent = nil;
     if (ICCF_enabled && ICCF_prefs.commandClickEnabled && ICCF_EventIsCommandMouseDown(e)) {
-        WebCoreBridge *bridge = [(WebHTMLView *)self _bridge];
         if ([self respondsToSelector: @selector(selectedRange)]) {
             // save selection: it may be deselected on super mouseDown
@@ -54 +56 @@
         }
         [selectedString release]; selectedString = nil;
-        selectedString = [[bridge selectedString] retain];
+        selectedString = [[(WebHTMLView *)self selectedString] retain];
         downEvent = [e retain];
     }
@@ -77 +79 @@
             if ([elementDict objectForKey: @"WebElementLinkURL"] != nil) {
                 ICLog(@"got a link");
-                NS_VOIDRETURN; // donÕt activate on links
+                NS_VOIDRETURN; // don't activate on links
             }
             if (selectedString == nil || [selectedString length] == 0) {
@@ -91 +93 @@
             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
+                    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];