Changeset 388 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETrigger.m

Timestamp:

02/22/08 19:53:07 (16 years ago)

Author:

Nicholas Riley

Message:

APEMain.m: Note missing Xcode 3 support. Add Terminal 2.0 support.

English.lproj/APE Manager plugin.nib:

English.lproj/APEInfo.rtfd:

ICeCoffEE.[hm]: Bring triggering window and app to front if error
dialog displayed in ICCF_HandleException. Remove initial word
selection. Launch preexisting selection if present. Remove 10.3
support. Update for new ICeCoffEETrigger API. Rename downEvent
parameter for consistency.

ICeCoffEE.xcodeproj: Added files.

ICeCoffEEParser.m: Handle multiline URLs.

ICeCoffEETTView.[hm]: Terminal 2.0 support (thank you for having a
usable NSTextInput implementation!)

ICeCoffEETTViewTrigger.[hm]: ICeCoffEETrigger implementation for
TTView. Can't set range as we do for NSTextView because you can't
have an arbitrary empty selection range in Terminal, so we pass it
directly to ICCF_LaunchURLFromTTView.

ICeCoffEETerminal.[hm]: Fix capitalization on ICeCoffEETermSubviewSuper.
Pass downEvent to ICCF_HandleException so it can bring the triggering
window to the front.

ICeCoffEETextViewTrigger.[hm]: Moved from ICeCoffEETrigger.

ICeCoffEETrigger.[hm]: Now an abstract superclass. Replace direct
access to ICCF_sharedTrigger with +cancel. Create 0-character range
(if click outside selectedRange) or save selectedRange. Move
debugging logs here from ICeCoffEE.m. Add description method.

ICeCoffEEWebKit.m: Pass downEvent to ICCF_HandleException so it can
bring the triggering window to the front.

Installer components/ui/ui.plist: Updated for 1.5d3.

TestParser.m: Handle multiline URLs; newlines are printed as \ and
tabs as >. Implement ICCF_StringByRemovingCharactersInSet, which will
move elsewhere once Internet Config support is removed.

VERSION.xcconfig: Updated for 1.5d3.

urls.plist: Test for multiline URLs.

File:

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

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETrigger.m

@@ -8 +8 @@
 
 #import "ICeCoffEETrigger.h"
-#import "ICeCoffEE.h"
+#import "ICeCoffEEShared.h"
+#include <Carbon/Carbon.h>
 
-
-ICeCoffEETrigger *ICCF_sharedTrigger = nil;
+static ICeCoffEETrigger *ICCF_sharedTrigger = nil;
 
 @implementation ICeCoffEETrigger
 
-- (id)initForEvent:(NSEvent *)anEvent onTarget:(NSText<NSTextInput> *)aTarget;
+- (id)initForEvent:(NSEvent *)anEvent onTarget:(NSView<NSTextInput> *)aTarget;
 {
     if ( (self = [super init]) != nil) {
         target = [aTarget retain];
         event = [anEvent retain];
-        characterIndex = [aTarget characterIndexForPoint: [[aTarget window] convertBaseToScreen: [anEvent locationInWindow]]];
-        timer = [NSTimer scheduledTimerWithTimeInterval: TicksToEventTime(GetDblTime())
+        unsigned characterIndex = [aTarget characterIndexForPoint:
+                                   [[aTarget window] convertBaseToScreen: [anEvent locationInWindow]]];
+        range = [aTarget selectedRange];
+        ICLog(@"ICeCoffEETrigger characterIndex %u selectedRange %@", characterIndex, NSStringFromRange(range));
+        if (range.location == NSNotFound || range.length == 0 ||
+            !NSLocationInRange(characterIndex, range)) {
+            range.location = characterIndex;
+            range.length = 0;
+        }
+        // no typical definition of Command-Option-double-click, so we don't need to delay
+        NSTimeInterval interval = ([anEvent modifierFlags] & NSAlternateKeyMask) ? 0 :
+                                    TicksToEventTime(GetDblTime());
+        timer = [NSTimer scheduledTimerWithTimeInterval: interval
                                                  target: self
                                                selector: @selector(timerFired:)
@@ -30 +41 @@
 }
 
-+ (void)setTriggerForEvent:(NSEvent *)anEvent onTarget:(NSText<NSTextInput> *)aTarget;
++ (void)setTriggerForEvent:(NSEvent *)anEvent onTarget:(NSView<NSTextInput> *)aTarget;
 {
     ICCF_sharedTrigger = [[self alloc] initForEvent: anEvent onTarget: aTarget];
     [ICCF_sharedTrigger release];
+    ICLog(@"set %@", ICCF_sharedTrigger);
 }
 
 - (void)dealloc;
 {
+    ICLog(@"DEALLOC %@", self);
     timer = nil;
     [target release];
@@ -43 +56 @@
     [event release];
     event = nil;
-    ICLog(@"%@ dealloc", self);
     [super dealloc];
 }
 
-- (void)timerFired:(NSTimer *)timer;
+- (void)timerFired:(NSTimer *)aTimer;
 {
     ICCF_sharedTrigger = nil;
-    [target setSelectedRange: NSMakeRange(characterIndex, 0)];
-    ICCF_LaunchURLFromTextView(target, event);
 }
 
 - (void)cancel;
 {
+    ICLog(@"%@ cancelling", self);
     ICCF_sharedTrigger = nil;
     [timer invalidate]; // we get dealloced inside here, so don't do anything else
 }
 
++ (BOOL)cancel;
+{
+    if (ICCF_sharedTrigger == nil)
+        return NO;
+    
+    [ICCF_sharedTrigger cancel];
+    return YES;
+}
+
+- (NSString *)description;
+{
+    return [NSString stringWithFormat: @"<%@ on %@ for %@ %@>", [self className],
+            target, event, NSStringFromRange(range)];
+}
+
 @end