videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

Revert "vlc_keys: define mouse's middle, 4 & 5 buttons."t revert 

This reverts commit aeb250f758.
This commit is contained in:
Francois Cartegnie 2012-03-02 12:08:30 +01:00
parent c495d676f1
commit fc2fa18e80
4 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vlc_keys.h
View File

@ -81,10 +81,6 @@
#define KEY_MEDIA_STOP 0x004B0000
#define KEY_MEDIA_PLAY_PAUSE 0x004C0000
#define KEY_MOUSEBUTTON_MID 0x00ED0000
#define KEY_MOUSEBUTTON_X1 0x00EE0000
#define KEY_MOUSEBUTTON_X2 0x00EF0000
#define KEY_MOUSEWHEELUP 0x00F00000
#define KEY_MOUSEWHEELDOWN 0x00F10000
#define KEY_MOUSEWHEELLEFT 0x00F20000

2
include/vlc_mouse.h
View File

@ -36,8 +36,6 @@ enum
MOUSE_BUTTON_WHEEL_DOWN,
MOUSE_BUTTON_WHEEL_LEFT,
MOUSE_BUTTON_WHEEL_RIGHT,
MOUSE_BUTTON_X1,
MOUSE_BUTTON_X2,
MOUSE_BUTTON_MAX
};

3
src/config/keys.c
View File

@ -85,9 +85,6 @@ static const struct key_descriptor_s vlc_keys[] =
{ "Media Prev Track", KEY_MEDIA_PREV_TRACK },
{ "Media Stop", KEY_MEDIA_STOP },
{ "Menu", KEY_MENU },
{ "Mouse Button Mid", KEY_MOUSEBUTTON_MID },
{ "Mouse Button X1", KEY_MOUSEBUTTON_X1 },
{ "Mouse Button X2", KEY_MOUSEBUTTON_X2 },
{ "Mouse Wheel Down", KEY_MOUSEWHEELDOWN },
{ "Mouse Wheel Left", KEY_MOUSEWHEELLEFT },
{ "Mouse Wheel Right", KEY_MOUSEWHEELRIGHT },

5
src/video_output/event.h
View File

@ -72,8 +72,7 @@ static inline void vout_SendEventMousePressed(vout_thread_t *vout, int button)
}
case MOUSE_BUTTON_CENTER:
var_ToggleBool(vout->p_libvlc, "intf-toggle-fscontrol");
key = KEY_MOUSEBUTTON_MID;
break;
return;
case MOUSE_BUTTON_RIGHT:
var_SetBool(vout->p_libvlc, "intf-popupmenu", true);
return;
@ -81,8 +80,6 @@ static inline void vout_SendEventMousePressed(vout_thread_t *vout, int button)
case MOUSE_BUTTON_WHEEL_DOWN: key = KEY_MOUSEWHEELDOWN; break;
case MOUSE_BUTTON_WHEEL_LEFT: key = KEY_MOUSEWHEELLEFT; break;
case MOUSE_BUTTON_WHEEL_RIGHT: key = KEY_MOUSEWHEELRIGHT; break;
case MOUSE_BUTTON_X1: key = KEY_MOUSEBUTTON_X1; break;
case MOUSE_BUTTON_X2: key = KEY_MOUSEBUTTON_X2; break;
}
vout_SendEventKey(vout, key);
}