From 5ecb18062a4db32339e1e2288686cc3ecdb5c428 Mon Sep 17 00:00:00 2001 From: Stephane Carrez Date: Sat, 21 Jul 2001 22:31:14 +0000 Subject: * utils.c (init_page_info): Use tui_get_command_dimension. * printcmd.c (disassemble_command): Simplify tui specific code, use tui_is_window_visible, tui_show_assembly. --- gdb/printcmd.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'gdb/printcmd.c') diff --git a/gdb/printcmd.c b/gdb/printcmd.c index b0d8d72..ec77715 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -1396,8 +1396,7 @@ display_command (char *exp, int from_tty) #if defined(TUI) if (tui_version && *exp == '$') - display_it = ((TuiStatus) tuiDo ( - (TuiOpaqueFuncPtr) tui_vSetLayoutTo, exp) == TUI_FAILURE); + display_it = (tui_set_layout (exp) == TUI_FAILURE); #endif if (display_it) @@ -2335,9 +2334,7 @@ disassemble_command (char *arg, int from_tty) error ("No function contains program counter for selected frame.\n"); #if defined(TUI) else if (tui_version) - low = (CORE_ADDR) tuiDo ((TuiOpaqueFuncPtr) tui_vGetLowDisassemblyAddress, - (Opaque) low, - (Opaque) pc); + low = tuiGetLowDisassemblyAddress (low, pc); #endif low += FUNCTION_START_OFFSET; } @@ -2349,9 +2346,7 @@ disassemble_command (char *arg, int from_tty) error ("No function contains specified address.\n"); #if defined(TUI) else if (tui_version) - low = (CORE_ADDR) tuiDo ((TuiOpaqueFuncPtr) tui_vGetLowDisassemblyAddress, - (Opaque) low, - (Opaque) pc); + low = tuiGetLowDisassemblyAddress (low, pc); #endif #if 0 if (overlay_debugging) @@ -2378,8 +2373,7 @@ disassemble_command (char *arg, int from_tty) } #if defined(TUI) - if (!tui_version || - m_winPtrIsNull (disassemWin) || !disassemWin->generic.isVisible) + if (!tui_is_window_visible (DISASSEM_WIN)) #endif { printf_filtered ("Dump of assembler code "); @@ -2427,8 +2421,7 @@ disassemble_command (char *arg, int from_tty) #if defined(TUI) else { - tuiDo ((TuiOpaqueFuncPtr) tui_vAddWinToLayout, DISASSEM_WIN); - tuiDo ((TuiOpaqueFuncPtr) tui_vUpdateSourceWindowsWithAddr, low); + tui_show_assembly (low); } #endif } -- cgit v1.1