Changeset 431

Timestamp:

03/ 3/08 8:21:22 AM (9 months ago)

Author:

nicholas

Message:

Handle NSUserKeyEquivalents; disable conflict resolution; fix keyEquivalents invalidation crasher

Files:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEKeyEquivalents.m (modified) (1 diff)
• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServicePrefController.m (modified) (7 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEKeyEquivalents.m

@@ -140 +140 @@
-    return keyEquivalentAttributedString;
-}
+
+// converts NSUserKeyEquivalents prefixes into modifier flags
+NSAttributedString *ICCF_KeyEquivalentAttributedString(NSString *self, unsigned count) {
+    unsigned modifierFlags = 0;
+    int i;
+    for (i = 0 ; i < [self length] - 1; i++) {
+        switch ([self characterAtIndex: i]) {
+            case '@': modifierFlags |= NSCommandKeyMask; break;
+            case '~': modifierFlags |= NSAlternateKeyMask; break;
+            case '^': modifierFlags |= NSControlKeyMask; break;
+            case '$': modifierFlags |= NSShiftKeyMask; break;
+            default:
+                return nil;
+        }
+    }
+    return ICCF_KeyEquivalentAttributedStringWithModifierFlags([self substringFromIndex: i], modifierFlags, count);
+}
+

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEServicePrefController.m

@@ -29 +29 @@
-
-static NSMutableDictionary *keyEquivalents;
+static NSDictionary *userKeyEquivalents;
-
-static void ICCF_RemoveSingleKeyEquivalents() {
@@ -75 +76 @@
-
-static inline void ICCF_UpdateKeyEquivalentForItem(NSMenuItem *item, int state) {
+    return; // XXX disabled until we can affect menubar Services menu(s)
-    int oldState = ICCF_GetServiceState(item);
-    if ((oldState == ICCF_SERVICE_UNKNOWN || oldState == ICCF_SERVICE_SHOWN) && state == ICCF_SERVICE_HIDDEN)
@@ -204 +206 @@
-        } else {
-            NSString *keyEquivalent = (NSString *)[itemInfo objectForKey: (NSString *)kICServiceShortcut];
+            if (keyEquivalent == nil) {
+                keyEquivalent = [userKeyEquivalents objectForKey: [menuItem title]];
+            } else if ([keyEquivalent length] != 1) {
+                keyEquivalent = nil;
+            } else {
+                // XXX Inconsistency between Cocoa and Carbon: always command-shift in Carbon, not in Cocoa.  Since we only patch Cocoa for the moment, keep as is.
+                unichar key = [keyEquivalent characterAtIndex: 0];
+                if ([[NSCharacterSet uppercaseLetterCharacterSet] characterIsMember: key])
+                    keyEquivalent = [NSString stringWithFormat: @"$@%c", key];
+                else
+                    keyEquivalent = [NSString stringWithFormat: @"@%c", key];
+            }
-            if (keyEquivalent != nil) {
-                [menuItem setToolTip: keyEquivalent];
@@ -274 +288 @@
-- (void)dealloc;
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
-    [super dealloc];
-}
@@ -336 +351 @@
-    if (servicesMenu == nil) {
-        keyEquivalents = [[NSMutableDictionary alloc] init];
+        userKeyEquivalents = [[[NSUserDefaults standardUserDefaults] dictionaryForKey: @"NSUserKeyEquivalents"] retain];
-        servicesMenu = [[NSMenu alloc] initWithTitle: @""];
-        ICCF_SetServicesMenu(servicesMenu);
@@ -359 +375 @@
-}
-
-WithModifierFlags(NSString *self, unsigned int modifierFlags
+(NSString *self
-
-- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item;
@@ -380 +396 @@
-    } else if ([[tableColumn identifier] isEqualToString: @"key"]) {
-        NSString *equivalent = [item toolTip];
- || [equivalent length] != 1) return nil;
-
-WithModifierFlags(equivalent, [item keyEquivalentModifierMask] | ([[NSCharacterSet uppercaseLetterCharacterSet] characterIsMember: [equivalent characterAtIndex: 0]] ? NSShiftKeyMask : 0)
+)
+
+(equivalent
-    }
-    return nil;