mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-30 12:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move tui_dispatch_ctrl_char to tui-io.c

Browse Source 
tui_dispatch_ctrl_char is only called from a single spot in tui-io.c,
so move the function to that file and make it static.

gdb/ChangeLog
2019-07-17  Tom Tromey  <tom@tromey.com>

	* tui/tui-io.c (tui_dispatch_ctrl_char): Move from tui-command.c.
	Now static.
	* tui/tui-command.h (tui_dispatch_ctrl_char): Don't declare.
	* tui/tui-command.c (tui_dispatch_ctrl_char): Move to tui-io.c.
This commit is contained in:
Tom Tromey 2019-07-02 15:43:00 -06:00
parent 18ab23af8b
commit 2d8b51cba3
4 changed files with 58 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-io.c (tui_dispatch_ctrl_char): Move from tui-command.c.
Now static.
* tui/tui-command.h (tui_dispatch_ctrl_char): Don't declare.
* tui/tui-command.c (tui_dispatch_ctrl_char): Move to tui-io.c.
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui.c: Update.

51
gdb/tui/tui-command.c
View File

@ -37,57 +37,6 @@
** PUBLIC FUNCTIONS **
******************************************/
/* Dispatch the correct tui function based upon the control
character. */
unsigned int
tui_dispatch_ctrl_char (unsigned int ch)
{
struct tui_win_info *win_info = tui_win_with_focus ();
/* Handle the CTRL-L refresh for each window. */
if (ch == '\f')
tui_refresh_all_win ();
/* If no window has the focus, or if the focus window can't scroll,
just pass the character through. */
if (win_info == NULL || !win_info->can_scroll ())
return ch;
switch (ch)
{
case KEY_NPAGE:
win_info->forward_scroll (0);
break;
case KEY_PPAGE:
win_info->backward_scroll (0);
break;
case KEY_DOWN:
case KEY_SF:
win_info->forward_scroll (1);
break;
case KEY_UP:
case KEY_SR:
win_info->backward_scroll (1);
break;
case KEY_RIGHT:
win_info->left_scroll (1);
break;
case KEY_LEFT:
win_info->right_scroll (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. */
void

2
gdb/tui/tui-command.h
View File

@ -22,8 +22,6 @@
#ifndef TUI_TUI_COMMAND_H
#define TUI_TUI_COMMAND_H
extern unsigned int tui_dispatch_ctrl_char (unsigned int);
/* Refresh the command window. */
extern void tui_refresh_cmd_win (void);

51
gdb/tui/tui-io.c
View File

@ -912,6 +912,57 @@ tui_initialize_io (void)
#endif
}
/* Dispatch the correct tui function based upon the control
character. */
static unsigned int
tui_dispatch_ctrl_char (unsigned int ch)
{
struct tui_win_info *win_info = tui_win_with_focus ();
/* Handle the CTRL-L refresh for each window. */
if (ch == '\f')
tui_refresh_all_win ();
/* If no window has the focus, or if the focus window can't scroll,
just pass the character through. */
if (win_info == NULL || !win_info->can_scroll ())
return ch;
switch (ch)
{
case KEY_NPAGE:
win_info->forward_scroll (0);
break;
case KEY_PPAGE:
win_info->backward_scroll (0);
break;
case KEY_DOWN:
case KEY_SF:
win_info->forward_scroll (1);
break;
case KEY_UP:
case KEY_SR:
win_info->backward_scroll (1);
break;
case KEY_RIGHT:
win_info->left_scroll (1);
break;
case KEY_LEFT:
win_info->right_scroll (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;
}
/* Get a character from the command window. This is called from the
readline package. */
static int