diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog index b8f15644275..179cb268328 100644 --- a/gdb/tui/ChangeLog +++ b/gdb/tui/ChangeLog @@ -1,3 +1,23 @@ +2001-07-21 Stephane Carrez + + * tuiSourceWin.h: Remove unused declarations. + * tuiSourceWin.c (tui_vUpdateSourceWindowsWithAddr): Remove. + (tui_vUpdateSourceWindowsWithLine): Remove. + (tui_vAllSetHasBreakAt): Remove. + + * tuiLayout.h (tui_set_layout): Declare. + (tui_vSetLayoutTo): Remove. + (tui_vAddWinToLayout): Remove. + * tuiLayout.c (_tuiLayout_command): Call tui_enable() to force TUI. + (_tuiToggleLayout_command): Remove. + (_tuiToggleSplitLayout_command): Remove. + (_tuiLayout_command): Remove. + (tui_vSetLayoutTo): Remove. + (tui_vAddWinToLayout): Remove. + + * tuiDataWin.h (tui_vCheckDataValues): Remove. + * tuiDataWin.c (tui_vCheckDataValues): Remove. + 2001-07-20 Stephane Carrez * tuiWin.c (tuiStrDup): Remove, replaced by xstrdup. diff --git a/gdb/tui/tuiDataWin.c b/gdb/tui/tuiDataWin.c index d7ad6b48b47..b67aeac66cd 100644 --- a/gdb/tui/tuiDataWin.c +++ b/gdb/tui/tuiDataWin.c @@ -22,6 +22,7 @@ #include "defs.h" #include "tui.h" #include "tuiData.h" +#include "tuiGeneralWin.h" #include "tuiRegs.h" @@ -296,22 +297,6 @@ tuiCheckDataValues (struct frame_info *frame) } /* tuiCheckDataValues */ -/* - ** tui_vCheckDataValues(). - ** Function to check the data values and hilite any that have - ** changed with args in a va_list - */ -void -tui_vCheckDataValues (va_list args) -{ - struct frame_info *frame = va_arg (args, struct frame_info *); - - tuiCheckDataValues (frame); - - return; -} /* tui_vCheckDataValues */ - - /* ** tuiVerticalDataScroll() ** Scroll the data window vertically forward or backward. diff --git a/gdb/tui/tuiDataWin.h b/gdb/tui/tuiDataWin.h index 18826ebc637..0b1e700f1bb 100644 --- a/gdb/tui/tuiDataWin.h +++ b/gdb/tui/tuiDataWin.h @@ -35,7 +35,6 @@ extern void tuiEraseDataContent (char *); extern void tuiDisplayAllData (void); extern void tuiCheckDataValues (struct frame_info *); -extern void tui_vCheckDataValues (va_list); extern void tuiDisplayDataFromLine (int); extern int tuiFirstDataItemDisplayed (void); extern int tuiFirstDataElementNoInLine (int); diff --git a/gdb/tui/tuiLayout.c b/gdb/tui/tuiLayout.c index 74c9747036d..3626e52599d 100644 --- a/gdb/tui/tuiLayout.c +++ b/gdb/tui/tuiLayout.c @@ -55,9 +55,7 @@ static TuiLayoutType _nextLayout (void); static TuiLayoutType _prevLayout (void); static void _tuiLayout_command (char *, int); static void _tuiToggleLayout_command (char *, int); -static void _tui_vToggleLayout_command (va_list); static void _tuiToggleSplitLayout_command (char *, int); -static void _tui_vToggleSplitLayout_command (va_list); static CORE_ADDR _extractDisplayStartAddr (void); static void _tuiHandleXDBLayout (TuiLayoutDefPtr); @@ -275,23 +273,6 @@ tuiSetLayout (TuiLayoutType layoutType, return status; } /* tuiSetLayout */ - -/* - ** tui_vSetLayoutTo() - ** Function to set the layout to SRC, ASM, SPLIT, NEXT, PREV, DATA, - ** REGS, $REGS, $GREGS, $FREGS, $SREGS with arguments in a va_list - */ -TuiStatus -tui_vSetLayoutTo (va_list args) -{ - char *layoutName; - - layoutName = va_arg (args, char *); - - return (_tuiSetLayoutTo (layoutName)); -} /* tui_vSetLayoutTo */ - - /* ** tuiAddWinToLayout(). ** Add the specified window to the layout in a logical way. @@ -347,22 +328,6 @@ tuiAddWinToLayout (TuiWinType type) } /* tuiAddWinToLayout */ -/* - ** tui_vAddWinToLayout(). - ** Add the specified window to the layout in a logical way, - ** with arguments in a va_list. - */ -void -tui_vAddWinToLayout (va_list args) -{ - TuiWinType type = va_arg (args, TuiWinType); - - tuiAddWinToLayout (type); - - return; -} /* tui_vAddWinToLayout */ - - /* ** tuiDefaultWinHeight(). ** Answer the height of a window. If it hasn't been created yet, @@ -482,7 +447,7 @@ tui_set_layout (const char *layoutName) TuiRegisterDisplayType dpyType = TUI_UNDEFINED_REGS; TuiLayoutType curLayout = currentLayout (); - bufPtr = (char *) tuiStrDup (layoutName); + bufPtr = (char *) xstrdup (layoutName); for (i = 0; (i < strlen (layoutName)); i++) bufPtr[i] = toupper (bufPtr[i]); @@ -628,6 +593,8 @@ _tuiToggleLayout_command (char *arg, int fromTTY) { TuiLayoutDefPtr layoutDef = tuiLayoutDef (); + /* Make sure the curses mode is enabled. */ + tui_enable (); if (layoutDef->displayMode == SRC_WIN) layoutDef->displayMode = DISASSEM_WIN; else @@ -644,6 +611,8 @@ _tuiToggleSplitLayout_command (char *arg, int fromTTY) { TuiLayoutDefPtr layoutDef = tuiLayoutDef (); + /* Make sure the curses mode is enabled. */ + tui_enable (); layoutDef->split = (!layoutDef->split); _tuiHandleXDBLayout (layoutDef); @@ -653,6 +622,10 @@ _tuiToggleSplitLayout_command (char *arg, int fromTTY) static void _tuiLayout_command (char *arg, int fromTTY) { + /* Make sure the curses mode is enabled. */ + tui_enable (); + + /* Switch to the selected layout. */ if (tui_set_layout (arg) != TUI_SUCCESS) warning ("Invalid layout specified.\n%s", LAYOUT_USAGE); diff --git a/gdb/tui/tuiLayout.h b/gdb/tui/tuiLayout.h index 9b8511dc245..79fffd405a0 100644 --- a/gdb/tui/tuiLayout.h +++ b/gdb/tui/tuiLayout.h @@ -24,10 +24,9 @@ extern void showLayout (TuiLayoutType); extern void tuiAddWinToLayout (TuiWinType); -extern void tui_vAddWinToLayout (va_list); extern int tuiDefaultWinHeight (TuiWinType, TuiLayoutType); extern int tuiDefaultWinViewportHeight (TuiWinType, TuiLayoutType); +extern TuiStatus tui_set_layout (const char *); extern TuiStatus tuiSetLayout (TuiLayoutType, TuiRegisterDisplayType); -extern TuiStatus tui_vSetLayoutTo (va_list); #endif /*TUI_LAYOUT_H */ diff --git a/gdb/tui/tuiSourceWin.c b/gdb/tui/tuiSourceWin.c index 8edb60bab11..9098aaf5bc4 100644 --- a/gdb/tui/tuiSourceWin.c +++ b/gdb/tui/tuiSourceWin.c @@ -217,22 +217,6 @@ tuiUpdateSourceWindowsWithAddr (CORE_ADDR addr) return; } /* tuiUpdateSourceWindowsWithAddr */ - -/* - ** tui_vUpdateSourceWindowsWithAddr() - ** Update the source window with the address in a va_list - */ -void -tui_vUpdateSourceWindowsWithAddr (va_list args) -{ - Opaque addr = va_arg (args, Opaque); - - tuiUpdateSourceWindowsWithAddr (addr); - - return; -} /* tui_vUpdateSourceWindowsWithAddr */ - - /* ** tuiUpdateSourceWindowsWithLine(). ** Function to ensure that the source and/or disassemly windows @@ -263,23 +247,6 @@ tuiUpdateSourceWindowsWithLine (struct symtab *s, int line) return; } /* tuiUpdateSourceWindowsWithLine */ - -/* - ** tui_vUpdateSourceWindowsWithLine() - ** Update the source window with the line number in a va_list - */ -void -tui_vUpdateSourceWindowsWithLine (va_list args) -{ - struct symtab *s = va_arg (args, struct symtab *); - int line = va_arg (args, int); - - tuiUpdateSourceWindowsWithLine (s, line); - - return; -} /* tui_vUpdateSourceWindowsWithLine */ - - /* ** tuiClearSourceContent(). */ @@ -557,24 +524,6 @@ tuiAllSetHasBreakAt (struct breakpoint *bp, int hasBreak) } /* tuiAllSetHasBreakAt */ -/* - ** tui_vAllSetHasBreakAt() - ** Set or clear the hasBreak flag in all displayed source windows, - ** with params in a va_list - */ -void -tui_vAllSetHasBreakAt (va_list args) -{ - struct breakpoint *bp = va_arg (args, struct breakpoint *); - int hasBreak = va_arg (args, int); - - tuiAllSetHasBreakAt (bp, hasBreak); - - return; -} /* tui_vAllSetHasBreakAt */ - - - /********************************* ** EXECUTION INFO FUNCTIONS ** *********************************/ @@ -769,7 +718,7 @@ tuiUpdateExecInfo (TuiWinInfoPtr winInfo) { tuiSetExecInfoContent (winInfo); tuiShowExecInfoContent (winInfo); -} /* tuiUpdateExecInfo +} /* tuiUpdateExecInfo */ /* diff --git a/gdb/tui/tuiSourceWin.h b/gdb/tui/tuiSourceWin.h index fcc2bd46472..ffde656943b 100644 --- a/gdb/tui/tuiSourceWin.h +++ b/gdb/tui/tuiSourceWin.h @@ -28,9 +28,7 @@ extern void tuiUpdateSourceWindow (TuiWinInfoPtr, struct symtab *, Opaque, extern void tuiUpdateSourceWindowAsIs (TuiWinInfoPtr, struct symtab *, Opaque, int); extern void tuiUpdateSourceWindowsWithAddr (CORE_ADDR); -extern void tui_vUpdateSourceWindowsWithAddr (va_list); extern void tuiUpdateSourceWindowsWithLine (struct symtab *, int); -extern void tui_vUpdateSourceWindowsWithLine (va_list); extern void tuiUpdateSourceWindowsFromLocator (void); extern void tuiClearSourceContent (TuiWinInfoPtr, int); extern void tuiClearAllSourceWinsContent (int); @@ -56,7 +54,6 @@ extern void tuiUpdateAllExecInfos (void); extern void tuiSetIsExecPointAt (Opaque, TuiWinInfoPtr); extern void tuiSetHasBreakAt (struct breakpoint *, TuiWinInfoPtr, int); extern void tuiAllSetHasBreakAt (struct breakpoint *, int); -extern void tui_vAllSetHasBreakAt (va_list); extern TuiStatus tuiAllocSourceBuffer (TuiWinInfoPtr); extern int tuiLineIsDisplayed (Opaque, TuiWinInfoPtr, int); @@ -66,28 +63,5 @@ extern int tuiLineIsDisplayed (Opaque, TuiWinInfoPtr, int); */ #define SCROLL_THRESHOLD 2 /* threshold for lazy scroll */ - -/* - ** Macros - */ -#define m_tuiSetBreakAt(bp, winInfo) tuiSetHasBreakAt((bp, winInfo, TRUE) -#define m_tuiClearBreakAt(bp, winInfo) tuiSetHasBreakAt(bp, winInfo, FALSE) - -#define m_tuiAllSetBreakAt(bp) tuiAllSetHasBreakAt(bp, TRUE) -#define m_tuiAllClearBreakAt(bp) tuiAllSetHasBreakAt(bp, FALSE) - -#define m_tuiSrcLineDisplayed(lineNo) tuiLineIsDisplayed((Opaque)(lineNo), srcWin, FALSE) -#define m_tuiSrcAddrDisplayed(addr) tuiLineIsDisplayed((Opaque)(addr), disassemWin, FALSE) -#define m_tuiSrcLineDisplayedWithinThreshold(lineNo) \ - tuiLineIsDisplayed((Opaque)(lineNo), srcWin, TRUE) -#define m_tuiSrcAddrDisplayedWithinThreshold(addr) \ - tuiLineIsDisplayed((Opaque)(addr), disassemWin, TRUE) -#define m_tuiLineDisplayedWithinThreshold(winInfo, lineOrAddr) \ - ( (winInfo == srcWin) ? \ - m_tuiSrcLineDisplayedWithinThreshold(lineOrAddr) : \ - m_tuiSrcAddrDisplayedWithinThreshold(lineOrAddr) ) - - - #endif /*_TUI_SOURCEWIN_H */