mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +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

128
lib/tty/key.c
View File

@ -2,7 +2,7 @@
Keyboard support routines.
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.
Written by:
@ -10,6 +10,8 @@
Janne Kukonlehto, 1994, 1995
Jakub Jelinek, 1995
Norbert Warmuth, 1997
Denys Vlasenko <vda.linux@googlemail.com>, 2013
Slava Zanko <slavazanko@gmail.com>, 2013
This file is part of the Midnight Commander.
@ -1747,7 +1749,7 @@ get_key_code (int no_delay)
int d;
d = *pending_keys++;
while (d == ESC_CHAR && *pending_keys != '\0')
while (d == ESC_CHAR)
d = ALT (*pending_keys++);
if (*pending_keys == '\0')
@ -1828,49 +1830,12 @@ get_key_code (int no_delay)
this = keys->child;
}
}
while (this != NULL)
{
if (c == this->ch)
{
if (this->child)
{
if (!push_char (c))
{
pending_keys = seq_buffer;
goto pend_send;
}
parent = this;
this = this->child;
if (parent->action == MCKEY_ESCAPE && old_esc_mode)
{
if (no_delay)
{
GET_TIME (esctime);
if (this == NULL)
{
/* Shouldn't happen */
fputs ("Internal error\n", stderr);
exit (EXIT_FAILURE);
}
goto nodelay_try_again;
}
esctime.tv_sec = -1;
c = xgetch_second ();
if (c == -1)
{
pending_keys = seq_append = NULL;
this = NULL;
return ESC_CHAR;
}
}
else
{
if (no_delay)
goto nodelay_try_again;
c = tty_lowlevel_getch ();
}
}
else
if (!this->child)
{
/* We got a complete match, return and reset search */
int code;
@ -1880,36 +1845,67 @@ get_key_code (int no_delay)
this = NULL;
return correct_key_code (code);
}
}
else
{
if (this->next != NULL)
this = this->next;
else
/* No match yet, but it may be a prefix for a valid seq */
if (!push_char (c))
{
if ((parent != NULL) && (parent->action == MCKEY_ESCAPE))
{
/* Convert escape-digits to F-keys */
if (g_ascii_isdigit (c))
c = KEY_F (c - '0');
else if (c == ' ')
c = ESC_CHAR;
else
c = ALT (c);
pending_keys = seq_append = NULL;
this = NULL;
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
*/
push_char (c);
pending_keys = seq_buffer;
goto pend_send;
}
parent = this;
this = this->child;
if (parent->action == MCKEY_ESCAPE && old_esc_mode)
{
if (no_delay)
{
GET_TIME (esctime);
goto nodelay_try_again;
}
esctime.tv_sec = -1;
c = xgetch_second ();
if (c == -1)
{
pending_keys = seq_append = NULL;
this = NULL;
return ESC_CHAR;
}
continue;
}
if (no_delay)
goto nodelay_try_again;
c = tty_lowlevel_getch ();
continue;
}
}
/* c != this->ch. Try other keys with this prefix */
if (this->next != NULL)
{
this = this->next;
continue;
}
/* No match found. Is it one of our ESC <key> specials? */
if ((parent != NULL) && (parent->action == MCKEY_ESCAPE))
{
/* Convert escape-digits to F-keys */
if (g_ascii_isdigit (c))
c = KEY_F (c - '0');
else if (c == ' ')
c = ESC_CHAR;
else
c = ALT (c);
pending_keys = seq_append = NULL;
this = NULL;
return correct_key_code (c);
}
/* Unknown sequence. Maybe a prefix of a longer one. Save it. */
push_char (c);
pending_keys = seq_buffer;
goto pend_send;
} /* while (this != NULL) */
this = NULL;
return correct_key_code (c);
}