From 055803dbac652e784163b5962834bb7faee56e3c Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Mon, 20 Mar 2017 17:58:54 +0100 Subject: [PATCH] - generic-pc: add some more and change some existing keys; ... I've tried to keep the functions on the right keys. 'r' for Radio, 't' for TV and so on. --- generic-pc/clutterfb.cpp | 70 +++++++++++++++++++++++++++------------- generic-pc/glfb.cpp | 58 +++++++++++++++++++++++---------- 2 files changed, 88 insertions(+), 40 deletions(-) diff --git a/generic-pc/clutterfb.cpp b/generic-pc/clutterfb.cpp index e23d943..7d2a825 100644 --- a/generic-pc/clutterfb.cpp +++ b/generic-pc/clutterfb.cpp @@ -137,35 +137,35 @@ GLFbPC::~GLFbPC() void GLFbPC::initKeys() { - mKeyMap[CLUTTER_KEY_Up] = KEY_UP; - mKeyMap[CLUTTER_KEY_Down] = KEY_DOWN; - mKeyMap[CLUTTER_KEY_Left] = KEY_LEFT; - mKeyMap[CLUTTER_KEY_Right] = KEY_RIGHT; + /* + Keep in sync with initKeys() in glfb.cpp + */ - mKeyMap[CLUTTER_KEY_F1] = KEY_RED; - mKeyMap[CLUTTER_KEY_F2] = KEY_GREEN; - mKeyMap[CLUTTER_KEY_F3] = KEY_YELLOW; - mKeyMap[CLUTTER_KEY_F4] = KEY_BLUE; + mSpecialMap[CLUTTER_KEY_Up] = KEY_UP; + mSpecialMap[CLUTTER_KEY_Down] = KEY_DOWN; + mSpecialMap[CLUTTER_KEY_Left] = KEY_LEFT; + mSpecialMap[CLUTTER_KEY_Right] = KEY_RIGHT; - mKeyMap[CLUTTER_KEY_F5] = KEY_WWW; - mKeyMap[CLUTTER_KEY_F6] = KEY_SUBTITLE; - mKeyMap[CLUTTER_KEY_F7] = KEY_MOVE; - mKeyMap[CLUTTER_KEY_F8] = KEY_SLEEP; + mSpecialMap[CLUTTER_KEY_F1] = KEY_RED; + mSpecialMap[CLUTTER_KEY_F2] = KEY_GREEN; + mSpecialMap[CLUTTER_KEY_F3] = KEY_YELLOW; + mSpecialMap[CLUTTER_KEY_F4] = KEY_BLUE; - mKeyMap[CLUTTER_KEY_Page_Up] = KEY_PAGEUP; - mKeyMap[CLUTTER_KEY_Page_Down] = KEY_PAGEDOWN; + mSpecialMap[CLUTTER_KEY_F5] = KEY_RECORD; + mSpecialMap[CLUTTER_KEY_F6] = KEY_PLAY; + mSpecialMap[CLUTTER_KEY_F7] = KEY_PAUSE; + mSpecialMap[CLUTTER_KEY_F8] = KEY_STOP; + + mSpecialMap[CLUTTER_KEY_F9] = KEY_FORWARD; + mSpecialMap[CLUTTER_KEY_F10] = KEY_REWIND; + mSpecialMap[CLUTTER_KEY_F11] = KEY_NEXT; + mSpecialMap[CLUTTER_KEY_F12] = KEY_PREVIOUS; + + mSpecialMap[CLUTTER_KEY_Page_Up] = KEY_PAGEUP; + mSpecialMap[CLUTTER_KEY_Page_Down] = KEY_PAGEDOWN; mKeyMap[CLUTTER_KEY_Return] = KEY_OK; mKeyMap[CLUTTER_KEY_Escape] = KEY_EXIT; - mKeyMap['e'] = KEY_EPG; - mKeyMap['i'] = KEY_INFO; - mKeyMap['m'] = KEY_MENU; - - mKeyMap['+'] = KEY_VOLUMEUP; - mKeyMap['-'] = KEY_VOLUMEDOWN; - mKeyMap['.'] = KEY_MUTE; - mKeyMap['h'] = KEY_HELP; - mKeyMap['p'] = KEY_POWER; mKeyMap['0'] = KEY_0; mKeyMap['1'] = KEY_1; @@ -177,6 +177,30 @@ void GLFbPC::initKeys() mKeyMap['7'] = KEY_7; mKeyMap['8'] = KEY_8; mKeyMap['9'] = KEY_9; + + mKeyMap['+'] = KEY_VOLUMEUP; + mKeyMap['-'] = KEY_VOLUMEDOWN; + mKeyMap['.'] = KEY_MUTE; + mKeyMap['a'] = KEY_AUDIO; + mKeyMap['e'] = KEY_EPG; + // ['f'] is reserved to toggle fullscreen; + mKeyMap['g'] = KEY_GAMES; + mKeyMap['h'] = KEY_HELP; + mKeyMap['i'] = KEY_INFO; + mKeyMap['m'] = KEY_MENU; + mKeyMap['p'] = KEY_POWER; + mKeyMap['r'] = KEY_RADIO; + mKeyMap['s'] = KEY_SUBTITLE; + mKeyMap['t'] = KEY_TV; + mKeyMap['v'] = KEY_VIDEO; + mKeyMap['z'] = KEY_SLEEP; + + /* shift keys */ + mKeyMap['F'] = KEY_FAVORITES; + mKeyMap['M'] = KEY_MODE; + mKeyMap['S'] = KEY_SAT; + mKeyMap['T'] = KEY_TEXT; + mKeyMap['W'] = KEY_WWW; } static ClutterActor *stage = NULL; diff --git a/generic-pc/glfb.cpp b/generic-pc/glfb.cpp index d993a3b..5fec9de 100644 --- a/generic-pc/glfb.cpp +++ b/generic-pc/glfb.cpp @@ -135,35 +135,35 @@ GLFbPC::~GLFbPC() void GLFbPC::initKeys() { + /* + Keep in sync with initKeys() in clutterfb.cpp + */ + mSpecialMap[GLUT_KEY_UP] = KEY_UP; mSpecialMap[GLUT_KEY_DOWN] = KEY_DOWN; mSpecialMap[GLUT_KEY_LEFT] = KEY_LEFT; mSpecialMap[GLUT_KEY_RIGHT] = KEY_RIGHT; - mSpecialMap[GLUT_KEY_F1] = KEY_RED; - mSpecialMap[GLUT_KEY_F2] = KEY_GREEN; - mSpecialMap[GLUT_KEY_F3] = KEY_YELLOW; - mSpecialMap[GLUT_KEY_F4] = KEY_BLUE; + mSpecialMap[GLUT_KEY_F1] = KEY_RED; + mSpecialMap[GLUT_KEY_F2] = KEY_GREEN; + mSpecialMap[GLUT_KEY_F3] = KEY_YELLOW; + mSpecialMap[GLUT_KEY_F4] = KEY_BLUE; - mSpecialMap[GLUT_KEY_F5] = KEY_WWW; - mSpecialMap[GLUT_KEY_F6] = KEY_SUBTITLE; - mSpecialMap[GLUT_KEY_F7] = KEY_MOVE; - mSpecialMap[GLUT_KEY_F8] = KEY_SLEEP; + mSpecialMap[GLUT_KEY_F5] = KEY_RECORD; + mSpecialMap[GLUT_KEY_F6] = KEY_PLAY; + mSpecialMap[GLUT_KEY_F7] = KEY_PAUSE; + mSpecialMap[GLUT_KEY_F9] = KEY_STOP; + + mSpecialMap[GLUT_KEY_F9] = KEY_FORWARD; + mSpecialMap[GLUT_KEY_F10] = KEY_REWIND; + mSpecialMap[GLUT_KEY_F11] = KEY_NEXT; + mSpecialMap[GLUT_KEY_F12] = KEY_PREVIOUS; mSpecialMap[GLUT_KEY_PAGE_UP] = KEY_PAGEUP; mSpecialMap[GLUT_KEY_PAGE_DOWN] = KEY_PAGEDOWN; mKeyMap[0x0d] = KEY_OK; mKeyMap[0x1b] = KEY_EXIT; - mKeyMap['e'] = KEY_EPG; - mKeyMap['i'] = KEY_INFO; - mKeyMap['m'] = KEY_MENU; - - mKeyMap['+'] = KEY_VOLUMEUP; - mKeyMap['-'] = KEY_VOLUMEDOWN; - mKeyMap['.'] = KEY_MUTE; - mKeyMap['h'] = KEY_HELP; - mKeyMap['p'] = KEY_POWER; mKeyMap['0'] = KEY_0; mKeyMap['1'] = KEY_1; @@ -175,6 +175,30 @@ void GLFbPC::initKeys() mKeyMap['7'] = KEY_7; mKeyMap['8'] = KEY_8; mKeyMap['9'] = KEY_9; + + mKeyMap['+'] = KEY_VOLUMEUP; + mKeyMap['-'] = KEY_VOLUMEDOWN; + mKeyMap['.'] = KEY_MUTE; + mKeyMap['a'] = KEY_AUDIO; + mKeyMap['e'] = KEY_EPG; + // ['f'] is reserved to toggle fullscreen; + mKeyMap['g'] = KEY_GAMES; + mKeyMap['h'] = KEY_HELP; + mKeyMap['i'] = KEY_INFO; + mKeyMap['m'] = KEY_MENU; + mKeyMap['p'] = KEY_POWER; + mKeyMap['r'] = KEY_RADIO; + mKeyMap['s'] = KEY_SUBTITLE; + mKeyMap['t'] = KEY_TV; + mKeyMap['v'] = KEY_VIDEO; + mKeyMap['z'] = KEY_SLEEP; + + /* shift keys */ + mKeyMap['F'] = KEY_FAVORITES; + mKeyMap['M'] = KEY_MODE; + mKeyMap['S'] = KEY_SAT; + mKeyMap['T'] = KEY_TEXT; + mKeyMap['W'] = KEY_WWW; } void GLFramebuffer::run()