#import "simple_prefs.h"
#import "prefs.h"
+#import <vlc_keys.h>
static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier";
{
[o_currentlyShownCategoryView release];
[o_sprefs_toolbar release];
-
+
+ [o_hotkeySettings release];
+ [o_hotkeyDescriptions release];
+ [o_hotkeysNonUseableKeys release];
+
+ if( o_keyInTransition )
+ [o_keyInTransition release];
+
[super dealloc];
}
+
+- (NSString *)OSXKeyToString:(int)val
+{
+ NSMutableString *o_temp_str = [[[NSMutableString alloc] init] autorelease];
+ if( val & KEY_MODIFIER_CTRL )
+ [o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x8C\x83"]];
+ if( val & KEY_MODIFIER_ALT )
+ [o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x8C\xA5"]];
+ if( val & KEY_MODIFIER_SHIFT )
+ [o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x87\xA7"]];
+ if( val & KEY_MODIFIER_COMMAND )
+ [o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x8C\x98"]];
+
+ unsigned int i_keys = sizeof(vlc_keys)/sizeof(key_descriptor_t);
+ for( unsigned int i = 0; i< i_keys; i++ )
+ {
+ if( vlc_keys[i].i_key_code == (val& ~KEY_MODIFIER) )
+ {
+ if( vlc_keys[i].psz_key_string )
+ [o_temp_str appendString: [NSString stringWithUTF8String: vlc_keys[i].psz_key_string]];
+ else
+ o_temp_str = @"Unset";
+ }
+ }
+ return o_temp_str;
+}
+
- (void)awakeFromNib
{
[self initStrings];
-
- [self resetControls];
/* setup the toolbar */
o_sprefs_toolbar = [[[NSToolbar alloc] initWithIdentifier: VLCSPrefsToolbarIdentifier] autorelease];
[o_sprefs_toolbar setSizeMode: NSToolbarSizeModeRegular];
[o_sprefs_toolbar setDelegate: self];
[o_sprefs_win setToolbar: o_sprefs_toolbar];
+
+ /* setup useful stuff */
+ /* TODO: hard-code this instead of one-the-run generation */
+ o_hotkeysNonUseableKeys = [[NSArray arrayWithObjects:
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'c'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'x'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'v'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'a'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|','],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'h'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'h'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'o'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'o'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'d'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'n'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'s'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'z'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'l'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'r'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'0'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'1'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'2'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'3'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'m'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'q'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'w'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'w'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'c'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'p'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'i'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'e'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'e'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'b'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'m'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_CTRL|'m'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'?'],
+ [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'?'],
+ nil] retain];
}
- (NSToolbarItem *) toolbar: (NSToolbar *)o_sprefs_toolbar
{
NSToolbarItem *o_toolbarItem = nil;
+ #define CreateToolbarItem( o_name, o_desc, o_img, sel ) \
+ o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease]; \
+ \
+ [o_toolbarItem setLabel: o_name]; \
+ [o_toolbarItem setPaletteLabel: o_desc]; \
+ \
+ [o_toolbarItem setToolTip: o_desc]; \
+ [o_toolbarItem setImage: [NSImage imageNamed: o_img]]; \
+ \
+ [o_toolbarItem setTarget: self]; \
+ [o_toolbarItem setAction: @selector( sel )]; \
+ \
+ [o_toolbarItem setEnabled: YES]; \
+ [o_toolbarItem setAutovalidates: YES]
+
if( [o_itemIdent isEqual: VLCIntfSettingToolbarIdentifier] )
{
- o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease];
-
- [o_toolbarItem setLabel: _NS("Interface")];
- [o_toolbarItem setPaletteLabel: _NS("Interface settings")];
-
- [o_toolbarItem setToolTip: _NS("Interface settings")];
- [o_toolbarItem setImage: [NSImage imageNamed: @"spref_cone_Interface_64"]];
-
- [o_toolbarItem setTarget: self];
- [o_toolbarItem setAction: @selector(showInterfaceSettings)];
-
- [o_toolbarItem setEnabled: YES];
- [o_toolbarItem setAutovalidates: YES];
+ CreateToolbarItem( _NS("Interface"), _NS("Interface Settings"), @"spref_cone_Interface_64", showInterfaceSettings );
}
else if( [o_itemIdent isEqual: VLCAudioSettingToolbarIdentifier] )
{
- o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease];
-
- [o_toolbarItem setLabel: _NS("Audio")];
- [o_toolbarItem setPaletteLabel: _NS("General Audio settings")];
-
- [o_toolbarItem setToolTip: _NS("General Audio settings")];
- [o_toolbarItem setImage: [NSImage imageNamed: @"spref_cone_Audio_64"]];
-
- [o_toolbarItem setTarget: self];
- [o_toolbarItem setAction: @selector(showAudioSettings)];
-
- [o_toolbarItem setEnabled: YES];
- [o_toolbarItem setAutovalidates: YES];
+ CreateToolbarItem( _NS("Audio"), _NS("General Audio Settings"), @"spref_cone_Audio_64", showAudioSettings );
}
else if( [o_itemIdent isEqual: VLCVideoSettingToolbarIdentifier] )
{
- o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease];
-
- [o_toolbarItem setLabel: _NS("Video")];
- [o_toolbarItem setPaletteLabel: _NS("General Video settings")];
-
- [o_toolbarItem setToolTip: _NS("General Video settings")];
- [o_toolbarItem setImage: [NSImage imageNamed: @"spref_cone_Video_64"]];
-
- [o_toolbarItem setTarget: self];
- [o_toolbarItem setAction: @selector(showVideoSettings)];
-
- [o_toolbarItem setEnabled: YES];
- [o_toolbarItem setAutovalidates: YES];
+ CreateToolbarItem( _NS("Video"), _NS("General Video Settings"), @"spref_cone_Video_64", showVideoSettings );
}
else if( [o_itemIdent isEqual: VLCOSDSettingToolbarIdentifier] )
{
- o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease];
-
- [o_toolbarItem setLabel: _NS("Subtitles & OSD")];
- [o_toolbarItem setPaletteLabel: _NS("Subtitles & OSD settings")];
-
- [o_toolbarItem setToolTip: _NS("Subtitles & OSD settings")];
- [o_toolbarItem setImage: [NSImage imageNamed: @"spref_cone_Subtitles_64"]];
-
- [o_toolbarItem setTarget: self];
- [o_toolbarItem setAction: @selector(showOSDSettings)];
-
- [o_toolbarItem setEnabled: YES];
- [o_toolbarItem setAutovalidates: YES];
+ CreateToolbarItem( _NS("Subtitles & OSD"), _NS("Subtitles & OSD Settings"), @"spref_cone_Subtitles_64", showOSDSettings );
}
else if( [o_itemIdent isEqual: VLCInputSettingToolbarIdentifier] )
{
- o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease];
-
- [o_toolbarItem setLabel: _NS("Input & Codecs")];
- [o_toolbarItem setPaletteLabel: _NS("Input & Codec settings")];
-
- [o_toolbarItem setToolTip: _NS("Input & Codec settings")];
- [o_toolbarItem setImage: [NSImage imageNamed: @"spref_cone_Input_64"]];
-
- [o_toolbarItem setTarget: self];
- [o_toolbarItem setAction: @selector(showInputSettings)];
-
- [o_toolbarItem setEnabled: YES];
- [o_toolbarItem setAutovalidates: YES];
+ CreateToolbarItem( _NS("Input & Codecs"), _NS("Input & Codec settings"), @"spref_cone_Input_64", showInputSettings );
+ }
+ else if( [o_itemIdent isEqual: VLCHotkeysSettingToolbarIdentifier] )
+ {
+ CreateToolbarItem( _NS("Hotkeys"), _NS("Hotkeys settings"), @"spref_cone_Hotkeys_64", showHotkeySettings );
}
return o_toolbarItem;
- (NSArray *)toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar
{
return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier,
- VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil];
+ VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, VLCHotkeysSettingToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil];
}
- (NSArray *)toolbarAllowedItemIdentifiers: (NSToolbar *)toolbar
{
return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier,
- VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil];
+ VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, VLCHotkeysSettingToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil];
}
- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
{
return [NSArray arrayWithObjects: VLCIntfSettingToolbarIdentifier, VLCAudioSettingToolbarIdentifier, VLCVideoSettingToolbarIdentifier,
- VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, nil];
+ VLCOSDSettingToolbarIdentifier, VLCInputSettingToolbarIdentifier, VLCHotkeysSettingToolbarIdentifier, nil];
}
- (void)initStrings
if( module_Exists (p_intf, "dvdnav") )
TestCaC( "dvdnav-caching" );
TestCaC( "tcp-caching" );
- TestCaC( "fake-caching" );
+ TestCaC( "fake-caching" );
TestCaC( "cdda-caching" );
- TestCaC( "screen-caching" );
+ TestCaC( "screen-caching" );
TestCaC( "vcd-caching" );
- TestCaCi( "rtsp-caching", 4 );
+ TestCaCi( "rtsp-caching", 4 );
TestCaCi( "ftp-caching", 2 );
TestCaCi( "http-caching", 4 );
if(module_Exists (p_intf, "access_realrtsp"))
/********************
* hotkeys settings *
********************/
+ struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
+ o_hotkeySettings = [[NSMutableArray alloc] init];
+ NSMutableArray *o_tempArray_desc = [[NSMutableArray alloc] init];
+ i = 1;
+
+ while( i < 100 )
+ {
+ p_item = config_FindConfig( VLC_OBJECT(p_intf), p_hotkeys[i].psz_action );
+ if( !p_item )
+ break;
+
+ [o_tempArray_desc addObject: _NS( p_item->psz_text )];
+ [o_hotkeySettings addObject: [NSNumber numberWithInt: p_item->value.i]];
+
+ i++;
+ }
+ o_hotkeyDescriptions = [[NSArray alloc] initWithArray: o_tempArray_desc copyItems: YES];
+ [o_tempArray_desc release];
+ [o_hotkeys_listbox reloadData];
}
- (void)showSimplePrefs
[o_sprefs_toolbar setSelectedItemIdentifier: VLCIntfSettingToolbarIdentifier];
[self showInterfaceSettings];
}
+
+ [self resetControls];
[o_sprefs_win makeKeyAndOrderFront: self];
}
if( i != 0 )
{
- msg_Err( p_intf, "An error occured while saving the Interface settings using SimplePrefs" );
+ msg_Err( p_intf, "An error occurred while saving the Interface settings using SimplePrefs (%i)", i );
i = 0;
}
if( i != 0 )
{
- msg_Err( p_intf, "An error occured while saving the Audio settings using SimplePrefs" );
+ msg_Err( p_intf, "An error occurred while saving the Audio settings using SimplePrefs (%i)", i );
i = 0;
}
b_audioSettingChanged = NO;
if( i != 0 )
{
- msg_Err( p_intf, "An error occured while saving the Video settings using SimplePrefs" );
+ msg_Err( p_intf, "An error occurred while saving the Video settings using SimplePrefs (%i)", i );
i = 0;
}
b_videoSettingChanged = NO;
if( i != 0 )
{
- msg_Err( p_intf, "An error occured while saving the Input settings using SimplePrefs" );
+ msg_Err( p_intf, "An error occurred while saving the Input settings using SimplePrefs (%i)", i );
i = 0;
}
b_inputSettingChanged = NO;
if( i != 0 )
{
- msg_Err( p_intf, "An error occured while saving the OSD/Subtitle settings using SimplePrefs" );
+ msg_Err( p_intf, "An error occurred while saving the OSD/Subtitle settings using SimplePrefs (%i)", i );
i = 0;
}
b_osdSettingChanged = NO;
/********************
* hotkeys settings *
********************/
+ if( b_hotkeyChanged )
+ {
+ struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
+ i = 1;
+ while( i < [o_hotkeySettings count] )
+ {
+ config_PutInt( p_intf, p_hotkeys[i].psz_action, [[o_hotkeySettings objectAtIndex: i-1] intValue] );
+ i++;
+ }
+
+ i = config_SaveConfigFile( p_intf, "main" );
+
+ if( i != 0 )
+ {
+ msg_Err( p_intf, "An error occurred while saving the Hotkey settings using SimplePrefs (%i)", i );
+ i = 0;
+ }
+ b_hotkeyChanged = NO;
+ }
}
- (void)showSettingsForCategory: (id)o_new_category_view
[self showSettingsForCategory: o_input_view];
}
+- (IBAction)hotkeySettingChanged:(id)sender
+{
+ if( sender == o_hotkeys_change_btn || sender == o_hotkeys_listbox )
+ {
+ [o_hotkeys_change_lbl setStringValue: [NSString stringWithFormat: _NS("Press new keys for\n\"%@\""),
+ [o_hotkeyDescriptions objectAtIndex: [o_hotkeys_listbox selectedRow]]]];
+ [o_hotkeys_change_keys_lbl setStringValue: [self OSXKeyToString:[[o_hotkeySettings objectAtIndex: [o_hotkeys_listbox selectedRow]] intValue]]];
+ [o_hotkeys_change_taken_lbl setStringValue: @""];
+ [o_hotkeys_change_win setInitialFirstResponder: [o_hotkeys_change_win contentView]];
+ [o_hotkeys_change_win makeFirstResponder: [o_hotkeys_change_win contentView]];
+ [NSApp runModalForWindow: o_hotkeys_change_win];
+ }
+ else if( sender == o_hotkeys_change_cancel_btn )
+ {
+ [NSApp stopModal];
+ [o_hotkeys_change_win close];
+ }
+ else if( sender == o_hotkeys_change_ok_btn )
+ {
+ int i_returnValue;
+ if(! o_keyInTransition )
+ {
+ [NSApp stopModal];
+ [o_hotkeys_change_win close];
+ msg_Err( p_intf, "internal error prevented the hotkey switch" );
+ return;
+ }
+
+ b_hotkeyChanged = YES;
+
+ i_returnValue = [o_hotkeySettings indexOfObject: o_keyInTransition];
+ if( i_returnValue != NSNotFound )
+ [o_hotkeySettings replaceObjectAtIndex: i_returnValue withObject: [[NSNumber numberWithInt: 0] retain]];
+
+ [o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject: [o_keyInTransition retain]];
+
+ [NSApp stopModal];
+ [o_hotkeys_change_win close];
+
+ [o_hotkeys_listbox reloadData];
+ }
+ else if( sender == o_hotkeys_clear_btn )
+ {
+ [o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject: [NSNumber numberWithInt: 0]];
+ [o_hotkeys_listbox reloadData];
+ b_hotkeyChanged = YES;
+ }
+}
+
+- (void)showHotkeySettings
+{
+ msg_Dbg( p_intf, "showing HotKey Settings" );
+ [self showSettingsForCategory: o_hotkeys_view];
+}
+
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
+{
+ return [o_hotkeySettings count];
+}
+
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+ if( [[aTableColumn identifier] isEqualToString: @"action"] )
+ return [o_hotkeyDescriptions objectAtIndex: rowIndex];
+ else if( [[aTableColumn identifier] isEqualToString: @"shortcut"] )
+ return [self OSXKeyToString: [[o_hotkeySettings objectAtIndex: rowIndex] intValue]];
+ else
+ {
+ msg_Err( p_intf, "unknown TableColumn identifier (%s)!", [[aTableColumn identifier] UTF8String] );
+ return NULL;
+ }
+}
+
+- (void)changeHotkeyTo: (int)i_theNewKey
+{
+ int i_returnValue;
+ i_returnValue = [o_hotkeysNonUseableKeys indexOfObject: [NSNumber numberWithInt: i_theNewKey]];
+ if( i_returnValue != NSNotFound || i_theNewKey == 0 )
+ {
+ [o_hotkeys_change_keys_lbl setStringValue: _NS("Invalid combination")];
+ [o_hotkeys_change_taken_lbl setStringValue: _NS("Regrettably, these keys cannot be assigned as hotkey shortcuts.")];
+ [o_hotkeys_change_ok_btn setEnabled: NO];
+ }
+ else
+ {
+ NSString *o_temp;
+ if( o_keyInTransition )
+ [o_keyInTransition release];
+ o_keyInTransition = [[NSNumber numberWithInt: i_theNewKey] retain];
+
+ o_temp = [self OSXKeyToString: i_theNewKey];
+
+ [o_hotkeys_change_keys_lbl setStringValue: o_temp];
+
+ i_returnValue = [o_hotkeySettings indexOfObject: o_keyInTransition];
+ if( i_returnValue != NSNotFound )
+ [o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat:
+ _NS("This combination is already taken by \"%@\"."),
+ [self OSXKeyToString:[[o_hotkeyDescriptions objectAtIndex: i_returnValue] intValue]]]];
+ else
+ [o_hotkeys_change_taken_lbl setStringValue: @""];
+
+ [o_hotkeys_change_ok_btn setEnabled: YES];
+ }
+}
+
+@end
+
+/********************
+ * hotkeys settings *
+ ********************/
+
+@implementation VLCHotkeyChangeWindow
+
+- (BOOL)resignFirstResponder
+{
+ /* We need to stay the first responder or we'll miss the user's input */
+ return NO;
+}
+
+- (void)keyDown:(NSEvent *)o_theEvent
+{
+ int i_nonReadableKey = 0;
+
+ if( [o_theEvent modifierFlags] & NSControlKeyMask )
+ i_nonReadableKey = i_nonReadableKey | KEY_MODIFIER_CTRL;
+
+ if( [o_theEvent modifierFlags] & NSAlternateKeyMask )
+ i_nonReadableKey = i_nonReadableKey | KEY_MODIFIER_ALT;
+
+ if( [o_theEvent modifierFlags] & NSShiftKeyMask )
+ i_nonReadableKey = i_nonReadableKey | KEY_MODIFIER_SHIFT;
+
+ if( [o_theEvent modifierFlags] & NSCommandKeyMask )
+ i_nonReadableKey = i_nonReadableKey | KEY_MODIFIER_COMMAND;
+
+ if( [o_theEvent modifierFlags] & NSFunctionKeyMask )
+ {
+ unichar key = 0;
+ key = [[o_theEvent charactersIgnoringModifiers] characterAtIndex: 0];
+
+ switch( key )
+ {
+ case 0x1b:
+ i_nonReadableKey = i_nonReadableKey | KEY_ESC;
+ break;
+ case NSF1FunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_F1;
+ break;
+ case NSF2FunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_F2;
+ break;
+ case NSF3FunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_F3;
+ break;
+ case NSF4FunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_F4;
+ break;
+ case NSF5FunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_F5;
+ break;
+ case NSF6FunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_F6;
+ break;
+ case NSF7FunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_F7;
+ break;
+ case NSF8FunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_F8;
+ break;
+ case NSF9FunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_F9;
+ break;
+ case NSF10FunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_F10;
+ break;
+ case NSF11FunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_F11;
+ break;
+ case NSF12FunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_F12;
+ break;
+ case NSInsertFunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_INSERT;
+ break;
+ case NSHomeFunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_HOME;
+ break;
+ case NSEndFunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_END;
+ break;
+ case NSPageUpFunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_PAGEUP;
+ break;
+ case NSPageDownFunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_PAGEDOWN;
+ break;
+ case NSMenuFunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_MENU;
+ break;
+ case NSTabCharacter:
+ i_nonReadableKey = i_nonReadableKey | KEY_TAB;
+ break;
+ case NSDeleteCharacter:
+ i_nonReadableKey = i_nonReadableKey | KEY_DELETE;
+ break;
+ case NSBackspaceCharacter:
+ i_nonReadableKey = i_nonReadableKey | KEY_BACKSPACE;
+ break;
+ case NSUpArrowFunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_UP;
+ break;
+ case NSDownArrowFunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_DOWN;
+ break;
+ case NSRightArrowFunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_RIGHT;
+ break;
+ case NSLeftArrowFunctionKey:
+ i_nonReadableKey = i_nonReadableKey | KEY_LEFT;
+ break;
+ case NSEnterCharacter:
+ i_nonReadableKey = i_nonReadableKey | KEY_ENTER;
+ break;
+ default:
+ {
+ msg_Warn( VLCIntf, "user pressed unknown function key" );
+ i_nonReadableKey = 0;
+ break;
+ }
+ }
+ }
+ else
+ {
+ if( [[o_theEvent charactersIgnoringModifiers] isEqualToString: @" "] )
+ i_nonReadableKey = i_nonReadableKey | KEY_SPACE;
+ else
+ i_nonReadableKey = i_nonReadableKey | StringToKey( (char *)[[[o_theEvent charactersIgnoringModifiers] lowercaseString] UTF8String] );
+ }
+
+ [[[VLCMain sharedInstance] getSimplePreferences] changeHotkeyTo: i_nonReadableKey];
+}
+
@end