This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] Use getcurx in curses code
- From: Tom Tromey <tromey at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 14 Jul 2016 16:41:42 -0000
- Subject: [binutils-gdb] Use getcurx in curses code
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cecc8b99060bf82632345bd1c07d50c7ae8d81ef
commit cecc8b99060bf82632345bd1c07d50c7ae8d81ef
Author: Tom Tromey <tom@tromey.com>
Date: Tue Jun 28 14:25:49 2016 -0600
Use getcurx in curses code
As suggested by Pedro, this changes a few spots to use getcurx, rather
than getyx. This avoids some unused variable warnings.
2016-07-14 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.c (tui_show_source_line): Use getcurx.
* tui/tui-io.c (tui_puts): Use getcurx.
(tui_redisplay_readline): Likewise.
Diff:
---
gdb/ChangeLog | 6 ++++++
gdb/tui/tui-io.c | 12 ++++++------
gdb/tui/tui-winsource.c | 6 +++---
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f5c0072..6961383 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2016-07-14 Tom Tromey <tom@tromey.com>
+ * tui/tui-winsource.c (tui_show_source_line): Use getcurx.
+ * tui/tui-io.c (tui_puts): Use getcurx.
+ (tui_redisplay_readline): Likewise.
+
+2016-07-14 Tom Tromey <tom@tromey.com>
+
* inflow.c (child_terminal_ours_1): Use ATTRIBUTE_UNUSED.
2016-07-14 Tom Tromey <tom@tromey.com>
diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c
index ed79b44..93bed88 100644
--- a/gdb/tui/tui-io.c
+++ b/gdb/tui/tui-io.c
@@ -172,9 +172,9 @@ tui_puts (const char *string)
/* Expand TABs, since ncurses on MS-Windows doesn't. */
if (c == '\t')
{
- int line, col;
+ int col;
- getyx (w, line, col);
+ col = getcurx (w);
do
{
waddch (w, ' ');
@@ -198,7 +198,7 @@ tui_redisplay_readline (void)
{
int prev_col;
int height;
- int col, line;
+ int col;
int c_pos;
int c_line;
int in;
@@ -230,7 +230,7 @@ tui_redisplay_readline (void)
for (in = 0; prompt && prompt[in]; in++)
{
waddch (w, prompt[in]);
- getyx (w, line, col);
+ col = getcurx (w);
if (col <= prev_col)
height++;
prev_col = col;
@@ -256,7 +256,7 @@ tui_redisplay_readline (void)
else if (c == '\t')
{
/* Expand TABs, since ncurses on MS-Windows doesn't. */
- getyx (w, line, col);
+ col = getcurx (w);
do
{
waddch (w, ' ');
@@ -269,7 +269,7 @@ tui_redisplay_readline (void)
}
if (c == '\n')
TUI_CMD_WIN->detail.command_info.start_line = getcury (w);
- getyx (w, line, col);
+ col = getcurx (w);
if (col < prev_col)
height++;
prev_col = col;
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 48975b6..09080b8 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -273,7 +273,7 @@ static void
tui_show_source_line (struct tui_win_info *win_info, int lineno)
{
struct tui_win_element *line;
- int x, y;
+ int x;
line = win_info->generic.content[lineno - 1];
if (line->which_element.source.is_exec_point)
@@ -285,11 +285,11 @@ tui_show_source_line (struct tui_win_info *win_info, int lineno)
wattroff (win_info->generic.handle, A_STANDOUT);
/* Clear to end of line but stop before the border. */
- getyx (win_info->generic.handle, y, x);
+ x = getcurx (win_info->generic.handle);
while (x + 1 < win_info->generic.width)
{
waddch (win_info->generic.handle, ' ');
- getyx (win_info->generic.handle, y, x);
+ x = getcurx (win_info->generic.handle);
}
}