05/14/05 20:11:04 (16 years ago)
Nicholas Riley

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)

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.

1 edited


  • trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m

    r182 r183  
    4747    [downEvent release]; downEvent = nil;
    48     // don't want command-control-click, command-shift-click, etc. to trigger
    4948    if (ICCF_enabled && ICCF_prefs.commandClickEnabled && ICCF_EventIsCommandMouseDown(e)) {
    5049        WebCoreBridge *bridge = [(WebHTMLView *)self _bridge];
    6665        NSPoint downPt = [downEvent locationInWindow];
    6766        NSPoint upPt = [e locationInWindow];
    68                 [downEvent release]; downEvent = nil;
    6967        if (abs(downPt.x - upPt.x) > kICHysteresisPixels && abs(downPt.y - upPt.y) > kICHysteresisPixels)
    7068            return;
    8583            }
    8684            ICCF_StartIC();
    87             ICCF_LaunchURL(selectedString, ICCF_KeyboardAction());
    88             if (ICCF_prefs.textBlinkEnabled && [bridge respondsToSelector: @selector(selectNSRange:)]) {
     85            BOOL canSetSelection = [bridge respondsToSelector: @selector(selectNSRange:)];
     86            if (canSetSelection) {
     87                // may have become deselected in mouseDown
    8988                [bridge selectNSRange: selectedRange];
     89            }
     90            if (ICCF_LaunchURL(selectedString, ICCF_KeyboardAction(downEvent)) && ICCF_prefs.textBlinkEnabled && canSetSelection) {
    9091                int i;
    9192                NSRect selectionRect = [bridge selectionRect];
    106107        NS_ENDHANDLER
     109        [downEvent release]; downEvent = nil;
    108110        ICCF_StopIC();
    109111    }       
Note: See TracChangeset for help on using the changeset viewer.