* Initialize hotkey handling
*/
var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "key-action", VLC_VAR_INTEGER );
p_libvlc->p_hotkeys = malloc( libvlc_hotkeys_size );
/* Do a copy (we don't need to modify the strings) */
memcpy( p_libvlc->p_hotkeys, libvlc_hotkeys, libvlc_hotkeys_size );
+ var_AddCallback( p_libvlc, "key-pressed", vlc_key_to_action,
+ p_libvlc->p_hotkeys );
/* Initialize interaction */
p_libvlc->p_interaction = interaction_Init( p_libvlc );
FREENULL( p_libvlc->psz_datadir );
FREENULL( p_libvlc->psz_cachedir );
FREENULL( p_libvlc->psz_configfile );
+ var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action,
+ p_libvlc->p_hotkeys );
FREENULL( p_libvlc->p_hotkeys );
var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
extern const char vlc_usage[];
+/* Hotkey stuff */
extern const struct hotkey libvlc_hotkeys[];
extern const size_t libvlc_hotkeys_size;
-
+extern int vlc_key_to_action (vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void *);
/*
* OS-specific initialization
--- /dev/null
+/*****************************************************************************
+ * action.c: key to action mapping
+ *****************************************************************************
+ * Copyright © 2008 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc/vlc.h>
+#include "../libvlc.h"
+
+int vlc_key_to_action (vlc_object_t *libvlc, const char *varname,
+ vlc_value_t prevkey, vlc_value_t curkey, void *priv)
+{
+ const struct hotkey *key = priv;
+
+ (void)varname;
+ (void)prevkey;
+
+ while (key->i_key != curkey.i_int)
+ {
+ if (key->psz_action == NULL)
+ return VLC_SUCCESS; /* key is not mapped to anything */
+
+ key++;
+ }
+
+ return var_SetInteger (libvlc, "key-action", key->i_action);
+}
+