Get rid of KEY_ASCII and KEY_SPECIAL

diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index f78fd3a60dc1002da48d20b4b888716634e2dbcb..642e361ba8993574141e612c8dc5210ffb4e7031 100644 (file)
--- a/include/vlc_keys.h
+++ b/include/vlc_keys.h
@@ -37,7 +37,6 @@
 #define KEY_MODIFIER_META    0x08000000
 #define KEY_MODIFIER_COMMAND 0x10000000
 
-#define KEY_SPECIAL          0x00FF0000
 #define KEY_LEFT             0x00010000
 #define KEY_RIGHT            0x00020000
 #define KEY_UP               0x00030000
@@ -89,7 +88,6 @@
 #define KEY_MEDIA_STOP       0x002b0000
 #define KEY_MEDIA_PLAY_PAUSE 0x002c0000
 
-#define KEY_ASCII            0x0000007F
 #define KEY_UNSET            0
 
 typedef struct key_descriptor_s

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index ee4757d1a6cd4a7b12852b4dd1996f316570632f..7ecd11587904eee52ec32731c65c7694a9c92068 100644 (file)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -942,7 +942,7 @@ static int SpecialKeyEvent( vlc_object_t *libvlc, char const *psz_var,
     /* Special action for mouse event */
     /* FIXME: rework hotkeys handling to allow more than 1 event
      * to trigger one same action */
-    switch (newval.i_int & KEY_SPECIAL)
+    switch (newval.i_int & ~KEY_MODIFIER)
     {
         case KEY_MOUSEWHEELUP:
             i_action = (i_mode == MOUSEWHEEL_VOLUME ) ? ACTIONID_VOL_UP
@@ -963,8 +963,6 @@ static int SpecialKeyEvent( vlc_object_t *libvlc, char const *psz_var,
         case KEY_MENU:
             var_SetBool( libvlc, "intf-popupmenu", true );
             break;
-        default:
-          return VLC_SUCCESS;
     }
 
     if( i_mode == NO_MOUSEWHEEL ) return VLC_SUCCESS;