diff options
| author | Tom Tromey <tom@tromey.com> | 2019-07-23 16:43:20 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-09-20 13:49:05 -0600 |
| commit | 71a25ed2e77fd72e01d38aa84f5a0fbe5f081474 (patch) | |
| tree | 423c0557ab025c8ea8ba0acc0891588cd1d306d7 /gdb/tui/tui-stack.c | |
| parent | f85321544357a44a824d9d31fd57ed4d3aae1a4a (diff) | |
| download | gdb-71a25ed2e77fd72e01d38aa84f5a0fbe5f081474.zip gdb-71a25ed2e77fd72e01d38aa84f5a0fbe5f081474.tar.gz gdb-71a25ed2e77fd72e01d38aa84f5a0fbe5f081474.tar.bz2 | |
Change tui_make_status_line to be a method
This changes tui_make_status_line to be a method on
tui_locator_window. This is a minor cleanup.
This also changes the new method to use the locator's width, rather
than the terminal width. This is important if we ever want to allow
windows to be made more narrow.
gdb/ChangeLog
2019-09-20 Tom Tromey <tom@tromey.com>
* tui/tui-stack.h (struct tui_locator_window) <make_status_line>:
Declare.
* tui/tui-stack.c (tui_locator_window::make_status_line): Rename
from tui_make_status_line.
(tui_locator_window::rerender): Update.
Diffstat (limited to 'gdb/tui/tui-stack.c')
| -rw-r--r-- | gdb/tui/tui-stack.c | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c index a2e4a16..163a5ad 100644 --- a/gdb/tui/tui-stack.c +++ b/gdb/tui/tui-stack.c @@ -63,13 +63,10 @@ tui_locator_win_info_ptr (void) return &_locator; } -/* Create the status line to display as much information as we can on - this single line: target name, process number, current function, - current line, current PC, SingleKey mode. */ -static std::string -tui_make_status_line (struct tui_locator_window *loc) +std::string +tui_locator_window::make_status_line () const { - char line_buf[50], *pname; + char line_buf[50]; int status_size; int proc_width; const char *pid_name; @@ -94,11 +91,11 @@ tui_make_status_line (struct tui_locator_window *loc) if (pid_width > MAX_PID_WIDTH) pid_width = MAX_PID_WIDTH; - status_size = tui_term_width (); + status_size = width; /* Translate line number and obtain its size. */ - if (loc->line_no > 0) - xsnprintf (line_buf, sizeof (line_buf), "%d", loc->line_no); + if (line_no > 0) + xsnprintf (line_buf, sizeof (line_buf), "%d", line_no); else strcpy (line_buf, "??"); line_width = strlen (line_buf); @@ -106,8 +103,8 @@ tui_make_status_line (struct tui_locator_window *loc) line_width = MIN_LINE_WIDTH; /* Translate PC address. */ - std::string pc_out (loc->gdbarch - ? paddress (loc->gdbarch, loc->addr) + std::string pc_out (gdbarch + ? paddress (gdbarch, addr) : "??"); const char *pc_buf = pc_out.c_str (); int pc_width = pc_out.size (); @@ -150,9 +147,6 @@ tui_make_status_line (struct tui_locator_window *loc) } } - /* Now convert elements to string form. */ - pname = loc->proc_name; - /* Now create the locator line from the string version of the elements. */ string_file string; @@ -172,12 +166,12 @@ tui_make_status_line (struct tui_locator_window *loc) /* Procedure/class name. */ if (proc_width > 0) { - if (strlen (pname) > proc_width) + if (strlen (proc_name) > proc_width) string.printf ("%s%*.*s* ", PROC_PREFIX, - 1 - proc_width, proc_width - 1, pname); + 1 - proc_width, proc_width - 1, proc_name); else string.printf ("%s%*.*s ", PROC_PREFIX, - -proc_width, proc_width, pname); + -proc_width, proc_width, proc_name); } if (line_width > 0) @@ -234,7 +228,7 @@ tui_locator_window::rerender () { if (handle != NULL) { - std::string string = tui_make_status_line (this); + std::string string = make_status_line (); wmove (handle, 0, 0); /* We ignore the return value from wstandout and wstandend, casting them to void in order to avoid a compiler warning. The warning |