Commit 1f69a67d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Get rid of KEY_ASCII and KEY_SPECIAL

parent b7cb2c6a
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#define KEY_MODIFIER_META 0x08000000 #define KEY_MODIFIER_META 0x08000000
#define KEY_MODIFIER_COMMAND 0x10000000 #define KEY_MODIFIER_COMMAND 0x10000000
#define KEY_SPECIAL 0x00FF0000
#define KEY_LEFT 0x00010000 #define KEY_LEFT 0x00010000
#define KEY_RIGHT 0x00020000 #define KEY_RIGHT 0x00020000
#define KEY_UP 0x00030000 #define KEY_UP 0x00030000
...@@ -89,7 +88,6 @@ ...@@ -89,7 +88,6 @@
#define KEY_MEDIA_STOP 0x002b0000 #define KEY_MEDIA_STOP 0x002b0000
#define KEY_MEDIA_PLAY_PAUSE 0x002c0000 #define KEY_MEDIA_PLAY_PAUSE 0x002c0000
#define KEY_ASCII 0x0000007F
#define KEY_UNSET 0 #define KEY_UNSET 0
typedef struct key_descriptor_s typedef struct key_descriptor_s
......
...@@ -942,7 +942,7 @@ static int SpecialKeyEvent( vlc_object_t *libvlc, char const *psz_var, ...@@ -942,7 +942,7 @@ static int SpecialKeyEvent( vlc_object_t *libvlc, char const *psz_var,
/* Special action for mouse event */ /* Special action for mouse event */
/* FIXME: rework hotkeys handling to allow more than 1 event /* FIXME: rework hotkeys handling to allow more than 1 event
* to trigger one same action */ * to trigger one same action */
switch (newval.i_int & KEY_SPECIAL) switch (newval.i_int & ~KEY_MODIFIER)
{ {
case KEY_MOUSEWHEELUP: case KEY_MOUSEWHEELUP:
i_action = (i_mode == MOUSEWHEEL_VOLUME ) ? ACTIONID_VOL_UP i_action = (i_mode == MOUSEWHEEL_VOLUME ) ? ACTIONID_VOL_UP
...@@ -963,8 +963,6 @@ static int SpecialKeyEvent( vlc_object_t *libvlc, char const *psz_var, ...@@ -963,8 +963,6 @@ static int SpecialKeyEvent( vlc_object_t *libvlc, char const *psz_var,
case KEY_MENU: case KEY_MENU:
var_SetBool( libvlc, "intf-popupmenu", true ); var_SetBool( libvlc, "intf-popupmenu", true );
break; break;
default:
return VLC_SUCCESS;
} }
if( i_mode == NO_MOUSEWHEEL ) return VLC_SUCCESS; if( i_mode == NO_MOUSEWHEEL ) return VLC_SUCCESS;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment