mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #2988: When an unknown key is pressed, it is interpreted as garbage.

Browse Source 
keyboard input: simplify code, no logic changes

This change slightly simplifies and rearranges the code
in get_key_code(), reduces indentation levels there,
adds a few comments. The logic remains the same.

This is a preparatory patch for subsequent changes.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Denys Vlasenko 2013-05-20 15:34:21 +03:00 committed by Slava Zanko
parent f09b3198ec
commit 77cfaf03cb
1 changed files with 62 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/tty/key.c
View File

@ -2,7 +2,7 @@
Keyboard support routines. Keyboard support routines.
Copyright (C) 1994, 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, Copyright (C) 1994, 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007, 2009, 2010, 2011 2005, 2006, 2007, 2009, 2010, 2011, 2013
The Free Software Foundation, Inc. The Free Software Foundation, Inc.
Written by: Written by:
@ -10,6 +10,8 @@
Janne Kukonlehto, 1994, 1995 Janne Kukonlehto, 1994, 1995
Jakub Jelinek, 1995 Jakub Jelinek, 1995
Norbert Warmuth, 1997 Norbert Warmuth, 1997
Denys Vlasenko <vda.linux@googlemail.com>, 2013
Slava Zanko <slavazanko@gmail.com>, 2013
This file is part of the Midnight Commander. This file is part of the Midnight Commander.
@ -1747,7 +1749,7 @@ get_key_code (int no_delay)
int d; int d;
d = *pending_keys++; d = *pending_keys++;
while (d == ESC_CHAR && *pending_keys != '\0') while (d == ESC_CHAR)
d = ALT (*pending_keys++); d = ALT (*pending_keys++);
if (*pending_keys == '\0') if (*pending_keys == '\0')
@ -1828,12 +1830,22 @@ get_key_code (int no_delay)
this = keys->child; this = keys->child;
} }
} }
while (this != NULL) while (this != NULL)
{ {
if (c == this->ch) if (c == this->ch)
{ {
if (this->child) if (!this->child)
{ {
/* We got a complete match, return and reset search */
int code;
pending_keys = seq_append = NULL;
code = this->code;
this = NULL;
return correct_key_code (code);
}
/* No match yet, but it may be a prefix for a valid seq */
if (!push_char (c)) if (!push_char (c))
{ {
pending_keys = seq_buffer; pending_keys = seq_buffer;
@ -1846,12 +1858,6 @@ get_key_code (int no_delay)
if (no_delay) if (no_delay)
{ {
GET_TIME (esctime); GET_TIME (esctime);
if (this == NULL)
{
/* Shouldn't happen */
fputs ("Internal error\n", stderr);
exit (EXIT_FAILURE);
}
goto nodelay_try_again; goto nodelay_try_again;
} }
esctime.tv_sec = -1; esctime.tv_sec = -1;
@ -1862,31 +1868,22 @@ get_key_code (int no_delay)
this = NULL; this = NULL;
return ESC_CHAR; return ESC_CHAR;
} }
continue;
} }
else
{
if (no_delay) if (no_delay)
goto nodelay_try_again; goto nodelay_try_again;
c = tty_lowlevel_getch (); c = tty_lowlevel_getch ();
continue;
} }
}
else
{
/* We got a complete match, return and reset search */
int code;
pending_keys = seq_append = NULL; /* c != this->ch. Try other keys with this prefix */
code = this->code;
this = NULL;
return correct_key_code (code);
}
}
else
{
if (this->next != NULL) if (this->next != NULL)
this = this->next;
else
{ {
this = this->next;
continue;
}
/* No match found. Is it one of our ESC <key> specials? */
if ((parent != NULL) && (parent->action == MCKEY_ESCAPE)) if ((parent != NULL) && (parent->action == MCKEY_ESCAPE))
{ {
/* Convert escape-digits to F-keys */ /* Convert escape-digits to F-keys */
@ -1901,15 +1898,14 @@ get_key_code (int no_delay)
this = NULL; this = NULL;
return correct_key_code (c); return correct_key_code (c);
} }
/* Did not find a match or {c} was changed in the if above,
so we have to return everything we had skipped /* Unknown sequence. Maybe a prefix of a longer one. Save it. */
*/
push_char (c); push_char (c);
pending_keys = seq_buffer; pending_keys = seq_buffer;
goto pend_send; goto pend_send;
}
} } /* while (this != NULL) */
}
this = NULL; this = NULL;
return correct_key_code (c); return correct_key_code (c);
} }