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

Timestamp:

05/14/05 20:11:04 (19 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE 1.4.2b1

VERSION, ui.plist, Info*.plist, InfoPlist.strings: Updated for 1.4.2b1.

APEMain.m: Removed PBX support.

ICeCoffEE.[hm]: Don't ICCF_OSErr(C)Assert if we get userCanceledErr:
part of fixing extraneous exception when not selecting anything from
the helper app menu. ICCF_KeyboardAction() and
ICCF_LaunchURLFromTextView() now take an event parameter - since we
have stuff on a timer now, means we get the key modifier state at
mousedown time, rather than some arbitrary time later.
ICCF_LaunchURL() returns NO if the user cancelled, so we don't need to
throw an exception to stop the URL blinking. Moved sanitized mouse
down event generation to ICCF_MouseDownEventWithModifierFlags(). Only
update Services menu at app launch on Panther. Use a timer to delay
URL launching in NSTextView on Tiger, so we accommodate
command-multiple clicking for discontiguous selection. Remove that
ugly goto.

ICeCoffEEShared.h: Turn off debugging in preparation for (beta)
release.

ICeCoffEETerminal.m: Update for new ICCF_LaunchURL() return.

ICeCoffEETrigger.[hm]: Singleton timer wrapper for discontiguous
selection compatibility on Tiger. Singleton global is exported for
efficiency since we have to check it on every mouse down.

ICeCoffEEWebKit.m: Removed incorrect comment (what was I thinking?)
Update for new ICCF_LaunchURL() return. Properly highlight before
ICCF_LaunchURL(), especially noticable with menu.

APEInfo.rtfd: More fixes and updates, final for 1.4.2b1.

File:

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

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m

@@ -46 +46 @@
 {
     [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];
@@ -66 +65 @@
         NSPoint downPt = [downEvent locationInWindow];
         NSPoint upPt = [e locationInWindow];
-                [downEvent release]; downEvent = nil;
         if (abs(downPt.x - upPt.x) > kICHysteresisPixels && abs(downPt.y - upPt.y) > kICHysteresisPixels)
             return;
@@ -85 +83 @@
             }
             ICCF_StartIC();
-            ICCF_LaunchURL(selectedString, ICCF_KeyboardAction());
-            if (ICCF_prefs.textBlinkEnabled && [bridge respondsToSelector: @selector(selectNSRange:)]) {
+            BOOL canSetSelection = [bridge respondsToSelector: @selector(selectNSRange:)];
+            if (canSetSelection) {
+                // may have become deselected in mouseDown
                 [bridge selectNSRange: selectedRange];
+            }
+            if (ICCF_LaunchURL(selectedString, ICCF_KeyboardAction(downEvent)) && ICCF_prefs.textBlinkEnabled && canSetSelection) {
                 int i;
                 NSRect selectionRect = [bridge selectionRect];
@@ -106 +107 @@
         NS_ENDHANDLER
 
+        [downEvent release]; downEvent = nil;
         ICCF_StopIC();
     }