[vlc-commits] commit: merge xcb keysym-table for video_output and global hotkeys ( Ilkka Ollakka )
git at videolan.org
git at videolan.org
Thu Apr 1 13:31:01 CEST 2010
vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Mon Mar 29 15:08:11 2010 +0300| [7422374bdd1e073e88fdeedfcb059d9bb023fc0d] | committer: Ilkka Ollakka
merge xcb keysym-table for video_output and global hotkeys
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7422374bdd1e073e88fdeedfcb059d9bb023fc0d
---
modules/control/globalhotkeys/xcb.c | 31 +-----------
modules/video_output/xcb/keys.c | 89 +--------------------------------
modules/video_output/xcb/xcb_keysym.h | 88 ++++++++++++++++++++++++++++++++
3 files changed, 90 insertions(+), 118 deletions(-)
diff --git a/modules/control/globalhotkeys/xcb.c b/modules/control/globalhotkeys/xcb.c
index 4049e63..fbda041 100644
--- a/modules/control/globalhotkeys/xcb.c
+++ b/modules/control/globalhotkeys/xcb.c
@@ -272,36 +272,7 @@ static const struct
} x11keys_to_vlckeys[] =
{
- { XK_F1, KEY_F1 }, { XK_F2, KEY_F2 }, { XK_F3, KEY_F3 }, { XK_F4, KEY_F4 },
- { XK_F5, KEY_F5 }, { XK_F6, KEY_F6 }, { XK_F7, KEY_F7 }, { XK_F8, KEY_F8 },
- { XK_F9, KEY_F9 }, { XK_F10, KEY_F10 }, { XK_F11, KEY_F11 },
- { XK_F12, KEY_F12 },
-
- { XK_Return, KEY_ENTER },
- { XK_KP_Enter, KEY_ENTER },
- { XK_Escape, KEY_ESC },
-
- { XK_Menu, KEY_MENU },
- { XK_Left, KEY_LEFT },
- { XK_Right, KEY_RIGHT },
- { XK_Up, KEY_UP },
- { XK_Down, KEY_DOWN },
-
- { XK_Home, KEY_HOME },
- { XK_End, KEY_END },
- { XK_Page_Up, KEY_PAGEUP },
- { XK_Page_Down, KEY_PAGEDOWN },
-
- { XK_Insert, KEY_INSERT },
- { XK_Delete, KEY_DELETE },
- { XF86XK_AudioNext, KEY_MEDIA_NEXT_TRACK},
- { XF86XK_AudioPrev, KEY_MEDIA_PREV_TRACK},
- { XF86XK_AudioMute, KEY_VOLUME_MUTE },
- { XF86XK_AudioLowerVolume, KEY_VOLUME_DOWN },
- { XF86XK_AudioRaiseVolume, KEY_VOLUME_UP },
- { XF86XK_AudioPlay, KEY_MEDIA_PLAY_PAUSE },
- { XF86XK_AudioPause, KEY_MEDIA_PLAY_PAUSE },
-
+#include "../../video_output/xcb/xcb_keysym.h"
{ 0, 0 }
};
static xcb_keysym_t GetX11Key( unsigned i_vlc )
diff --git a/modules/video_output/xcb/keys.c b/modules/video_output/xcb/keys.c
index b3a9b42..855b149 100644
--- a/modules/video_output/xcb/keys.c
+++ b/modules/video_output/xcb/keys.c
@@ -85,94 +85,7 @@ static uint_fast32_t ConvertKeySym (xcb_keysym_t sym)
xcb_keysym_t x11;
uint32_t vlc;
} *res, tab[] = {
- /* This list MUST be in XK_* incremental order (see keysymdef.h),
- * so that binary search works.
- * Multiple X keys can match the same VLC key.
- * X key symbols must be in the first column of the struct. */
- { XK_BackSpace, KEY_BACKSPACE, },
- { XK_Tab, KEY_TAB, },
- { XK_Return, KEY_ENTER, },
- { XK_Escape, KEY_ESC, },
- { XK_Home, KEY_HOME, },
- { XK_Left, KEY_LEFT, },
- { XK_Up, KEY_UP, },
- { XK_Right, KEY_RIGHT, },
- { XK_Down, KEY_DOWN, },
- { XK_Page_Up, KEY_PAGEUP, },
- { XK_Page_Down, KEY_PAGEDOWN, },
- { XK_End, KEY_END, },
- { XK_Begin, KEY_HOME, },
- { XK_Insert, KEY_INSERT, },
- { XK_Menu, KEY_MENU },
-
- /* Numeric pad keys */
- { XK_KP_Space, ' ', },
- { XK_KP_Tab, KEY_TAB, },
- { XK_KP_Enter, KEY_ENTER, },
- { XK_KP_F1, KEY_F1, },
- { XK_KP_F2, KEY_F2, },
- { XK_KP_F3, KEY_F3, },
- { XK_KP_F4, KEY_F4, },
- { XK_KP_Home, KEY_HOME, },
- { XK_KP_Left, KEY_LEFT, },
- { XK_KP_Up, KEY_UP, },
- { XK_KP_Right, KEY_RIGHT, },
- { XK_KP_Down, KEY_DOWN, },
- { XK_KP_Page_Up, KEY_PAGEUP, },
- { XK_KP_Page_Down, KEY_PAGEDOWN, },
- { XK_KP_End, KEY_END, },
- { XK_KP_Begin, KEY_HOME, }, /* KP middle (5 without numlock) */
- { XK_KP_Insert, KEY_INSERT, },
- { XK_KP_Delete, KEY_DELETE, },
- { XK_KP_Equal, '=', },
- { XK_KP_Multiply, '*', },
- { XK_KP_Add, '+', },
- { XK_KP_Separator, ',', },
- { XK_KP_Subtract, '-', },
- { XK_KP_Decimal, ',', }, /* FIXME: I don't know that key */
- { XK_KP_Divide, '/', },
- { XK_KP_0, '0', },
- { XK_KP_1, '1', },
- { XK_KP_2, '2', },
- { XK_KP_3, '3', },
- { XK_KP_4, '4', },
- { XK_KP_5, '5', },
- { XK_KP_6, '6', },
- { XK_KP_7, '7', },
- { XK_KP_8, '8', },
- { XK_KP_9, '9', },
-
- { XK_F1, KEY_F1, },
- { XK_F2, KEY_F2, },
- { XK_F3, KEY_F3, },
- { XK_F4, KEY_F4, },
- { XK_F5, KEY_F5, },
- { XK_F6, KEY_F6, },
- { XK_F7, KEY_F7, },
- { XK_F8, KEY_F8, },
- { XK_F9, KEY_F9, },
- { XK_F10, KEY_F10, },
- { XK_F11, KEY_F11, },
- { XK_F12, KEY_F12, },
- { XK_Delete, KEY_DELETE, },
-
- /* XFree86 extensions */
- { XF86XK_AudioLowerVolume, KEY_VOLUME_DOWN, },
- { XF86XK_AudioMute, KEY_VOLUME_MUTE, },
- { XF86XK_AudioRaiseVolume, KEY_VOLUME_UP, },
- { XF86XK_AudioPlay, KEY_MEDIA_PLAY_PAUSE, },
- { XF86XK_AudioStop, KEY_MEDIA_STOP, },
- { XF86XK_AudioPrev, KEY_MEDIA_PREV_TRACK, },
- { XF86XK_AudioNext, KEY_MEDIA_NEXT_TRACK, },
- { XF86XK_HomePage, KEY_BROWSER_HOME, },
- { XF86XK_Search, KEY_BROWSER_SEARCH, },
- { XF86XK_Back, KEY_BROWSER_BACK, },
- { XF86XK_Forward, KEY_BROWSER_FORWARD, },
- { XF86XK_Stop, KEY_BROWSER_STOP, },
- { XF86XK_Refresh, KEY_BROWSER_REFRESH, },
- { XF86XK_Favorites, KEY_BROWSER_FAVORITES, },
- { XF86XK_AudioPause, KEY_MEDIA_PLAY_PAUSE, },
- { XF86XK_Reload, KEY_BROWSER_REFRESH, },
+#include "xcb_keysym.h"
}, old[] = {
#include "keysym.h"
};
diff --git a/modules/video_output/xcb/xcb_keysym.h b/modules/video_output/xcb/xcb_keysym.h
new file mode 100644
index 0000000..51797eb
--- /dev/null
+++ b/modules/video_output/xcb/xcb_keysym.h
@@ -0,0 +1,88 @@
+ /* This list MUST be in XK_* incremental order (see keysymdef.h),
+ * so that binary search works.
+ * Multiple X keys can match the same VLC key.
+ * X key symbols must be in the first column of the struct. */
+ { XK_BackSpace, KEY_BACKSPACE, },
+ { XK_Tab, KEY_TAB, },
+ { XK_Return, KEY_ENTER, },
+ { XK_Escape, KEY_ESC, },
+ { XK_Home, KEY_HOME, },
+ { XK_Left, KEY_LEFT, },
+ { XK_Up, KEY_UP, },
+ { XK_Right, KEY_RIGHT, },
+ { XK_Down, KEY_DOWN, },
+ { XK_Page_Up, KEY_PAGEUP, },
+ { XK_Page_Down, KEY_PAGEDOWN, },
+ { XK_End, KEY_END, },
+ { XK_Begin, KEY_HOME, },
+ { XK_Insert, KEY_INSERT, },
+ { XK_Menu, KEY_MENU },
+
+ /* Numeric pad keys */
+ { XK_KP_Space, ' ', },
+ { XK_KP_Tab, KEY_TAB, },
+ { XK_KP_Enter, KEY_ENTER, },
+ { XK_KP_F1, KEY_F1, },
+ { XK_KP_F2, KEY_F2, },
+ { XK_KP_F3, KEY_F3, },
+ { XK_KP_F4, KEY_F4, },
+ { XK_KP_Home, KEY_HOME, },
+ { XK_KP_Left, KEY_LEFT, },
+ { XK_KP_Up, KEY_UP, },
+ { XK_KP_Right, KEY_RIGHT, },
+ { XK_KP_Down, KEY_DOWN, },
+ { XK_KP_Page_Up, KEY_PAGEUP, },
+ { XK_KP_Page_Down, KEY_PAGEDOWN, },
+ { XK_KP_End, KEY_END, },
+ { XK_KP_Begin, KEY_HOME, }, /* KP middle (5 without numlock) */
+ { XK_KP_Insert, KEY_INSERT, },
+ { XK_KP_Delete, KEY_DELETE, },
+ { XK_KP_Equal, '=', },
+ { XK_KP_Multiply, '*', },
+ { XK_KP_Add, '+', },
+ { XK_KP_Separator, ',', },
+ { XK_KP_Subtract, '-', },
+ { XK_KP_Decimal, ',', }, /* FIXME: I don't know that key */
+ { XK_KP_Divide, '/', },
+ { XK_KP_0, '0', },
+ { XK_KP_1, '1', },
+ { XK_KP_2, '2', },
+ { XK_KP_3, '3', },
+ { XK_KP_4, '4', },
+ { XK_KP_5, '5', },
+ { XK_KP_6, '6', },
+ { XK_KP_7, '7', },
+ { XK_KP_8, '8', },
+ { XK_KP_9, '9', },
+
+ { XK_F1, KEY_F1, },
+ { XK_F2, KEY_F2, },
+ { XK_F3, KEY_F3, },
+ { XK_F4, KEY_F4, },
+ { XK_F5, KEY_F5, },
+ { XK_F6, KEY_F6, },
+ { XK_F7, KEY_F7, },
+ { XK_F8, KEY_F8, },
+ { XK_F9, KEY_F9, },
+ { XK_F10, KEY_F10, },
+ { XK_F11, KEY_F11, },
+ { XK_F12, KEY_F12, },
+ { XK_Delete, KEY_DELETE, },
+
+ /* XFree86 extensions */
+ { XF86XK_AudioLowerVolume, KEY_VOLUME_DOWN, },
+ { XF86XK_AudioMute, KEY_VOLUME_MUTE, },
+ { XF86XK_AudioRaiseVolume, KEY_VOLUME_UP, },
+ { XF86XK_AudioPlay, KEY_MEDIA_PLAY_PAUSE, },
+ { XF86XK_AudioStop, KEY_MEDIA_STOP, },
+ { XF86XK_AudioPrev, KEY_MEDIA_PREV_TRACK, },
+ { XF86XK_AudioNext, KEY_MEDIA_NEXT_TRACK, },
+ { XF86XK_HomePage, KEY_BROWSER_HOME, },
+ { XF86XK_Search, KEY_BROWSER_SEARCH, },
+ { XF86XK_Back, KEY_BROWSER_BACK, },
+ { XF86XK_Forward, KEY_BROWSER_FORWARD, },
+ { XF86XK_Stop, KEY_BROWSER_STOP, },
+ { XF86XK_Refresh, KEY_BROWSER_REFRESH, },
+ { XF86XK_Favorites, KEY_BROWSER_FAVORITES, },
+ { XF86XK_AudioPause, KEY_MEDIA_PLAY_PAUSE, },
+ { XF86XK_Reload, KEY_BROWSER_REFRESH, },
More information about the vlc-commits
mailing list