* tuiStack.h (tuiClearLocatorDisplay): Don't declare.

	* tuiStack.c (tuiClearLocatorDisplay): Remove.
	(tuiShowLocatorContent): Use wclrtoeol to clear end of status line.
	(tuiUpdateLocatorDisplay): Don't call tuiClearLocatorDisplay.

3 files changed, 9 insertions, 32 deletions

diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index 9fea5acb9d9..e571440da81 100644
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,5 +1,12 @@
 2002-08-25  Stephane Carrez  <stcarrez@nerim.fr>
 
+	* tuiStack.h (tuiClearLocatorDisplay): Don't declare.
+	* tuiStack.c (tuiClearLocatorDisplay): Remove.
+	(tuiShowLocatorContent): Use wclrtoeol to clear end of status line.
+	(tuiUpdateLocatorDisplay): Don't call tuiClearLocatorDisplay.
+
+2002-08-25  Stephane Carrez  <stcarrez@nerim.fr>
+
 	* tuiStack.c (tui_get_function_from_frame): Rename from 
 	_getFuncNameFromFrame; use print_address_symbolic to get symbolic
 	name of address.
diff --git a/gdb/tui/tuiStack.c b/gdb/tui/tuiStack.c
index 22fb18a0643..5ceecaf05a4 100644
--- a/gdb/tui/tuiStack.c
+++ b/gdb/tui/tuiStack.c
@@ -95,35 +95,6 @@ tui_get_function_from_frame (struct frame_info *fi)
 }
 
 /*
-   ** tuiClearLocatorDisplay()
- */
-void
-tuiClearLocatorDisplay (void)
-{
-  TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
-  int i;
-
-  if (locator->handle != (WINDOW *) NULL)
-    {
-      /* No need to werase, since writing a line of
-         * blanks which we do below, is equivalent.
-       */
-      /* werase(locator->handle); */
-      wmove (locator->handle, 0, 0);
-      wstandout (locator->handle);
-      for (i = 0; i < locator->width; i++)
-	waddch (locator->handle, ' ');
-      wstandend (locator->handle);
-      tuiRefreshWin (locator);
-      wmove (locator->handle, 0, 0);
-      locator->contentInUse = FALSE;
-    }
-
-  return;
-}				/* tuiClearLocatorDisplay */
-
-
-/*
    ** tuiShowLocatorContent()
  */
 void
@@ -142,6 +113,7 @@ tuiShowLocatorContent (void)
 	  wmove (locator->handle, 0, 0);
 	  wstandout (locator->handle);
 	  waddstr (locator->handle, string);
+          wclrtoeol (locator->handle);
 	  wstandend (locator->handle);
 	  tuiRefreshWin (locator);
 	  wmove (locator->handle, 0, 0);
@@ -314,7 +286,6 @@ tuiSetLocatorContent (struct frame_info *frameInfo)
 void
 tuiUpdateLocatorDisplay (struct frame_info *frameInfo)
 {
-  tuiClearLocatorDisplay ();
   tuiSetLocatorContent (frameInfo);
   tuiShowLocatorContent ();
 
diff --git a/gdb/tui/tuiStack.h b/gdb/tui/tuiStack.h
index 90aab5abe22..76674201775 100644
--- a/gdb/tui/tuiStack.h
+++ b/gdb/tui/tuiStack.h
@@ -1,5 +1,5 @@
 /* TUI display locator.
-   Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Hewlett-Packard Company.
 
    This file is part of GDB.
@@ -34,7 +34,6 @@ extern void tuiUpdateLocatorDisplay (struct frame_info *);
 extern void tuiSetLocatorContent (struct frame_info *);
 extern void tuiShowLocatorContent (void);
 extern void tuiClearLocatorContent (void);
-extern void tuiClearLocatorDisplay (void);
 extern void tuiSwitchFilename (char *);
 extern void tuiShowFrameInfo (struct frame_info *);
 extern void tuiGetLocatorFilename (TuiGenWinInfoPtr, char **);