From: Rémi Denis-Courmont <remi@remlab.net>
Date: Thu, 21 May 2009 13:22:09 +0000 (+0300)
Subject: Get rid of KEY_ASCII and KEY_SPECIAL
X-Git-Tag: 1.1.0-ff~5848
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1f69a67dd4dab7519d3a912fb6b6ffb6299bcb66;p=vlc

Get rid of KEY_ASCII and KEY_SPECIAL
---

diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index f78fd3a60d..642e361ba8 100644
--- 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 ee4757d1a6..7ecd115879 100644
--- 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;