Changeset 9c623237a0965223c78d8544708d7c1bac62d1ec

Timestamp:

04/20/04 06:24:52 (4 years ago)

Author:

Andre Pang <andrep@videolan.org>

git-committer:

Andre Pang <andrep@videolan.org> 1082435092 +0000

git-parent:

[1ce23b854fd7bf0805f1cdd5969ac8c2ead2d5c3]

git-author:

Andre Pang <andrep@videolan.org> 1082435092 +0000

Message:

* Mac OS X: intercept and respond to user-configured VLC hotkeys, rather

than only responding to shortcut keys which are defined in the .nib
interface file

Files:

• modules/gui/macosx/intf.h (modified) (1 diff)
• modules/gui/macosx/intf.m (modified) (1 diff)
• modules/gui/macosx/misc.m (modified) (2 diffs)
• modules/gui/macosx/vout.m (modified) (1 diff)

modules/gui/macosx/intf.h

@@ -45 +45 @@
-- (void)setIntf:(intf_thread_t *)p_intf;
-- (intf_thread_t *)getIntf;
+- (BOOL)hasDefinedShortcutKey:(NSEvent *)o_event;
-
-@end

modules/gui/macosx/intf.m

@@ -211 +211 @@
-{
-    p_intf->p_vlc->b_die = VLC_TRUE;
+}
+
+
+/*****************************************************************************
+ * hasDefinedShortcutKey: Check to see if the key press is a defined VLC
+ * shortcut key.  If it is, pass it off to VLC for handling and return YES,
+ * otherwise ignore it and return NO (where it will get handled by Cocoa).
+ *****************************************************************************/
+- (BOOL)hasDefinedShortcutKey:(NSEvent *)o_event
+{
+    unichar key = 0;
+    vlc_value_t val;
+    unsigned int i_pressed_modifiers = 0;
+    struct hotkey *p_hotkeys;
+    int i;
+
+    val.i_int = 0;
+    p_hotkeys = p_intf->p_vlc->p_hotkeys;
+
+    i_pressed_modifiers = [o_event modifierFlags];
+
+    if( i_pressed_modifiers & NSShiftKeyMask )
+        val.i_int |= KEY_MODIFIER_SHIFT;
+    if( i_pressed_modifiers & NSControlKeyMask )
+        val.i_int |= KEY_MODIFIER_CTRL;
+    if( i_pressed_modifiers & NSAlternateKeyMask )
+        val.i_int |= KEY_MODIFIER_ALT;
+    if( i_pressed_modifiers & NSCommandKeyMask )
+        val.i_int |= KEY_MODIFIER_COMMAND;
+
+    key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0];
+
+    val.i_int |= CocoaKeyToVLC( key );
+
+    for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
+    {
+        if( p_hotkeys[i].i_key == val.i_int )
+        {
+            var_Set( p_intf->p_vlc, "key-pressed", val );
+            return YES;
+        }
+    }
+
+    return NO;
-}
-

modules/gui/macosx/misc.m

@@ -24 +24 @@
-#include <Cocoa/Cocoa.h>
-
+#include "intf.h"                                          /* VLCApplication */
-#include "misc.h"
-#include "playlist.h"
@@ -41 +42 @@
-    return( self );
-}
+
+- (BOOL)performKeyEquivalent:(NSEvent *)o_event
+{
+    return [( (VLCApplication *) [VLCApplication sharedApplication] )
+            hasDefinedShortcutKey:o_event];
+}
+
-@end
-

modules/gui/macosx/vout.m

@@ -974 +974 @@
-}
-
+- (BOOL)performKeyEquivalent:(NSEvent *)o_event
+{
+    return [(VLCApplication *) [VLCApplication sharedApplication]
+            hasDefinedShortcutKey:o_event];
+}
+
-- (void)keyDown:(NSEvent *)o_event
-{