From 7ef17aec99c92c9d0d3f9fc29e257e0035de1aa9 Mon Sep 17 00:00:00 2001 From: Kent Sutherland Date: Mon, 20 Jan 2003 21:46:05 +0000 Subject: [PATCH] Modified the keycombo class to return nil if there is no key in user defaults. Added key equivalents. --- KeyCombo.m | 2 +- MenuTunes.m | 217 ++++++++++++++++++++++++++++++++++++--- StatusWindowController.m | 6 +- 3 files changed, 207 insertions(+), 18 deletions(-) diff --git a/KeyCombo.m b/KeyCombo.m index 5248197..9017619 100755 --- a/KeyCombo.m +++ b/KeyCombo.m @@ -187,7 +187,7 @@ if (data) { combo = [[NSUnarchiver unarchiveObjectWithData:data] retain]; } else { - combo = [[KeyCombo alloc] init]; + combo = nil; } return combo; diff --git a/MenuTunes.m b/MenuTunes.m index 98748eb..aa4296c 100755 --- a/MenuTunes.m +++ b/MenuTunes.m @@ -21,6 +21,8 @@ Things to do: - (NSString *)runScriptAndReturnResult:(NSString *)script; - (void)timerUpdate; - (void)sendAEWithEventClass:(AEEventClass)eventClass andEventID:(AEEventID)eventID; +- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers + onItem:(NSMenuItem *)item; @end @@ -177,18 +179,44 @@ Things to do: for (i = 0; i < [myMenu count]; i++) { NSString *item = [myMenu objectAtIndex:i]; if ([item isEqualToString:@"Play/Pause"]) { + KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PlayPause"]; playPauseMenuItem = [menu addItemWithTitle:@"Play" - action:@selector(playPause:) - keyEquivalent:@""]; + action:@selector(playPause:) + keyEquivalent:@""]; [playPauseMenuItem setTarget:self]; + + if (tempCombo) + { + [self setKeyEquivalentForCode:[tempCombo keyCode] + andModifiers:[tempCombo modifiers] onItem:playPauseMenuItem]; + [tempCombo release]; + } } else if ([item isEqualToString:@"Next Track"]) { - [[menu addItemWithTitle:@"Next Track" - action:@selector(nextSong:) - keyEquivalent:@""] setTarget:self]; + KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"NextTrack"]; + NSMenuItem *nextTrack = [menu addItemWithTitle:@"Next Track" + action:@selector(nextSong:) + keyEquivalent:@""]; + + [nextTrack setTarget:self]; + if (tempCombo) + { + [self setKeyEquivalentForCode:[tempCombo keyCode] + andModifiers:[tempCombo modifiers] onItem:nextTrack]; + [tempCombo release]; + } } else if ([item isEqualToString:@"Previous Track"]) { - [[menu addItemWithTitle:@"Previous Track" - action:@selector(prevSong:) - keyEquivalent:@""] setTarget:self]; + KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PrevTrack"]; + NSMenuItem *prevTrack = [menu addItemWithTitle:@"Previous Track" + action:@selector(prevSong:) + keyEquivalent:@""]; + + [prevTrack setTarget:self]; + if (tempCombo) + { + [self setKeyEquivalentForCode:[tempCombo keyCode] + andModifiers:[tempCombo modifiers] onItem:prevTrack]; + [tempCombo release]; + } } else if ([item isEqualToString:@"Fast Forward"]) { [[menu addItemWithTitle:@"Fast Forward" action:@selector(fastForward:) @@ -824,10 +852,10 @@ isEqualToString:@"rewinding"]) { } [statusController setUpcomingSongs:songs]; [NSTimer scheduledTimerWithTimeInterval:3.0 - target:self - selector:@selector(fadeAndCloseStatusWindow) - userInfo:nil - repeats:NO]; + target:self + selector:@selector(fadeAndCloseStatusWindow) + userInfo:nil + repeats:NO]; } } } @@ -839,6 +867,168 @@ isEqualToString:@"rewinding"]) { statusController = nil; } +- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers + onItem:(NSMenuItem *)item +{ + unichar charcode = 'a'; + int i; + long cocoaModifiers = 0; + static long carbonToCocoa[6][2] = + { + { cmdKey, NSCommandKeyMask }, + { optionKey, NSAlternateKeyMask }, + { controlKey, NSControlKeyMask }, + { shiftKey, NSShiftKeyMask }, + }; + + for (i = 0; i < 6; i++) + { + if (modifiers & carbonToCocoa[i][0]) + { + cocoaModifiers += carbonToCocoa[i][1]; + } + } + [item setKeyEquivalentModifierMask:cocoaModifiers]; + + //Missing key combos for some keys. Must find them later. + switch (code) + { + case 36: + break; + + case 48: + break; + + case 49: + break; + + case 51: + charcode = NSDeleteFunctionKey; + break; + case 53: + break; + + case 71: + break; + + case 76: + break; + + case 96: + charcode = NSF5FunctionKey; + break; + + case 97: + charcode = NSF6FunctionKey; + break; + + case 98: + charcode = NSF7FunctionKey; + break; + + case 99: + charcode = NSF3FunctionKey; + break; + + case 100: + charcode = NSF8FunctionKey; + break; + + case 101: + charcode = NSF9FunctionKey; + break; + + case 103: + charcode = NSF11FunctionKey; + break; + + case 105: + charcode = NSF3FunctionKey; + break; + + case 107: + charcode = NSF14FunctionKey; + break; + + case 109: + charcode = NSF10FunctionKey; + break; + + case 111: + charcode = NSF12FunctionKey; + break; + + case 113: + charcode = NSF13FunctionKey; + break; + + case 114: + charcode = NSInsertFunctionKey; + break; + + case 115: + break; + + case 116: + charcode = NSPageUpFunctionKey; + break; + + case 117: + charcode = NSDeleteFunctionKey; + break; + + case 118: + charcode = NSF4FunctionKey; + break; + + case 119: + charcode = NSEndFunctionKey; + break; + + case 120: + charcode = NSF2FunctionKey; + break; + + case 121: + charcode = NSPageDownFunctionKey; + break; + + case 122: + charcode = NSF1FunctionKey; + break; + + case 123: + charcode = NSLeftArrowFunctionKey; + break; + + case 124: + charcode = NSRightArrowFunctionKey; + break; + + case 125: + charcode = NSDownArrowFunctionKey; + break; + + case 126: + charcode = NSUpArrowFunctionKey; + break; + } + + if (charcode == 'a') { + unsigned long state; + long keyTrans; + char charCode; + Ptr kchr; + state = 0; + kchr = (Ptr) GetScriptVariable(smCurrentScript, smKCHRCache); + keyTrans = KeyTranslate(kchr, code, &state); + charCode = keyTrans; + [item setKeyEquivalent:[NSString stringWithCString:&charCode length:1]]; + } else { + [item setKeyEquivalent:[NSString stringWithCharacters:&charcode length:1]]; + } +} + /*************************************************************************/ #pragma mark - #pragma mark NSApplication DELEGATE METHODS @@ -869,5 +1059,4 @@ isEqualToString:@"rewinding"]) { [super dealloc]; } - -@end +@end \ No newline at end of file diff --git a/StatusWindowController.m b/StatusWindowController.m index 246b911..b57fa1e 100755 --- a/StatusWindowController.m +++ b/StatusWindowController.m @@ -14,7 +14,7 @@ - (void)setUpcomingSongs:(NSString *)string { -int size = 0, i; + int size = 0, i; NSArray *lines = [string componentsSeparatedByString:@"\n"]; for (i = 0; i < [lines count]; i++) { @@ -30,7 +30,7 @@ int size = 0, i; } [statusField setStringValue:string]; - [statusWindow setFrame:NSMakeRect(0, 0, size + 45, 40 + ([lines count] * 15)) display:NO]; + [statusWindow setFrame:NSMakeRect(0, 0, size + 45, 40 + ([lines count] * 15)) display:YES]; [statusWindow center]; [statusWindow makeKeyAndOrderFront:nil]; } @@ -67,7 +67,7 @@ int size = 0, i; { NSAutoreleasePool *p00l = [[NSAutoreleasePool alloc] init]; float i; - for (i = 1.0; i > 0; i -= .003) { + for (i = 0.6; i > 0; i -= .004) { [statusWindow setAlphaValue:i]; } [statusWindow close]; -- 2.20.1