From b1501cfe53e3f182f930f4081a7065aa541ee2fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 21 May 2009 18:12:40 +0300 Subject: [PATCH] Do not use values within the Unicode points range for special keys Also remove conflict between browser back/forward and mouse wheel. --- include/vlc_keys.h | 95 +++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/include/vlc_keys.h b/include/vlc_keys.h index 4584c20e06..701608eb0a 100644 --- a/include/vlc_keys.h +++ b/include/vlc_keys.h @@ -37,55 +37,56 @@ #define KEY_MODIFIER_META 0x08000000 #define KEY_MODIFIER_COMMAND 0x10000000 -#define KEY_LEFT 0x00010000 -#define KEY_RIGHT 0x00020000 -#define KEY_UP 0x00030000 -#define KEY_DOWN 0x00040000 -#define KEY_SPACE 0x00050000 -#define KEY_ENTER 0x00060000 -#define KEY_F1 0x00070000 -#define KEY_F2 0x00080000 -#define KEY_F3 0x00090000 -#define KEY_F4 0x000A0000 -#define KEY_F5 0x000B0000 -#define KEY_F6 0x000C0000 -#define KEY_F7 0x000D0000 -#define KEY_F8 0x000E0000 -#define KEY_F9 0x000F0000 -#define KEY_F10 0x00100000 -#define KEY_F11 0x00110000 -#define KEY_F12 0x00120000 -#define KEY_HOME 0x00130000 -#define KEY_END 0x00140000 -#define KEY_INSERT 0x00150000 -#define KEY_DELETE 0x00160000 -#define KEY_MENU 0x00170000 -#define KEY_ESC 0x00180000 -#define KEY_PAGEUP 0x00190000 -#define KEY_PAGEDOWN 0x001A0000 -#define KEY_TAB 0x001B0000 -#define KEY_BACKSPACE 0x001C0000 -#define KEY_MOUSEWHEELUP 0x001D0000 -#define KEY_MOUSEWHEELDOWN 0x001E0000 -#define KEY_MOUSEWHEELLEFT 0x001F0000 -#define KEY_MOUSEWHEELRIGHT 0x00200000 +#define KEY_UNSET 0x00000000 +/* End of Unicode range: 0x0010FFFF */ +#define KEY_LEFT 0x00210000 +#define KEY_RIGHT 0x00220000 +#define KEY_UP 0x00230000 +#define KEY_DOWN 0x00240000 +#define KEY_SPACE 0x00250000 +#define KEY_ENTER 0x00260000 +#define KEY_F1 0x00270000 +#define KEY_F2 0x00280000 +#define KEY_F3 0x00290000 +#define KEY_F4 0x002A0000 +#define KEY_F5 0x002B0000 +#define KEY_F6 0x002C0000 +#define KEY_F7 0x002D0000 +#define KEY_F8 0x002E0000 +#define KEY_F9 0x002F0000 +#define KEY_F10 0x00300000 +#define KEY_F11 0x00310000 +#define KEY_F12 0x00320000 +#define KEY_HOME 0x00330000 +#define KEY_END 0x00340000 +#define KEY_INSERT 0x00350000 +#define KEY_DELETE 0x00360000 +#define KEY_MENU 0x00370000 +#define KEY_ESC 0x00380000 +#define KEY_PAGEUP 0x00390000 +#define KEY_PAGEDOWN 0x003A0000 +#define KEY_TAB 0x003B0000 +#define KEY_BACKSPACE 0x003C0000 -#define KEY_BROWSER_BACK 0x001F0000 -#define KEY_BROWSER_FORWARD 0x00200000 -#define KEY_BROWSER_REFRESH 0x00210000 -#define KEY_BROWSER_STOP 0x00220000 -#define KEY_BROWSER_SEARCH 0x00230000 -#define KEY_BROWSER_FAVORITES 0x00240000 -#define KEY_BROWSER_HOME 0x00250000 -#define KEY_VOLUME_MUTE 0x00260000 -#define KEY_VOLUME_DOWN 0x00270000 -#define KEY_VOLUME_UP 0x00280000 -#define KEY_MEDIA_NEXT_TRACK 0x00290000 -#define KEY_MEDIA_PREV_TRACK 0x002a0000 -#define KEY_MEDIA_STOP 0x002b0000 -#define KEY_MEDIA_PLAY_PAUSE 0x002c0000 +#define KEY_BROWSER_BACK 0x003F0000 +#define KEY_BROWSER_FORWARD 0x00400000 +#define KEY_BROWSER_REFRESH 0x00410000 +#define KEY_BROWSER_STOP 0x00420000 +#define KEY_BROWSER_SEARCH 0x00430000 +#define KEY_BROWSER_FAVORITES 0x00440000 +#define KEY_BROWSER_HOME 0x00450000 +#define KEY_VOLUME_MUTE 0x00460000 +#define KEY_VOLUME_DOWN 0x00470000 +#define KEY_VOLUME_UP 0x00480000 +#define KEY_MEDIA_NEXT_TRACK 0x00490000 +#define KEY_MEDIA_PREV_TRACK 0x004A0000 +#define KEY_MEDIA_STOP 0x004B0000 +#define KEY_MEDIA_PLAY_PAUSE 0x004C0000 -#define KEY_UNSET 0 +#define KEY_MOUSEWHEELUP 0x00F00000 +#define KEY_MOUSEWHEELDOWN 0x00F10000 +#define KEY_MOUSEWHEELLEFT 0x00F20000 +#define KEY_MOUSEWHEELRIGHT 0x00F30000 typedef struct key_descriptor_s { -- 2.39.2