3 files changed, 89 insertions, 1 deletions
diff --git a/gdb/testsuite/gdb.tui/tui-init-source.c b/gdb/testsuite/gdb.tui/tui-init-source.c
new file mode 100644
index 0000000..43f56b3
--- /dev/null
+++ b/gdb/testsuite/gdb.tui/tui-init-source.c
@@ -0,0 +1,47 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2025 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* These numbered comments are to ensure the TUI source window will be
+   filled with content, and give us something to match against.  */
+
+/* 01 */
+/* 02 */
+/* 03 */
+/* 04 */
+/* 05 */
+/* 06 */
+/* 07 */
+/* 08 */
+/* 09 */
+/* 10 */
+
+int
+main (void)
+{
+  return 0;
+}
+
+/* 11 */
+/* 12 */
+/* 13 */
+/* 14 */
+/* 15 */
+/* 16 */
+/* 17 */
+/* 18 */
+/* 19 */
+/* 20 */
diff --git a/gdb/testsuite/gdb.tui/tui-init-source.exp b/gdb/testsuite/gdb.tui/tui-init-source.exp
new file mode 100644
index 0000000..274b334
--- /dev/null
+++ b/gdb/testsuite/gdb.tui/tui-init-source.exp
@@ -0,0 +1,41 @@
+# Copyright 2025 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# When enabling TUI prior to starting the inferior, check that the
+# default source code location is centred within the window.
+
+require allow_tui_tests
+
+tuiterm_env
+
+standard_testfile
+
+if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} {
+    return -1
+}
+
+Term::clean_restart 24 80 $testfile
+
+if {![Term::enter_tui]} {
+    unsupported "TUI not supported"
+    return
+}
+
+# Check the source code box displays at least one line before main,
+# the type and name of the main function, and one line after main.
+Term::check_region_contents \
+    "check source is reasonably centred" \
+    1 1 78 13 \
+    "/\\* 10 \\*/.*int.*main \\(void\\).*/\\* 11 \\*/"
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 587162b..1cf2bae 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -185,7 +185,7 @@ tui_source_window_base::update_source_window_with_addr (struct gdbarch *gdbarch,
   if (addr != 0)
     sal = find_pc_line (addr, 0);
 
-  update_source_window (gdbarch, sal);
+  maybe_update (gdbarch, sal);
 }
 
 /* Function to ensure that the source and/or disassembly windows