aboutsummaryrefslogtreecommitdiff
path: root/gdb/tui/tui-command.c
diff options
context:
space:
mode:
authorPatrick Palka <patrick@parcs.ath.cx>2015-05-13 16:26:48 -0400
committerPatrick Palka <patrick@parcs.ath.cx>2015-05-14 08:18:06 -0400
commite3555239e04fa6dba2a165b3b52598a880474a22 (patch)
tree157984015f197084d85dd271980d254c1278a3c6 /gdb/tui/tui-command.c
parentfdc3b1b1ef461fb81a53c9ce95117e5f134fc828 (diff)
downloadgdb-e3555239e04fa6dba2a165b3b52598a880474a22.zip
gdb-e3555239e04fa6dba2a165b3b52598a880474a22.tar.gz
gdb-e3555239e04fa6dba2a165b3b52598a880474a22.tar.bz2
Remove buggy xterm workaround in tui_dispatch_ctrl_char()
The function tui_dispatch_ctrl_char() has an old workaround (from 1999) for buggy terminals and/or ncurses library that don't return page up/down keys as single characters. Because the workaround is so old, I think the bug it is targetting is no longer relevant anymore. But more importantly, the workaround is itself buggy: it 1) performs a blocking call to wgetch() and 2) if the key returned by wgetch() does not make up a relevant key sequence it throws away the input instead of pushing it back via ungetch(). And indeed the workaround breaks Alt-key sequences under TERM=xterm because of bug #2. So this patch removes the buggy workaround and tidies up the function accordingly. I personally tested this change on a recent xterm (with TERM=xterm) in Fedora 20 and had no problems with having ncurses properly interpret page up/down keys. And Alt-key sequences now work when TERM=xterm too. gdb/ChangeLog: * tui/tui-command.c: Remove include of <ctype.h>. (tui_dispatch_ctrl_char): Remove workaround for xterm terminals.
Diffstat (limited to 'gdb/tui/tui-command.c')
-rw-r--r--gdb/tui/tui-command.c105
1 files changed, 32 insertions, 73 deletions
diff --git a/gdb/tui/tui-command.c b/gdb/tui/tui-command.c
index 3551063..03ec076 100644
--- a/gdb/tui/tui-command.c
+++ b/gdb/tui/tui-command.c
@@ -20,7 +20,6 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-#include <ctype.h>
#include "tui/tui.h"
#include "tui/tui-data.h"
#include "tui/tui-win.h"
@@ -54,80 +53,40 @@ tui_dispatch_ctrl_char (unsigned int ch)
on through and do nothing here. */
if (win_info == NULL || win_info == TUI_CMD_WIN)
return ch;
- else
+
+ switch (ch)
{
- unsigned int c = 0, ch_copy = ch;
- int i;
- char *term;
-
- /* If this is an xterm, page next/prev keys aren't returned by
- keypad as a single char, so we must handle them here. Seems
- like a bug in the curses library? */
- term = (char *) getenv ("TERM");
- if (term)
- {
- for (i = 0; term[i]; i++)
- term[i] = toupper (term[i]);
- if ((strcmp (term, "XTERM") == 0)
- && key_is_start_sequence (ch))
- {
- unsigned int page_ch = 0;
- unsigned int tmp_char;
- WINDOW *w = TUI_CMD_WIN->generic.handle;
-
- tmp_char = 0;
- while (!key_is_end_sequence (tmp_char))
- {
- tmp_char = (int) wgetch (w);
- if (tmp_char == ERR)
- {
- return ch;
- }
- if (!tmp_char)
- break;
- if (tmp_char == 53)
- page_ch = KEY_PPAGE;
- else if (tmp_char == 54)
- page_ch = KEY_NPAGE;
- else
- {
- return 0;
- }
- }
- ch_copy = page_ch;
- }
- }
-
- switch (ch_copy)
- {
- case KEY_NPAGE:
- tui_scroll_forward (win_info, 0);
- break;
- case KEY_PPAGE:
- tui_scroll_backward (win_info, 0);
- break;
- case KEY_DOWN:
- case KEY_SF:
- tui_scroll_forward (win_info, 1);
- break;
- case KEY_UP:
- case KEY_SR:
- tui_scroll_backward (win_info, 1);
- break;
- case KEY_RIGHT:
- tui_scroll_left (win_info, 1);
- break;
- case KEY_LEFT:
- tui_scroll_right (win_info, 1);
- break;
- case '\f':
- break;
- default:
- c = ch_copy;
- break;
- }
- return c;
+ case KEY_NPAGE:
+ tui_scroll_forward (win_info, 0);
+ break;
+ case KEY_PPAGE:
+ tui_scroll_backward (win_info, 0);
+ break;
+ case KEY_DOWN:
+ case KEY_SF:
+ tui_scroll_forward (win_info, 1);
+ break;
+ case KEY_UP:
+ case KEY_SR:
+ tui_scroll_backward (win_info, 1);
+ break;
+ case KEY_RIGHT:
+ tui_scroll_left (win_info, 1);
+ break;
+ case KEY_LEFT:
+ tui_scroll_right (win_info, 1);
+ break;
+ case '\f':
+ break;
+ default:
+ /* We didn't recognize the character as a control character, so pass it
+ through. */
+ return ch;
}
+
+ /* We intercepted the control character, so return 0 (which readline
+ will interpret as a no-op). */
+ return 0;
}
/* See tui-command.h. */