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

Timestamp:

05/14/05 02:47:12 (19 years ago)

Author:

Nicholas Riley

Message:

English.lproj/APEInfo.rtfd: Partial documentation update for 1.4.2;
fixed many instances of outdated and incorrect information.

ICeCoffEE.m: Removed completed "to do" comments - that's what
OmniOutliner and Trac are for. Fixed delimiters to make more sense.
Redid ICCF_ParseURL() to make more sense and strip invalid characters
from beginning of URL. Added note about deprecated getCString:.
Fixed ICCF_ServicesMenuItem() to work on Tiger; moved menu population
logic (where services menu delegate used) to new
ICCF_SetServicesMenu() in ICeCoffEESetServicesMenu.[hm]. Remove key
equivalents from services in ICCF_ConsolidateServicesMenu(). First
pass at a workaround for discontiguous selection: only trigger if
there is no selection. This will be fixed to use a timer.

ICeCoffEEServicePrefController: Fixed service population to work on
Tiger, though keyboard equivalents are not provided; will need to
switch to parsing output of CFServiceControllerCopyServicesEntries()
for that one.

ICeCoffEEWebKit.m: Removed Safari 1.0-1.2 support. Fixed incorrect
comment about -selectionRect only being in Safari
1.1-1.2.

ICeCoffEESetServicesMenu.[hm]: Handle getting a usable services menu
for Panther and Tiger.

File:

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

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m

@@ -15 +15 @@
 - (NSDictionary *)elementAtPoint:(NSPoint)point;
 - (NSString *)selectedString;
-- (void)deselectAll;
-
-// only in Safari 1.0-1.2
-- (void)setSelectionFrom:(id /* WebDOMNode */)start startOffset:(int)startOffset to:(id /* WebDOMNode */)end endOffset:(int) endOffset;
-
-- (id /* WebDOMNode */)selectionStart;
-- (int)selectionStartOffset;
-- (id /* WebDOMNode */)selectionEnd;
-- (int)selectionEndOffset;
-
-// only in Safari 1.1-1.2
 - (NSRect)selectionRect;
 
-// only in Safari 1.3
 - (void)selectNSRange:(NSRange)range;
+- (void)deselectAll;
 
 @end
@@ -38 +27 @@
 - (WebCoreBridge *)_bridge;
 
-// only in Safari 1.3
 - (NSRange)selectedRange;
 
@@ -52 +40 @@
 
 static NSEvent *downEvent = nil;
-
-// used in Safari < 1.3 because there's no sane way to set the selection
-typedef struct {
-    int startOffset;
-    int endOffset;
-    id fromNode;
-    id toNode;
-} ICCF_WebCoreSelection;
-
-static ICCF_WebCoreSelection selection = {nil, nil, 0, 0};
-
-void ICCF_GetWebCoreBridgeSelection(WebCoreBridge *bridge, ICCF_WebCoreSelection *ioSel) {
-    [ioSel->fromNode release]; ioSel->fromNode = nil;
-    [ioSel->toNode release]; ioSel->toNode = nil;
-    ioSel->startOffset = [bridge selectionStartOffset];
-    ioSel->endOffset = [bridge selectionEndOffset];
-    ioSel->fromNode = [[bridge selectionStart] retain];
-    ioSel->toNode = [[bridge selectionEnd] retain];
-}
-
-void ICCF_SetWebCoreBridgeSelection(WebCoreBridge *bridge, ICCF_WebCoreSelection *inSel) {
-    if (inSel->fromNode == nil || inSel->toNode == nil)
-        [bridge deselectAll];
-    [bridge setSelectionFrom: inSel->fromNode
-                 startOffset: inSel->startOffset
-                          to: inSel->toNode
-                   endOffset: inSel->endOffset];
-}
-// end Safari < 1.3 section
-
 static NSString *selectedString = nil;
 static NSRange selectedRange;
