diff options
author | Stephane Carrez <stcarrez@nerim.fr> | 2002-08-24 15:25:25 +0000 |
---|---|---|
committer | Stephane Carrez <stcarrez@nerim.fr> | 2002-08-24 15:25:25 +0000 |
commit | 9123efeef4ee9151b69af360868a91ce7750643f (patch) | |
tree | 962a449458b3a1932efc1a102b8102a72390ffae /gdb/tui | |
parent | ab26b6a4321df940fbe4b26dc483fc007e07dbdd (diff) | |
download | gdb-9123efeef4ee9151b69af360868a91ce7750643f.tar.gz |
* tui.c (tui_enable): Use tuiSetLayout instead of showLayout and
use tuiShowFrameInfo instead of tuiSetLocatorContent.
* tuiLayout.h (showLayout): Remove.
* tuiLayout.c (_showSourceOrDisassemAndCommand): Remove unused locals.
(_showSourceDisassemCommand): Likewise.
(showLayout): Make it static.
(lastLayout): Remove.
Diffstat (limited to 'gdb/tui')
-rw-r--r-- | gdb/tui/ChangeLog | 10 | ||||
-rw-r--r-- | gdb/tui/tui.c | 4 | ||||
-rw-r--r-- | gdb/tui/tuiLayout.c | 21 | ||||
-rw-r--r-- | gdb/tui/tuiLayout.h | 3 |
4 files changed, 16 insertions, 22 deletions
diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog index 1223a47c4c5..01ac7d98b21 100644 --- a/gdb/tui/ChangeLog +++ b/gdb/tui/ChangeLog @@ -1,5 +1,15 @@ 2002-08-24 Stephane Carrez <stcarrez@nerim.fr> + * tui.c (tui_enable): Use tuiSetLayout instead of showLayout and + use tuiShowFrameInfo instead of tuiSetLocatorContent. + * tuiLayout.h (showLayout): Remove. + * tuiLayout.c (_showSourceOrDisassemAndCommand): Remove unused locals. + (_showSourceDisassemCommand): Likewise. + (showLayout): Make it static. + (lastLayout): Remove. + +2002-08-24 Stephane Carrez <stcarrez@nerim.fr> + * tuiSourceWin.c (tui_show_source_line): New function. (tuiShowSourceContent): Call it and avoid clearing the window before redrawing it. diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index 6b132b7332c..33232a50cdb 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -237,8 +237,8 @@ tui_enable (void) setTermWidthTo (COLS); def_prog_mode (); - tuiSetLocatorContent (0); - showLayout (SRC_COMMAND); + tuiShowFrameInfo (0); + tuiSetLayout (SRC_COMMAND, TUI_UNDEFINED_REGS); tuiSetWinFocusTo (srcWin); keypad (cmdWin->generic.handle, TRUE); wrefresh (cmdWin->generic.handle); diff --git a/gdb/tui/tuiLayout.c b/gdb/tui/tuiLayout.c index 7db2b707a7c..c3eae72c3c5 100644 --- a/gdb/tui/tuiLayout.c +++ b/gdb/tui/tuiLayout.c @@ -58,7 +58,7 @@ /******************************* ** Static Local Decls ********************************/ - +static void showLayout (TuiLayoutType); static void _initGenWinInfo (TuiGenWinInfoPtr, TuiWinType, int, int, int, int); static void _initAndMakeWin (Opaque *, TuiWinType, int, int, int, int, int); static void _showSourceOrDisassemAndCommand (TuiLayoutType); @@ -86,20 +86,8 @@ static void _tuiHandleXDBLayout (TuiLayoutDefPtr); #define LAYOUT_USAGE "Usage: layout prev | next | <layout_name> \n" -/*************************************** -** Static Local Data -***************************************/ -static TuiLayoutType lastLayout = UNDEFINED_LAYOUT; - -/*************************************** -** PUBLIC FUNCTIONS -***************************************/ - -/* - ** showLayout(). - ** Show the screen layout defined - */ -void +/* Show the screen layout defined. */ +static void showLayout (TuiLayoutType layout) { TuiLayoutType curLayout = currentLayout (); @@ -789,8 +777,6 @@ _showDisassemCommand (void) static void _showSourceDisassemCommand (void) { - TuiGenWinInfoPtr locator = locatorWinInfoPtr (); - if (currentLayout () != SRC_DISASSEM_COMMAND) { int cmdHeight, srcHeight, asmHeight; @@ -1083,7 +1069,6 @@ _showSourceOrDisassemAndCommand (TuiLayoutType layoutType) if (currentLayout () != layoutType) { TuiWinInfoPtr *winInfoPtr; - int areaLeft; int srcHeight, cmdHeight; TuiGenWinInfoPtr locator = locatorWinInfoPtr (); diff --git a/gdb/tui/tuiLayout.h b/gdb/tui/tuiLayout.h index 8646318f1da..f6b0ed79c68 100644 --- a/gdb/tui/tuiLayout.h +++ b/gdb/tui/tuiLayout.h @@ -1,5 +1,5 @@ /* TUI layout window management. - 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. @@ -22,7 +22,6 @@ #ifndef TUI_LAYOUT_H #define TUI_LAYOUT_H -extern void showLayout (TuiLayoutType); extern void tuiAddWinToLayout (TuiWinType); extern int tuiDefaultWinHeight (TuiWinType, TuiLayoutType); extern int tuiDefaultWinViewportHeight (TuiWinType, TuiLayoutType); |