Make TUI borders respect "set style enabled"

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

diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index cad7deab804e7fd9824a4b89511454d47976276a..fbee2e3e1813bc8acbcc393f9a704bb1d5230406 100644 (file)
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -1,6 +1,6 @@
 /* TUI display source/assembly window.
 
-   Copyright (C) 1998-2019 Free Software Foundation, Inc.
+   Copyright (C) 1998-2020 Free Software Foundation, Inc.
 
    Contributed by Hewlett-Packard Company.
 
@@ -190,13 +190,6 @@ tui_source_window_base::update_source_window_as_is
       update_breakpoint_info (nullptr, false);
       show_source_content ();
       update_exec_info ();
-      if (type == SRC_WIN)
-       {
-         symtab_and_line new_sal = sal;
-
-         new_sal.line = sal.line + (content.size () - 2);
-         set_current_source_symtab_and_line (new_sal);
-       }
     }
 }
 
@@ -206,56 +199,27 @@ tui_source_window_base::update_source_window_as_is
 void
 tui_update_source_windows_with_addr (struct gdbarch *gdbarch, CORE_ADDR addr)
 {
+  struct symtab_and_line sal {};
   if (addr != 0)
-    {
-      struct symtab_and_line sal = find_pc_line (addr, 0);
-      
-      if (TUI_DISASM_WIN != nullptr)
-       TUI_DISASM_WIN->update_source_window (gdbarch, sal);
+    sal = find_pc_line (addr, 0);
 
-      if (TUI_SRC_WIN != nullptr)
-       TUI_SRC_WIN->update_source_window (gdbarch, sal);
-    }
-  else
-    {
-      for (struct tui_source_window_base *win_info : tui_source_windows ())
-       win_info->erase_source_content ();
-    }
+  for (struct tui_source_window_base *win_info : tui_source_windows ())
+    win_info->update_source_window (gdbarch, sal);
 }
 
-/* Function to ensure that the source and/or disassemly windows
-   reflect the input address.  */
+/* Function to ensure that the source and/or disassembly windows
+   reflect the symtab and line.  */
 void
-tui_update_source_windows_with_line (struct symtab *s, int line)
+tui_update_source_windows_with_line (struct symtab_and_line sal)
 {
-  struct gdbarch *gdbarch;
-  CORE_ADDR pc;
-  struct symtab_and_line sal;
-
-  if (!s)
+  if (!sal.symtab)
     return;
 
-  sal.pspace = current_program_space;
-  sal.symtab = s;
-  sal.line = line;
-
-  gdbarch = get_objfile_arch (SYMTAB_OBJFILE (s));
+  find_line_pc (sal.symtab, sal.line, &sal.pc);
+  struct gdbarch *gdbarch = get_objfile_arch (SYMTAB_OBJFILE (sal.symtab));
 
-  switch (tui_current_layout ())
-    {
-    case DISASSEM_COMMAND:
-    case DISASSEM_DATA_COMMAND:
-      find_line_pc (s, line, &pc);
-      tui_update_source_windows_with_addr (gdbarch, pc);
-      break;
-    default:
-      find_line_pc (s, line, &pc);
-      sal.pc = pc;
-      TUI_SRC_WIN->update_source_window (gdbarch, sal);
-      if (tui_current_layout () == SRC_DISASSEM_COMMAND)
-       TUI_DISASM_WIN->update_source_window (gdbarch, sal);
-      break;
-    }
+  for (struct tui_source_window_base *win_info : tui_source_windows ())
+    win_info->update_source_window (gdbarch, sal);
 }
 
 void
@@ -388,7 +352,11 @@ tui_source_window_base::refill ()
     {
       sal = get_current_source_symtab_and_line ();
       if (sal.symtab == NULL)
-       sal = find_pc_line (get_frame_pc (get_selected_frame (NULL)), 0);
+       {
+         struct frame_info *fi = deprecated_safe_get_selected_frame ();
+         if (fi != nullptr)
+           sal = find_pc_line (get_frame_pc (fi), 0);
+       }
     }
 
   if (sal.pspace == nullptr)