Changeset 320 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

Timestamp:

06/15/07 05:15:03 (17 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE.m: I was wrong in [319] about the selection extension stuff
being dumb; explain why in code, even though it's not fixed.
Implement some of the same parens support I did in Terminal. Update
for more robust service info dictionary format.

ICeCoffEEServicePrefController.m: Update for more robust service info
dictionary format.

ICeCoffEEServices.[hm]: Renamed from ICeCoffEESetServicesMenu.[hm],
since we do more now. Service info dictionary-creating code now makes
more sense and no longer has naming collision issues.

ICeCoffEEWebKit.m: Some preliminary Safari 3 compatibility stuff, not
quite working yet. An outstanding question - is it better to rely on
"public" WebCore API or private WebKit API? So far it seems the
latter is more stable.

English.lproj/APEInfo.rtfd: The Bored Zo has a name: use it. Remove
now-erroneous reference to SimpleText since TextEdit support is gone.

File:

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

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

@@ -12 +12 @@
 #include <unistd.h>
 #import "ICeCoffEESuper.h"
-#import "ICeCoffEESetServicesMenu.h"
+#import "ICeCoffEEServices.h"
 #import "ICeCoffEETrigger.h"
 
@@ -344 +344 @@
         ICCF_Delimiters(&urlLeftDelimiters, &urlRightDelimiters);
 
+expandFront:
         // XXX instead of 0, make this stop at the max URL length to prevent protracted searches
+            
+        // XXX here's how this is supposed to work:
+        // (http://web.sabi.net/) and <http://web.sabi.net/> should work if they are the entire document, even if clicking at the end/beginning of the document, not barfing with "no URL" (correct, as now) or selecting the final >, or ) (what would happen if we remove this "add 1" accommodation).  But how about "http://web.sabi.net/(foo)"?  That should work too, as long as it's not preceded by a (.
+        // Should probably backport to ICeCoffEETerminal, now I finally understand the method to this madness.
         // add 1 to range to trap delimiters that are on the edge of the selection (i.e., <...)
         delimiterRange = [s rangeOfCharacterFromSet: urlLeftDelimiters
@@ -357 +362 @@
             range.length += range.location - delimiterRange.location - 1;
             range.location = delimiterRange.location + 1;
-        }
-
+
+            // in url/(parens)stuff, handle clicking inside or after (parens).
+            if ([s characterAtIndex: delimiterRange.location] == '(' &&
+                range.location > 2 /* prevent wrapping, ordinarily not necessary */) {
+                if ([s rangeOfString: @")" options: NSLiteralSearch range: range].location != NSNotFound ||
+                    [s rangeOfCharacterFromSet: [NSCharacterSet characterSetWithCharactersInString: @"/."]
+                                       options: NSLiteralSearch range: range].location == NSNotFound) {
+                    range.location -= 2;
+                    range.length += 2;
+                    ICLog(@"expanding past (, now |%@|", [s substringWithRange: range]);
+                    goto expandFront;
+                }
+            }        
+        }
+        
         ICCF_CheckRange(range);
 
+expandBack:
         // XXX instead of length of string, make this stop at the max URL length to prevent protracted searches
         // add 1 to range to trap delimiters that are on the edge of the selection (i.e., ...>)
@@ -374 +393 @@
             NSCAssert(delimiterRange.length == 1, @"Internal error: delimiter matched range is not of length 1");
             range.length += delimiterRange.location - range.location - range.length;
+            
+            // grow URL past closing paren if we've seen an open paren
+            if ([s characterAtIndex: delimiterRange.location] == ')' &&
+                [s rangeOfString: @"(" options: NSLiteralSearch range: range].location != NSNotFound) {
+                range.length += 2;
+                ICLog(@"expanding past ), now |%@|", [s substringWithRange: range]);
+                goto expandBack;
+            }
         }
 
@@ -436 +463 @@
 
 // returns YES if menu contains useful items, NO otherwise
-BOOL ICCF_ConsolidateServicesMenu(NSMenu *menu, NSDictionary *serviceOptions, NSDictionary *serviceInfo) {
+static BOOL ICCF_ConsolidateServicesMenu(NSMenu *menu, NSDictionary *serviceOptions, NSDictionary *serviceInfo) {
     [menu update]; // doesn't propagate to submenus, so we need to do this first
     NSEnumerator *enumerator = [[menu itemArray] objectEnumerator];
@@ -453 +480 @@
         } else if ( (submenu = [menuItem submenu]) != nil) {
             // XXX don't rely on nil-sending working
-            shouldKeepItem = ICCF_ConsolidateServicesMenu(submenu, [itemOptions objectForKey: (NSString *)kICServiceSubmenu], itemInfo);
+            shouldKeepItem = ICCF_ConsolidateServicesMenu(submenu, [itemOptions objectForKey: (NSString *)kICServiceSubmenu], [itemInfo objectForKey: (NSString *)kICServiceSubmenu]);
             if (shouldKeepItem && [submenu numberOfItems] == 1) { // consolidate
                 NSMenuItem *serviceItem = [[submenu itemAtIndex: 0] retain];