diff options
Diffstat (limited to 'gdb/tui/tuiLayout.c')
-rw-r--r-- | gdb/tui/tuiLayout.c | 268 |
1 files changed, 27 insertions, 241 deletions
diff --git a/gdb/tui/tuiLayout.c b/gdb/tui/tuiLayout.c index de3e841..2b435b4 100644 --- a/gdb/tui/tuiLayout.c +++ b/gdb/tui/tuiLayout.c @@ -79,13 +79,7 @@ static TuiLayoutType lastLayout = UNDEFINED_LAYOUT; ** Show the screen layout defined */ void -#ifdef __STDC__ -showLayout ( - TuiLayoutType layout) -#else -showLayout (layout) - TuiLayoutType layout; -#endif +showLayout (TuiLayoutType layout) { TuiLayoutType curLayout = currentLayout (); @@ -145,15 +139,8 @@ showLayout (layout) ** to regsDisplayType. */ TuiStatus -#ifdef __STDC__ -tuiSetLayout ( - TuiLayoutType layoutType, - TuiRegisterDisplayType regsDisplayType) -#else -tuiSetLayout (layoutType, regsDisplayType) - TuiLayoutType layoutType; - TuiRegisterDisplayType regsDisplayType; -#endif +tuiSetLayout (TuiLayoutType layoutType, + TuiRegisterDisplayType regsDisplayType) { TuiStatus status = TUI_SUCCESS; @@ -295,13 +282,7 @@ tuiSetLayout (layoutType, regsDisplayType) ** REGS, $REGS, $GREGS, $FREGS, $SREGS with arguments in a va_list */ TuiStatus -#ifdef __STDC__ -tui_vSetLayoutTo ( - va_list args) -#else -tui_vSetLayoutTo (args) - va_list args; -#endif +tui_vSetLayoutTo (va_list args) { char *layoutName; @@ -318,13 +299,7 @@ tui_vSetLayoutTo (args) ** window to be added. */ void -#ifdef __STDC__ -tuiAddWinToLayout ( - TuiWinType type) -#else -tuiAddWinToLayout (type) - TuiWinType type; -#endif +tuiAddWinToLayout (TuiWinType type) { TuiLayoutType curLayout = currentLayout (); @@ -378,13 +353,7 @@ tuiAddWinToLayout (type) ** with arguments in a va_list. */ void -#ifdef __STDC__ -tui_vAddWinToLayout ( - va_list args) -#else -tui_vAddWinToLayout (args) - va_list args; -#endif +tui_vAddWinToLayout (va_list args) { TuiWinType type = va_arg (args, TuiWinType); @@ -401,15 +370,7 @@ tui_vAddWinToLayout (args) ** type and the layout. */ int -#ifdef __STDC__ -tuiDefaultWinHeight ( - TuiWinType type, - TuiLayoutType layout) -#else -tuiDefaultWinHeight (type, layout) - TuiWinType type; - TuiLayoutType layout; -#endif +tuiDefaultWinHeight (TuiWinType type, TuiLayoutType layout) { int h; @@ -451,15 +412,7 @@ tuiDefaultWinHeight (type, layout) ** type and the layout. */ int -#ifdef __STDC__ -tuiDefaultWinViewportHeight ( - TuiWinType type, - TuiLayoutType layout) -#else -tuiDefaultWinViewportHeight (type, layout) - TuiWinType type; - TuiLayoutType layout; -#endif +tuiDefaultWinViewportHeight (TuiWinType type, TuiLayoutType layout) { int h; @@ -522,13 +475,7 @@ Source/Disassembly/Command layouts.\n"); ** $REGS, $GREGS, $FREGS, $SREGS. */ static TuiStatus -#ifdef __STDC__ -_tuiSetLayoutTo ( - char *layoutName) -#else -_tuiSetLayoutTo (layoutName) - char *layoutName; -#endif +_tuiSetLayoutTo (char *layoutName) { TuiStatus status = TUI_SUCCESS; @@ -631,11 +578,7 @@ _tuiSetLayoutTo (layoutName) static Opaque -#ifdef __STDC__ _extractDisplayStartAddr (void) -#else -_extractDisplayStartAddr () -#endif { TuiLayoutType curLayout = currentLayout (); Opaque addr; @@ -663,13 +606,7 @@ _extractDisplayStartAddr () static void -#ifdef __STDC__ -_tuiHandleXDBLayout ( - TuiLayoutDefPtr layoutDef) -#else -_tuiHandleXDBLayout (layoutDef) - TuiLayoutDefPtr layoutDef; -#endif +_tuiHandleXDBLayout (TuiLayoutDefPtr layoutDef) { if (layoutDef->split) { @@ -690,27 +627,13 @@ _tuiHandleXDBLayout (layoutDef) static void -#ifdef __STDC__ -_tuiToggleLayout_command ( - char *arg, - int fromTTY) -#else -_tuiToggleLayout_command (arg, fromTTY) - char *arg; - int fromTTY; -#endif +_tuiToggleLayout_command (char *arg, int fromTTY) { tuiDo ((TuiOpaqueFuncPtr) _tui_vToggleLayout_command, arg, fromTTY); } static void -#ifdef __STDC__ -_tui_vToggleLayout_command ( - va_list args) -#else -_tui_vToggleLayout_command (args) - va_list args; -#endif +_tui_vToggleLayout_command (va_list args) { TuiLayoutDefPtr layoutDef = tuiLayoutDef (); @@ -727,27 +650,13 @@ _tui_vToggleLayout_command (args) static void -#ifdef __STDC__ -_tuiToggleSplitLayout_command ( - char *arg, - int fromTTY) -#else -_tuiToggleSplitLayout_command (arg, fromTTY) - char *arg; - int fromTTY; -#endif +_tuiToggleSplitLayout_command (char *arg, int fromTTY) { tuiDo ((TuiOpaqueFuncPtr) _tui_vToggleSplitLayout_command, arg, fromTTY); } static void -#ifdef __STDC__ -_tui_vToggleSplitLayout_command ( - va_list args) -#else -_tui_vToggleSplitLayout_command (args) - va_list args; -#endif +_tui_vToggleSplitLayout_command (va_list args) { TuiLayoutDefPtr layoutDef = tuiLayoutDef (); @@ -759,15 +668,7 @@ _tui_vToggleSplitLayout_command (args) static void -#ifdef __STDC__ -_tuiLayout_command ( - char *arg, - int fromTTY) -#else -_tuiLayout_command (arg, fromTTY) - char *arg; - int fromTTY; -#endif +_tuiLayout_command (char *arg, int fromTTY) { if ((TuiStatus) tuiDo ( (TuiOpaqueFuncPtr) tui_vSetLayoutTo, arg) != TUI_SUCCESS) @@ -781,11 +682,7 @@ _tuiLayout_command (arg, fromTTY) ** Answer the previous layout to cycle to. */ static TuiLayoutType -#ifdef __STDC__ _nextLayout (void) -#else -_nextLayout () -#endif { TuiLayoutType newLayout; @@ -808,11 +705,7 @@ _nextLayout () ** Answer the next layout to cycle to. */ static TuiLayoutType -#ifdef __STDC__ _prevLayout (void) -#else -_prevLayout () -#endif { TuiLayoutType newLayout; @@ -835,17 +728,7 @@ _prevLayout () ** _makeCommandWindow(). */ static void -#ifdef __STDC__ -_makeCommandWindow ( - TuiWinInfoPtr * winInfoPtr, - int height, - int originY) -#else -_makeCommandWindow (winInfoPtr, height, originY) - TuiWinInfoPtr *winInfoPtr; - int height; - int originY; -#endif +_makeCommandWindow (TuiWinInfoPtr * winInfoPtr, int height, int originY) { _initAndMakeWin ((Opaque *) winInfoPtr, CMD_WIN, @@ -865,17 +748,7 @@ _makeCommandWindow (winInfoPtr, height, originY) ** _makeSourceWindow(). */ static void -#ifdef __STDC__ -_makeSourceWindow ( - TuiWinInfoPtr * winInfoPtr, - int height, - int originY) -#else -_makeSourceWindow (winInfoPtr, height, originY) - TuiWinInfoPtr *winInfoPtr; - int height; - int originY; -#endif +_makeSourceWindow (TuiWinInfoPtr * winInfoPtr, int height, int originY) { _makeSourceOrDisassemWindow (winInfoPtr, SRC_WIN, height, originY); @@ -887,17 +760,7 @@ _makeSourceWindow (winInfoPtr, height, originY) ** _makeDisassemWindow(). */ static void -#ifdef __STDC__ -_makeDisassemWindow ( - TuiWinInfoPtr * winInfoPtr, - int height, - int originY) -#else -_makeDisassemWindow (winInfoPtr, height, originY) - TuiWinInfoPtr *winInfoPtr; - int height; - int originY; -#endif +_makeDisassemWindow (TuiWinInfoPtr * winInfoPtr, int height, int originY) { _makeSourceOrDisassemWindow (winInfoPtr, DISASSEM_WIN, height, originY); @@ -909,17 +772,7 @@ _makeDisassemWindow (winInfoPtr, height, originY) ** _makeDataWindow(). */ static void -#ifdef __STDC__ -_makeDataWindow ( - TuiWinInfoPtr * winInfoPtr, - int height, - int originY) -#else -_makeDataWindow (winInfoPtr, height, originY) - TuiWinInfoPtr *winInfoPtr; - int height; - int originY; -#endif +_makeDataWindow (TuiWinInfoPtr * winInfoPtr, int height, int originY) { _initAndMakeWin ((Opaque *) winInfoPtr, DATA_WIN, @@ -939,11 +792,7 @@ _makeDataWindow (winInfoPtr, height, originY) ** Show the Source/Command layout */ static void -#ifdef __STDC__ _showSourceCommand (void) -#else -_showSourceCommand () -#endif { _showSourceOrDisassemAndCommand (SRC_COMMAND); @@ -956,11 +805,7 @@ _showSourceCommand () ** Show the Dissassem/Command layout */ static void -#ifdef __STDC__ _showDisassemCommand (void) -#else -_showDisassemCommand () -#endif { _showSourceOrDisassemAndCommand (DISASSEM_COMMAND); @@ -973,11 +818,7 @@ _showDisassemCommand () ** Show the Source/Disassem/Command layout */ static void -#ifdef __STDC__ _showSourceDisassemCommand (void) -#else -_showSourceDisassemCommand () -#endif { TuiGenWinInfoPtr locator = locatorWinInfoPtr (); @@ -1095,13 +936,7 @@ _showSourceDisassemCommand () ** Show the Source/Data/Command or the Dissassembly/Data/Command layout */ static void -#ifdef __STDC__ -_showData ( - TuiLayoutType newLayout) -#else -_showData (newLayout) - TuiLayoutType newLayout; -#endif +_showData (TuiLayoutType newLayout) { int totalHeight = (termHeight () - cmdWin->generic.height); int srcHeight, dataHeight; @@ -1169,23 +1004,8 @@ _showData (newLayout) ** _initGenWinInfo(). */ static void -#ifdef __STDC__ -_initGenWinInfo ( - TuiGenWinInfoPtr winInfo, - TuiWinType type, - int height, - int width, - int originX, - int originY) -#else -_initGenWinInfo (winInfo, type, height, width, originX, originY) - TuiGenWinInfoPtr winInfo; - TuiWinType type; - int height; - int width; - int originX; - int originY; -#endif +_initGenWinInfo (TuiGenWinInfoPtr winInfo, TuiWinType type, + int height, int width, int originX, int originY) { int h = height; @@ -1210,25 +1030,8 @@ _initGenWinInfo (winInfo, type, height, width, originX, originY) ** _initAndMakeWin(). */ static void -#ifdef __STDC__ -_initAndMakeWin ( - Opaque * winInfoPtr, - TuiWinType winType, - int height, - int width, - int originX, - int originY, - int boxIt) -#else -_initAndMakeWin (winInfoPtr, winType, height, width, originX, originY, boxIt) - Opaque *winInfoPtr; - TuiWinType winType; - int height; - int width; - int originX; - int originY; - int boxIt; -#endif +_initAndMakeWin (Opaque * winInfoPtr, TuiWinType winType, + int height, int width, int originX, int originY, int boxIt) { Opaque opaqueWinInfo = *winInfoPtr; TuiGenWinInfoPtr generic; @@ -1270,19 +1073,8 @@ _initAndMakeWin (winInfoPtr, winType, height, width, originX, originY, boxIt) ** _makeSourceOrDisassemWindow(). */ static void -#ifdef __STDC__ -_makeSourceOrDisassemWindow ( - TuiWinInfoPtr * winInfoPtr, - TuiWinType type, - int height, - int originY) -#else -_makeSourceOrDisassemWindow (winInfoPtr, type, height, originY) - TuiWinInfoPtr *winInfoPtr; - TuiWinType type; - int height; - int originY; -#endif +_makeSourceOrDisassemWindow (TuiWinInfoPtr * winInfoPtr, TuiWinType type, + int height, int originY) { TuiGenWinInfoPtr executionInfo = (TuiGenWinInfoPtr) NULL; @@ -1322,13 +1114,7 @@ _makeSourceOrDisassemWindow (winInfoPtr, type, height, originY) ** Show the Source/Command or the Disassem layout */ static void -#ifdef __STDC__ -_showSourceOrDisassemAndCommand ( - TuiLayoutType layoutType) -#else -_showSourceOrDisassemAndCommand (layoutType) - TuiLayoutType layoutType; -#endif +_showSourceOrDisassemAndCommand (TuiLayoutType layoutType) { if (currentLayout () != layoutType) { |