summaryrefslogtreecommitdiffstats
path: root/libmenu/menu_console.c
diff options
context:
space:
mode:
authorulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-26 13:13:48 +0000
committerulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-26 13:13:48 +0000
commitb6870cc5ba1c9b43307af26f47ed5bc0c2d5c7de (patch)
treead3f2ccc5feb5f6dcff877f6e3e8ab0e1e5d8ffb /libmenu/menu_console.c
parent2b517dc714c02f654d032e9d68815281a613cafa (diff)
downloadmpv-b6870cc5ba1c9b43307af26f47ed5bc0c2d5c7de.tar.bz2
mpv-b6870cc5ba1c9b43307af26f47ed5bc0c2d5c7de.tar.xz
From now on, libmenu does not steal all input keys from input modules.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25530 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmenu/menu_console.c')
-rw-r--r--libmenu/menu_console.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/libmenu/menu_console.c b/libmenu/menu_console.c
index d54611e241..abc941cdca 100644
--- a/libmenu/menu_console.c
+++ b/libmenu/menu_console.c
@@ -419,20 +419,20 @@ static void read_cmd(menu_t* menu,int cmd) {
}
}
-static void read_key(menu_t* menu,int c) {
+static int read_key(menu_t* menu,int c) {
if(mpriv->child && mpriv->raw_child) {
write(mpriv->child_fd[0],&c,sizeof(int));
- return;
+ return 1;
}
if (c == KEY_DELETE || c == KEY_BS) {
unsigned int i = strlen(mpriv->cur_history->buffer);
if(i > 0)
mpriv->cur_history->buffer[i-1] = '\0';
- return;
+ return 1;
}
if (menu_dflt_read_key(menu, c))
- return;
+ return 1;
if(isascii(c)) {
int l = strlen(mpriv->cur_history->buffer);
@@ -442,8 +442,9 @@ static void read_key(menu_t* menu,int c) {
}
mpriv->cur_history->buffer[l] = (char)c;
mpriv->cur_history->buffer[l+1] = '\0';
+ return 1;
}
- return;
+ return 0;
}