This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 53/61] Move tui_dispatch_ctrl_char to tui-io.c
- From: Tom Tromey <tom at tromey dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tom at tromey dot com>
- Date: Thu, 4 Jul 2019 11:03:03 -0600
- Subject: [PATCH 53/61] Move tui_dispatch_ctrl_char to tui-io.c
- References: <20190704170311.15982-1-tom@tromey.com>
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.
2019-07-04 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.
---
gdb/ChangeLog | 7 ++++++
gdb/tui/tui-command.c | 51 -------------------------------------------
gdb/tui/tui-command.h | 2 --
gdb/tui/tui-io.c | 51 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 58 insertions(+), 53 deletions(-)
diff --git a/gdb/tui/tui-command.c b/gdb/tui/tui-command.c
index bd16f801d26..1a269e7fb51 100644
--- a/gdb/tui/tui-command.c
+++ b/gdb/tui/tui-command.c
@@ -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
diff --git a/gdb/tui/tui-command.h b/gdb/tui/tui-command.h
index 80f69caf61b..3f84ee22fa8 100644
--- a/gdb/tui/tui-command.h
+++ b/gdb/tui/tui-command.h
@@ -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);
diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c
index 51f69185da3..70e5310dd13 100644
--- a/gdb/tui/tui-io.c
+++ b/gdb/tui/tui-io.c
@@ -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
--
2.17.2