Ignore:
Timestamp:
01/30/03 05:31:29 (18 years ago)
Author:
Nicholas Riley
Message:

ICeCoffEE 1.3b2 plus some changes for 1.3

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m

    r66 r74  
    7979{
    8080    // don't want command-option-click, command-shift-click, etc. to trigger
    81     if (ICCF_enabled && ICCF_EventIsCommandMouseDown(e)) {
     81    if (ICCF_enabled && ICCF_prefs.commandClickEnabled && ICCF_EventIsCommandMouseDown(e)) {
    8282        // save selection: it will be deselected on super mouseDown
    8383        WebCoreBridge *bridge = [(WebHTMLView *)self _bridge];
     
    100100        NSPoint upPt = [e locationInWindow];
    101101        downEvent = nil;
    102         // XXX make hysterisis a constant
    103         if (abs(downPt.x - upPt.x) > 4 && abs(downPt.y - upPt.y) > 4)
     102        if (abs(downPt.x - upPt.x) > kICHysteresisPixels && abs(downPt.y - upPt.y) > kICHysteresisPixels)
    104103            return;
    105104
     
    114113                NS_VOIDRETURN; // donÕt activate on links
    115114            }
    116             // XXX works, but doesn't update
    117115            if (selectedString == nil || [selectedString length] == 0)
    118116                NS_VOIDRETURN;
    119             int i;
    120             for (i = 0 ; i < 3 ; i++) {
    121                 [bridge deselectAll];
    122                 [self display];
    123                 usleep(60000);
    124                 ICCF_SetWebCoreBridgeSelection(bridge, &selection);
    125                 [self display];
    126                 usleep(60000);
     117            // XXX works, but doesn't update
     118            ICCF_StartIC();
     119            ICCF_LaunchURL(selectedString, ICCF_OptionKeyIsDown());
     120            ICCF_SetWebCoreBridgeSelection(bridge, &selection);
     121            if (ICCF_prefs.textBlinkEnabled) {
     122                int i;
     123                for (i = 0 ; i < ICCF_prefs.textBlinkCount ; i++) {
     124                    [bridge deselectAll];
     125                    usleep(kICBlinkDelayUsecs);
     126                    ICCF_SetWebCoreBridgeSelection(bridge, &selection);
     127                    usleep(kICBlinkDelayUsecs);
     128                }
    127129            }
    128             ICCF_SetWebCoreBridgeSelection(bridge, &selection);
    129             [self display];
    130             ICCF_StartIC();
    131             ICCF_LaunchURL(selectedString);
    132130        NS_HANDLER
    133131            ICCF_HandleException(localException);
Note: See TracChangeset for help on using the changeset viewer.