OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Tom Tromey 2016-06-28 14:25:49 -06:00
parent 821fc4aeef
commit cecc8b9906
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
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> 2016-07-14 Tom Tromey <tom@tromey.com>
* inflow.c (child_terminal_ours_1): Use ATTRIBUTE_UNUSED. * inflow.c (child_terminal_ours_1): Use ATTRIBUTE_UNUSED.

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

@ -172,9 +172,9 @@ tui_puts (const char *string)
/* Expand TABs, since ncurses on MS-Windows doesn't. */ /* Expand TABs, since ncurses on MS-Windows doesn't. */
if (c == '\t') if (c == '\t')
{ {
int line, col; int col;
getyx (w, line, col); col = getcurx (w);
do do
{ {
waddch (w, ' '); waddch (w, ' ');
@ -198,7 +198,7 @@ tui_redisplay_readline (void)
{ {
int prev_col; int prev_col;
int height; int height;
int col, line; int col;
int c_pos; int c_pos;
int c_line; int c_line;
int in; int in;
@ -230,7 +230,7 @@ tui_redisplay_readline (void)
for (in = 0; prompt && prompt[in]; in++) for (in = 0; prompt && prompt[in]; in++)
{ {
waddch (w, prompt[in]); waddch (w, prompt[in]);
getyx (w, line, col); col = getcurx (w);
if (col <= prev_col) if (col <= prev_col)
height++; height++;
prev_col = col; prev_col = col;
@ -256,7 +256,7 @@ tui_redisplay_readline (void)
else if (c == '\t') else if (c == '\t')
{ {
/* Expand TABs, since ncurses on MS-Windows doesn't. */ /* Expand TABs, since ncurses on MS-Windows doesn't. */
getyx (w, line, col); col = getcurx (w);
do do
{ {
waddch (w, ' '); waddch (w, ' ');
@ -269,7 +269,7 @@ tui_redisplay_readline (void)
} }
if (c == '\n') if (c == '\n')
TUI_CMD_WIN->detail.command_info.start_line = getcury (w); TUI_CMD_WIN->detail.command_info.start_line = getcury (w);
getyx (w, line, col); col = getcurx (w);
if (col < prev_col) if (col < prev_col)
height++; height++;
prev_col = col; prev_col = col;

6
gdb/tui/tui-winsource.c
View File

@ -273,7 +273,7 @@ static void
tui_show_source_line (struct tui_win_info *win_info, int lineno) tui_show_source_line (struct tui_win_info *win_info, int lineno)
{ {
struct tui_win_element *line; struct tui_win_element *line;
int x, y; int x;
line = win_info->generic.content[lineno - 1]; line = win_info->generic.content[lineno - 1];
if (line->which_element.source.is_exec_point) 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); wattroff (win_info->generic.handle, A_STANDOUT);
/* Clear to end of line but stop before the border. */ /* 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) while (x + 1 < win_info->generic.width)
{ {
waddch (win_info->generic.handle, ' '); waddch (win_info->generic.handle, ' ');
getyx (win_info->generic.handle, y, x); x = getcurx (win_info->generic.handle);
} }
} }