Changeset 139 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

Timestamp:

05/31/03 05:04:00 (21 years ago)

Author:

Nicholas Riley

Message:

 

File:

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

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

@@ -56 +56 @@
 }
 
+CFStringRef ICCF_CopyAppName() {
+    ProcessSerialNumber psn = {0, kCurrentProcess};
+    CFStringRef appName = NULL;
+    CopyProcessName(&psn, &appName);
+    if (appName == NULL) return CFSTR("(unknown)");
+    return appName;
+}
+
 BOOL ICCF_EventIsCommandMouseDown(NSEvent *e) {
     return ([e type] == NSLeftMouseDown && ([e modifierFlags] & NSCommandKeyMask) != 0 && [e clickCount] == 1);
@@ -83 +91 @@
 
         [set autorelease];
+        [set formUnionWithCharacterSet: [[NSCharacterSet characterSetWithRange: NSMakeRange(0, 128)] invertedSet]]; // remove non-ASCII characters
         [set formUnionWithCharacterSet: [NSCharacterSet punctuationCharacterSet]];
         [set removeCharactersInString: @";/?:@&=+$,-_.!~*'()%#"]; // RFC 2396 ¤2.2, 2.3, 2.4, plus #
@@ -207 +216 @@
         ICLog(@"Parsing URL |%@|", string);
 
+        NSCAssert([string canBeConvertedToEncoding: NSASCIIStringEncoding], @"No URL is selected");
+
         urlData = (char *)malloc( (range->length + 1) * sizeof(char));
         NSCAssert(urlData != NULL, @"Internal error: canÕt allocate memory for URL string");
@@ -288 +299 @@
     int result = NSRunAlertPanel(ICCF_LocalizedString(@"AlertTitle"), ICCF_LocalizedString(@"AlertMessage%@"), nil, nil, ICCF_LocalizedString(@"AlertDisableButton"), e);
     if (result != NSAlertDefaultReturn) {
-        result = NSRunAlertPanel(ICCF_LocalizedString(@"DisableAlertTitle"), ICCF_LocalizedString(@"DisableAlertMessage"), ICCF_LocalizedString(@"DisableAlertDisableButton"), ICCF_LocalizedString(@"DisableAlertDontDisableButton"), nil);
+        result = NSRunAlertPanel(ICCF_LocalizedString(@"DisableAlertTitle"), ICCF_LocalizedString(@"DisableAlertMessage%@"), ICCF_LocalizedString(@"DisableAlertDisableButton"), ICCF_LocalizedString(@"DisableAlertDontDisableButton"), nil,
+           [(NSString *)ICCF_CopyAppName() autorelease]);
         if (result == NSAlertDefaultReturn)
             ICCF_enabled = NO;
@@ -391 +403 @@
     NSMenuItem *servicesItem;
     NSMenu *servicesMenu;
-    // XXX better to just use [[NSApp servicesMenu] title]?  That grabs the title from the existing Services submenu.
+    // don't want to use [[NSApp servicesMenu] title] because the Services menu may not have been created yet
     NSString *servicesTitle = [[NSBundle bundleWithIdentifier: @"com.apple.AppKit"] localizedStringForKey: @"Services" value: nil table: @"ServicesMenu"];
     if (servicesTitle == nil) {
-        ICLog(@"CanÕt get localized text for ÒServicesÓ in AppKit.framework");
+        ICLog(@"CanÕt get localized text for 'Services' in AppKit.framework");
         servicesTitle = @"Services";
     }
@@ -403 +415 @@
     [servicesItem setRepresentedObject: ICCF_SERVICES_ITEM];
     [servicesMenu release];
-    return servicesItem;
+    return [servicesItem autorelease];
+}
+
+static const unichar UNICHAR_BLACK_RIGHT_POINTING_SMALL_TRIANGLE = 0x25b8;
+
+// returns YES if menu contains useful items, NO otherwise
+BOOL ICCF_ConsolidateServicesMenu(NSMenu *menu) {
+    [menu update]; // doesn't propagate to submenus, so we need to do this first
+    NSEnumerator *enumerator = [[menu itemArray] objectEnumerator];
+    NSMenuItem *menuItem;
+    NSMenu *submenu;
+    BOOL shouldKeepItem = NO, shouldKeepMenu = NO;
+
+    while ( (menuItem = [enumerator nextObject]) != nil) {
+        if ( (submenu = [menuItem submenu]) != nil) {
+            shouldKeepItem = ICCF_ConsolidateServicesMenu(submenu);
+            if (shouldKeepItem && [submenu numberOfItems] == 1) { // consolidate
+                NSMenuItem *serviceItem = [[submenu itemAtIndex: 0] retain];
+                [serviceItem setTitle:
+                    [NSString stringWithFormat: @"%@ %@ %@", [menuItem title], [NSString stringWithCharacters: &UNICHAR_BLACK_RIGHT_POINTING_SMALL_TRIANGLE length: 1], [serviceItem title]]];
+
+                int serviceIndex = [menu indexOfItem: menuItem];
+                [submenu removeItemAtIndex: 0]; // can't have item in two menus
+                [menu removeItemAtIndex: serviceIndex];
+                [menu insertItem: serviceItem atIndex: serviceIndex];
+                [serviceItem release];
+            }
+        } else {
+            shouldKeepItem = [menuItem isEnabled];
+        }
+        if (shouldKeepItem) {
+            shouldKeepMenu = YES;
+        } else {
+            [menu removeItem: menuItem];
+        }
+    }
+
+    return shouldKeepMenu;
+}
+
+NSMenuItem *ICCF_ContextualServicesMenuItem() {
+    NSMenuItem *servicesItem = ICCF_ServicesMenuItem();
+    if (ICCF_ConsolidateServicesMenu([servicesItem submenu]))
+        return servicesItem;
+    else
+        return nil;
 }
 
@@ -413 +470 @@
 }
 
-NSMenu *ICCF_MenuForEvent(NSTextView *self, NSMenu *contextMenu, NSEvent *e) {    
+NSMenu *ICCF_MenuForEvent(NSTextView *self, NSMenu *contextMenu, NSEvent *e) {
     if (contextMenu != nil && [e type] == NSRightMouseDown || ([e type] == NSLeftMouseDown && [e modifierFlags] & NSControlKeyMask)) {
         int servicesItemIndex = [contextMenu indexOfItemWithRepresentedObject: ICCF_SERVICES_ITEM];
-        if (servicesItemIndex == -1 && ICCF_prefs.servicesInContextualMenu) {
-            [contextMenu addItem: [NSMenuItem separatorItem]];
-            [contextMenu addItem: ICCF_ServicesMenuItem()];
-        } else if (servicesItemIndex != -1 && !ICCF_prefs.servicesInContextualMenu) {
+        // always regenerate: make sure menu reflects context
+        if (servicesItemIndex != -1) {
             [contextMenu removeItemAtIndex: servicesItemIndex];
             [contextMenu removeItemAtIndex: servicesItemIndex - 1];
+        }
+        if (ICCF_prefs.servicesInContextualMenu) {
+            NSMenuItem *contextualServicesItem = ICCF_ContextualServicesMenuItem();
+            if (contextualServicesItem != nil) {
+                [contextMenu addItem: [NSMenuItem separatorItem]];
+                [contextMenu addItem: contextualServicesItem];
+            }
         }
     }
@@ -447 +509 @@
         servicesItem = nil;
     }
+    [[NSApp servicesMenu] update]; // enable keyboard equivalents
 }