diff options
-rw-r--r-- | frontend_local.c | 16 | ||||
-rw-r--r-- | frontend_svr.c | 5 |
2 files changed, 16 insertions, 5 deletions
diff --git a/frontend_local.c b/frontend_local.c index c3e523ed..0d5268c2 100644 --- a/frontend_local.c +++ b/frontend_local.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: frontend_local.c,v 1.11 2006-09-20 05:47:52 phintuka Exp $ + * $Id: frontend_local.c,v 1.12 2006-10-18 08:41:08 phintuka Exp $ * */ @@ -220,13 +220,21 @@ int cXinelibLocal::Xine_Control(const char *cmd) extern "C" { static void keypress_handler(const char *keymap, const char *key) { - if(!xc.use_x_keyboard || !key) { + if(!strncmp("TRACKMAP", keymap, 8)) { + + cXinelibThread::InfoHandler(keymap); + + } else if(!xc.use_x_keyboard || !key) { + /* Only X11 key events came this way in local mode. Keyboard is handled by vdr. */ LOGMSG("keypress_handler(%s): X11 Keyboard disabled in config", key); - return; + + } else { + + cXinelibThread::KeypressHandler(keymap, key, false, false); + } - cXinelibThread::KeypressHandler(keymap, key, false, false); } }; diff --git a/frontend_svr.c b/frontend_svr.c index 509117d5..0694e0f9 100644 --- a/frontend_svr.c +++ b/frontend_svr.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: frontend_svr.c,v 1.23 2006-10-07 19:54:05 phintuka Exp $ + * $Id: frontend_svr.c,v 1.24 2006-10-18 08:41:08 phintuka Exp $ * */ @@ -1223,6 +1223,9 @@ void cXinelibServer::Handle_Control(int cli, const char *cmd) } } + } else if(!strncmp(cmd, "TRACKMAP ", 9)) { + cXinelibThread::InfoHandler(cmd); + } else if(!strncasecmp(cmd, "GRAB ", 5)) { Handle_Control_GRAB(cli, cmd+5); |