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

Timestamp:

01/30/03 05:31:29 (21 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE 1.3b2 plus some changes for 1.3

File:

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

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m

@@ -79 +79 @@
 {
     // don't want command-option-click, command-shift-click, etc. to trigger
-    if (ICCF_enabled && ICCF_EventIsCommandMouseDown(e)) {
+    if (ICCF_enabled && ICCF_prefs.commandClickEnabled && ICCF_EventIsCommandMouseDown(e)) {
         // save selection: it will be deselected on super mouseDown
         WebCoreBridge *bridge = [(WebHTMLView *)self _bridge];
@@ -100 +100 @@
         NSPoint upPt = [e locationInWindow];
         downEvent = nil;
-        // XXX make hysterisis a constant
-        if (abs(downPt.x - upPt.x) > 4 && abs(downPt.y - upPt.y) > 4)
+        if (abs(downPt.x - upPt.x) > kICHysteresisPixels && abs(downPt.y - upPt.y) > kICHysteresisPixels)
             return;
 
@@ -114 +113 @@
                 NS_VOIDRETURN; // donÕt activate on links
             }
-            // XXX works, but doesn't update
             if (selectedString == nil || [selectedString length] == 0)
                 NS_VOIDRETURN;
-            int i;
-            for (i = 0 ; i < 3 ; i++) {
-                [bridge deselectAll];
-                [self display];
-                usleep(60000);
-                ICCF_SetWebCoreBridgeSelection(bridge, &selection);
-                [self display];
-                usleep(60000);
+            // XXX works, but doesn't update
+            ICCF_StartIC();
+            ICCF_LaunchURL(selectedString, ICCF_OptionKeyIsDown());
+            ICCF_SetWebCoreBridgeSelection(bridge, &selection);
+            if (ICCF_prefs.textBlinkEnabled) {
+                int i;
+                for (i = 0 ; i < ICCF_prefs.textBlinkCount ; i++) {
+                    [bridge deselectAll];
+                    usleep(kICBlinkDelayUsecs);
+                    ICCF_SetWebCoreBridgeSelection(bridge, &selection);
+                    usleep(kICBlinkDelayUsecs);
+                }
             }
-            ICCF_SetWebCoreBridgeSelection(bridge, &selection);
-            [self display];
-            ICCF_StartIC();
-            ICCF_LaunchURL(selectedString);
         NS_HANDLER
             ICCF_HandleException(localException);