* tuiRegs.c (tuiDisplayRegistersFrom): Call touchwin.

[binutils-gdb.git] / gdb / tui / tuiRegs.c

diff --git a/gdb/tui/tuiRegs.c b/gdb/tui/tuiRegs.c
index 177451ff079b337da8c634fb3f3b8d3dcc2c2302..f93d2b912cc1938445c1735d0127812733a98abc 100644 (file)
--- a/gdb/tui/tuiRegs.c
+++ b/gdb/tui/tuiRegs.c
@@ -347,6 +347,8 @@ tuiDisplayRegistersFrom (int startElementNo)
                  makeWindow (dataItemWin, DONT_BOX_WINDOW);
                   scrollok (dataItemWin->handle, FALSE);
                }
+              touchwin (dataItemWin->handle);
+
              /*
                 ** Get the printable representation of the register
                 ** and display it
@@ -603,6 +605,7 @@ _tuiRegisterFormat (char *buf, int bufLen, int regNum,
   char *name;
   struct cleanup *cleanups;
   char *p;
+  int pos;
 
   name = REGISTER_NAME (regNum);
   if (name == 0)
@@ -619,7 +622,23 @@ _tuiRegisterFormat (char *buf, int bufLen, int regNum,
   do_registers_info (regNum, 0);
 
   /* Save formatted output in the buffer.  */
-  strncpy (buf, tui_file_get_strbuf (stream), bufLen);
+  p = tui_file_get_strbuf (stream);
+  pos = 0;
+  while (*p && *p == *name++ && bufLen)
+    {
+      *buf++ = *p++;
+      bufLen--;
+      pos++;
+    }
+  while (*p == ' ')
+    p++;
+  while (pos < 8 && bufLen)
+    {
+      *buf++ = ' ';
+      bufLen--;
+      pos++;
+    }
+  strncpy (buf, p, bufLen);
 
   /* Remove the possible \n.  */
   p = strchr (buf, '\n');