@@ -87 +45 @@
 - (void)mouseDown:(NSEvent *)e;
 {
-        [downEvent release]; downEvent = nil;
-    // don't want command-option-click, command-shift-click, etc. to trigger
+    [downEvent release]; downEvent = nil;
+    // don't want command-control-click, command-shift-click, etc. to trigger
     if (ICCF_enabled && ICCF_prefs.commandClickEnabled && ICCF_EventIsCommandMouseDown(e)) {
         WebCoreBridge *bridge = [(WebHTMLView *)self _bridge];
-                if ([self respondsToSelector: @selector(selectedRange)]) {
-                        // Safari 1.3 save selection: it may be deselected on super mouseDown
-                        selectedRange = [(WebHTMLView *)self selectedRange];
-                } else if ([bridge respondsToSelector: @selector(selectionStartOffset)]) {
-                        // Safari < 1.3 save selection: it will be deselected on super mouseDown
-                        ICCF_GetWebCoreBridgeSelection(bridge, &selection);
-                        ICLog(@"selection start %d@%@ end %d@%@ string %@", [bridge selectionStartOffset], [bridge selectionStart], [bridge selectionEndOffset], [bridge selectionEnd], [bridge selectedString]);
-                }
-                [selectedString release]; selectedString = nil;
-                selectedString = [[bridge selectedString] retain];
+        if ([self respondsToSelector: @selector(selectedRange)]) {
+            // save selection: it may be deselected on super mouseDown
+            selectedRange = [(WebHTMLView *)self selectedRange];
+        }
+        [selectedString release]; selectedString = nil;
+        selectedString = [[bridge selectedString] retain];
         downEvent = [e retain];
     }
@@ -126 +80 @@
                 NS_VOIDRETURN; // donÕt activate on links
             }
-                        if (selectedString == nil || [selectedString length] == 0) {
-                                ICLog(@"no selected string");
-                                NS_VOIDRETURN;
-                        }
-                        ICCF_StartIC();
-                        ICCF_LaunchURL(selectedString, ICCF_KeyboardAction());
-                        if (ICCF_prefs.textBlinkEnabled &&
-                                [bridge respondsToSelector: @selector(selectNSRange:)]) {
-                                // blink text in Safari 1.3
-                                [bridge selectNSRange: selectedRange];
-                                int i;
-                                NSRect selectionRect = [bridge selectionRect];
-                                ICLog(@"selectedRange %@ selectionRect %@ textBlinkCount %d", NSStringFromRange(selectedRange), NSStringFromRect(selectionRect), ICCF_prefs.textBlinkCount);
-                                for (i = 0 ; i < ICCF_prefs.textBlinkCount ; i++) {
-                                        [bridge deselectAll];
-                                        [self setNeedsDisplayInRect: selectionRect];
-                                        [self display];
-                                        usleep(kICBlinkDelayUsecs);
-                                        [bridge selectNSRange: selectedRange];
-                                        [self setNeedsDisplayInRect: selectionRect];
-                                        [self display];
-                                        usleep(kICBlinkDelayUsecs);
-                                }
-                        } else {
-                                // select text in Safari 1.0-1.2
-                                ICCF_SetWebCoreBridgeSelection(bridge, &selection);
-                                if (ICCF_prefs.textBlinkEnabled &&
-                                        [bridge respondsToSelector: @selector(selectionRect)]) {
-                                        // blink text in Safari 1.1/1.2
-                                        int i;
-                                        NSRect selectionRect = [bridge selectionRect];
-                                        for (i = 0 ; i < ICCF_prefs.textBlinkCount ; i++) {
-                                                [bridge deselectAll];
-                                                [self setNeedsDisplayInRect: selectionRect];
-                                                [self display];
-                                                usleep(kICBlinkDelayUsecs);
-                                                ICCF_SetWebCoreBridgeSelection(bridge, &selection);
-                                                [self setNeedsDisplayInRect: selectionRect];
-                                                [self display];
-                                                usleep(kICBlinkDelayUsecs);
-                                        }
-                                }
-                        }
+            if (selectedString == nil || [selectedString length] == 0) {
+                ICLog(@"no selected string");
+                NS_VOIDRETURN;
+            }
+            ICCF_StartIC();
+            ICCF_LaunchURL(selectedString, ICCF_KeyboardAction());
+            if (ICCF_prefs.textBlinkEnabled && [bridge respondsToSelector: @selector(selectNSRange:)]) {
+                [bridge selectNSRange: selectedRange];
+                int i;
+                NSRect selectionRect = [bridge selectionRect];
+                ICLog(@"selectedRange %@ selectionRect %@ textBlinkCount %d", NSStringFromRange(selectedRange), NSStringFromRect(selectionRect), ICCF_prefs.textBlinkCount);
+                for (i = 0 ; i < ICCF_prefs.textBlinkCount ; i++) {
+                    [bridge deselectAll];
+                    [self setNeedsDisplayInRect: selectionRect];
+                    [self display];
+                    usleep(kICBlinkDelayUsecs);
+                    [bridge selectNSRange: selectedRange];
+                    [self setNeedsDisplayInRect: selectionRect];
+                    [self display];
+                    usleep(kICBlinkDelayUsecs);
+                }
+            }
         NS_HANDLER
             ICCF_HandleException(localException);