Changeset 106 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

Timestamp:

03/08/03 03:15:01 (21 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE 1.3.2b1

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m (modified) (8 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

@@ -22 +22 @@
 #include <unistd.h>
 #import "ICeCoffEESuper.h"
-#import "ICeCoffEEActionMenu.h"
 
 iccfPrefRec ICCF_prefs;
@@ -58 +57 @@
 
 BOOL ICCF_EventIsCommandMouseDown(NSEvent *e) {
-    unsigned int modifierFlags = [e modifierFlags];
-    return ([e type] == NSLeftMouseDown &&
-            (modifierFlags == NSCommandKeyMask || modifierFlags == (NSCommandKeyMask | NSAlternateKeyMask))
-            && [e clickCount] == 1);
-}
-
-BOOL ICCF_OptionKeyIsDown() {
+    return ([e type] == NSLeftMouseDown && ([e modifierFlags] & NSCommandKeyMask) != 0 && [e clickCount] == 1);
+}
+
+iccfURLAction ICCF_KeyboardAction() {
     unsigned int modifierFlags = [[NSApp currentEvent] modifierFlags];
-    return (modifierFlags & NSAlternateKeyMask) != 0;
+    iccfURLAction action;
+    action.presentMenu = (modifierFlags & NSAlternateKeyMask) != 0;
+    action.launchInBackground = (modifierFlags & NSShiftKeyMask) != 0;
+    return action;
 }
 
@@ -233 +232 @@
 }
 
-void ICCF_LaunchURL(NSString *string, BOOL chooseApp) {
+void ICCF_LaunchURL(NSString *string, iccfURLAction action) {
     OSStatus err;
     long selStart, selEnd;
@@ -259 +258 @@
         }
 
-        if (chooseApp) {
-            err = ICCF_DoURLActionMenu(ICCF_GetInst(), hint, *h, selStart, selEnd);
-            ICCF_OSErrCAssert(err, @"ICCF_DoURLActionMenu");
-        } else {
-            err = ICLaunchURL(ICCF_GetInst(), hint, *h, len, &selStart, &selEnd);
-            ICCF_OSErrCAssert(err, @"ICLaunchURL");
-        }
+        err = ICCF_DoURLAction(ICCF_GetInst(), hint, *h, selStart, selEnd, action);
+        ICCF_OSErrCAssert(err, @"ICCF_DoURLAction");
         
     NS_HANDLER
@@ -276 +270 @@
 
 // XXX not sure what to do if there's already a selection; BBEdit and MLTE extend it, Tex-Edit Plus doesn't.
-// RFC-ordained max URL length, just to avoid passing IC multi-megabyte documents
+// RFC-ordained max URL length, just to avoid passing IC/LS multi-megabyte documents
 #if ICCF_DEBUG
-const long ICCF_MAX_URL_LEN = 1024; // XXX change later
+const long ICCF_MAX_URL_LEN = 60; // XXX change later
 #else
 const long ICCF_MAX_URL_LEN = 1024;
@@ -369 +363 @@
         [self display];
 
-        ICCF_LaunchURL([s substringWithRange: range], ICCF_OptionKeyIsDown());
+        ICCF_LaunchURL([s substringWithRange: range], ICCF_KeyboardAction());
 
         if (ICCF_prefs.textBlinkEnabled) {
@@ -473 +467 @@
     ICLog(@"ICeCoffEE down: %@", e);
 #endif
-    // we don't actually get a mouseUp event, just wait for mouseDown to return
-    [super mouseDown: e];
-    if (!ICCF_enabled || !ICCF_prefs.commandClickEnabled) {
-#if ICCF_DEBUG
-        down = NO;
-#endif
-        return;
-    }
-    // don't want command-shift-click, etc. to trigger
-    if (ICCF_EventIsCommandMouseDown(e)) {
+    if (ICCF_enabled && ICCF_prefs.commandClickEnabled && ICCF_EventIsCommandMouseDown(e)) {
+        // don't want to trigger selection extension or anything else; pass through as a plain click
+        [super mouseDown: [NSEvent mouseEventWithType: NSLeftMouseDown location: [e locationInWindow] modifierFlags: 0 timestamp: [e timestamp] windowNumber: [e windowNumber] context: [e context] eventNumber: [e eventNumber] clickCount: 1 pressure: 0]];
+        // we don't actually get a mouseUp event, just wait for mouseDown to return
         NSEvent *upEvent = [[self window] currentEvent];
         NSPoint downPt = [e locationInWindow];
@@ -491 +479 @@
             ICCF_LaunchURLFromTextView(self);
         }
+    } else {
+        [super mouseDown: e];
     }
 #if ICCF_DEBUG