Changeset 79 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

Timestamp:

02/02/03 14:06:10 (21 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE 1.3b3

File:

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

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

@@ -7 +7 @@
   for both files and text
 - if it's not a URL, try using TextExtras' open list
-- John Hayes' suggestions
-- Menu on command-option-click: add bookmark, open with other helper, pass to configurable service, ...?
 - TXNClick - MLTE has its own support in Jaguar and later, but it's lousy
 
@@ -19 +17 @@
 - app exclusion list - make a pref pane (see AquaShade config)
 - _LSCopyApplicationURLsForItemURL - list apps
+- Menu on command-option-click: add bookmark, open with other helper, pass to configurable service, ...?
 
 */
@@ -130 +129 @@
 }
 
-ConstStringPtr ICCF_GetHint(ICInstance inst, const char *urlData, long startIndex, long endIndex) {
+ConstStringPtr ICCF_GetHint(ICInstance inst, const char *urlData, Size length, long *selStart, long *selEnd, Boolean *needsSlashes) {
     Handle h = NewHandle(0);
     OSStatus err;
-    long tmpStartIndex = startIndex, tmpEndIndex = endIndex;
-    
+
     if (h == NULL) return NULL;
 
     // parse the URL providing a bogus protocol, to get rid of escaped forms
-    err = ICParseURL(inst, "\p*", urlData + startIndex, endIndex - startIndex + 1,
-                     &tmpStartIndex, &tmpEndIndex, h);
+    err = ICParseURL(inst, "\p*", urlData, length, selStart, selEnd, h);
     if (err != noErr) return NULL;
 
@@ -149 +146 @@
     long i = 0;
     Boolean sawAt = false;
-    if (urlParsed[0] == '*' && urlParsed[1] == ':') {
+    if (hSize >= 2 && urlParsed[0] == '*' && urlParsed[1] == ':') {
         // this is an IC-inserted protocol; skip over it
         i = 2;
-    }
+        *needsSlashes = (hSize < i + 2 || urlParsed[i] != '/' || urlParsed[i + 1] != '/');
+    } else *needsSlashes = false;
     for ( ; i < hSize ; i++) {
         char c = urlParsed[i];
@@ -164 +162 @@
     }
     DisposeHandle(h);
-    return (sawAt ? "\pmailto" : "\phttp");
+    if (sawAt) {
+        *needsSlashes = false;
+        return "\pmailto";
+    }
+    return "\phttp";
+}
+
+static const char *kICSlashes = "//";
+
+void ICCF_AddSlashes(Handle h, ConstStringPtr hint) {
+    Size sizeBefore = GetHandleSize(h);
+    unsigned char hintLength = StrLength(hint);
+    char *copy = (char *)malloc(sizeBefore);
+    memcpy(copy, *h, sizeBefore);
+    ICLog(@"ICCF_AddSlashes before: |%s|\n", *h);
+    ReallocateHandle(h, sizeBefore + 2);
+
+    // if *h begins with '<hint>:', then copy the slashes after it
+    if (sizeBefore > hintLength + 1 && strncmp(&hint[1], copy, hintLength) == 0 && copy[hintLength] == ':') {
+        memcpy(*h, copy, hintLength + 1);
+        memcpy(*h + hintLength + 1, kICSlashes, 2);
+        memcpy(*h + hintLength + 3, &copy[hintLength + 1], sizeBefore - hintLength - 1);
+    } else {
+        memcpy(*h, kICSlashes, 2);
+        memcpy(*h + 2, copy, sizeBefore);
+    }
+        
+    free(copy);
+    ICLog(@"ICCF_AddSlashes after: |%s|\n", *h);
 }
 
@@ -215 +241 @@
     unsigned len = [string length];
 
-    char *urlData = NULL;
+    Handle h = NULL;
     
     NS_DURING
-        urlData = (char *)malloc( (len + 1) * sizeof(char));
-        NSCAssert(urlData != NULL, @"Internal error: canÕt allocate memory for URL string");
-
-        [string getCString: urlData];
+        h = NewHandle(len);
+        if (h == NULL)
+            ICCF_OSErrCAssert(MemError(), @"NewHandle");
+
+        if (CFStringGetBytes((CFStringRef)string, CFRangeMake(0, len), kCFStringEncodingASCII, '\0', false, *h, len, NULL) != len)
+            ICCF_OSErrCAssert(kTECNoConversionPathErr, @"CFStringGetBytes");
 
         selStart = 0; selEnd = len;
 
-        ConstStringPtr hint = ICCF_GetHint(ICCF_GetInst(), urlData, selStart, selEnd);
+        Boolean needsSlashes;
+        ConstStringPtr hint = ICCF_GetHint(ICCF_GetInst(), *h, len, &selStart, &selEnd, &needsSlashes);
         NSCAssert(hint != NULL, @"Internal error: canÕt get protocol hint for URL");
 
+        if (needsSlashes) {
+            ICCF_AddSlashes(h, hint);
+            len = selEnd = GetHandleSize(h);
+        }
+
         if (chooseApp) {
-            err = ICCF_DoURLActionMenu(ICCF_GetInst(), hint, urlData, selStart, selEnd);
+            err = ICCF_DoURLActionMenu(ICCF_GetInst(), hint, *h, selStart, selEnd);
             ICCF_OSErrCAssert(err, @"ICCF_DoURLActionMenu");
         } else {
-            err = ICLaunchURL(ICCF_GetInst(), hint, urlData, len, &selStart, &selEnd);
+            err = ICLaunchURL(ICCF_GetInst(), hint, *h, len, &selStart, &selEnd);
             ICCF_OSErrCAssert(err, @"ICLaunchURL");
         }
         
     NS_HANDLER
-        free(urlData);
+        DisposeHandle(h);
         [localException raise];
     NS_ENDHANDLER
 
-    free(urlData);    
+    DisposeHandle(h);    
 }
 
@@ -404 +438 @@
 @implementation ICeCoffEE
 
-+ (NSString *)IC_version;
-{
-    // XXX get from bundle if possible: centralize
-    return [NSString stringWithCString: ICCF_VERSION];
-}
-
 + (void)IC_addRemoveServicesMenu;
 {