Rename a private data member in tui_source_window

[deliverable/binutils-gdb.git] / gdb / tui / tui-wingeneral.c

diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
index 5fa4cfd9eee99ee6bef17e8e3c675c63ab7a859b..235c17c5fa28a36b68f37dd883bec32c7f89601e 100644 (file)
--- a/gdb/tui/tui-wingeneral.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -38,10 +38,7 @@ void
 tui_gen_win_info::refresh_window ()
 {
   if (handle != NULL)
-    {
-      touchwin (handle);
-      wrefresh (handle);
-    }
+    wrefresh (handle);
 }
 
 /* Function to delete the curses window, checking for NULL.  */
@@ -56,32 +53,43 @@ tui_delete_win (WINDOW *window)
 /* Draw a border arround the window.  */
 static void
 box_win (struct tui_win_info *win_info, 
-        int highlight_flag)
+        bool highlight_flag)
 {
-  if (win_info && win_info->handle)
-    {
-      WINDOW *win;
-      int attrs;
+  WINDOW *win;
+  int attrs;
 
-      win = win_info->handle;
-      if (highlight_flag == HILITE)
-        attrs = tui_active_border_attrs;
-      else
-        attrs = tui_border_attrs;
+  win = win_info->handle;
+  if (highlight_flag)
+    attrs = tui_active_border_attrs;
+  else
+    attrs = tui_border_attrs;
 
-      wattron (win, attrs);
+  wattron (win, attrs);
 #ifdef HAVE_WBORDER
-      wborder (win, tui_border_vline, tui_border_vline,
-               tui_border_hline, tui_border_hline,
-               tui_border_ulcorner, tui_border_urcorner,
-               tui_border_llcorner, tui_border_lrcorner);
+  wborder (win, tui_border_vline, tui_border_vline,
+          tui_border_hline, tui_border_hline,
+          tui_border_ulcorner, tui_border_urcorner,
+          tui_border_llcorner, tui_border_lrcorner);
 #else
-      box (win, tui_border_vline, tui_border_hline);
+  box (win, tui_border_vline, tui_border_hline);
 #endif
-      if (!win_info->title.empty ())
-        mvwaddstr (win, 0, 3, win_info->title.c_str ());
-      wattroff (win, attrs);
+  if (!win_info->title.empty ())
+    {
+      /* Emit "+-TITLE-+" -- so 2 characters on the right and 2 on
+        the left.  */
+      int max_len = win_info->width - 2 - 2;
+
+      if (win_info->title.size () <= max_len)
+       mvwaddstr (win, 0, 3, win_info->title.c_str ());
+      else
+       {
+         std::string truncated
+           = "..." + win_info->title.substr (win_info->title.size ()
+                                             - max_len + 3);
+         mvwaddstr (win, 0, 3, truncated.c_str ());
+       }
     }
+  wattroff (win, attrs);
 }
 
 
@@ -92,7 +100,7 @@ tui_unhighlight_win (struct tui_win_info *win_info)
       && win_info->can_highlight
       && win_info->handle != NULL)
     {
-      box_win (win_info, NO_HILITE);
+      box_win (win_info, false);
       win_info->refresh_window ();
       win_info->set_highlight (false);
     }
@@ -106,7 +114,7 @@ tui_highlight_win (struct tui_win_info *win_info)
       && win_info->can_highlight
       && win_info->handle != NULL)
     {
-      box_win (win_info, HILITE);
+      box_win (win_info, true);
       win_info->refresh_window ();
       win_info->set_highlight (true);
     }
@@ -138,7 +146,7 @@ tui_win_info::make_window ()
 {
   tui_gen_win_info::make_window ();
   if (handle != NULL && can_box ())
-    box_win (this, NO_HILITE);
+    box_win (this, false);
 }
 
 /* We can't really make windows visible, or invisible.  So we have to