From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9737 invoked by alias); 7 Feb 2004 01:14:09 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 9244 invoked from network); 7 Feb 2004 01:11:24 -0000 Received: from unknown (HELO localhost.redhat.com) (24.157.170.238) by sources.redhat.com with SMTP; 7 Feb 2004 01:11:24 -0000 Received: from gnu.org (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id 63AE52B92; Fri, 6 Feb 2004 20:10:53 -0500 (EST) Message-ID: <40243B1D.5080706@gnu.org> Date: Sat, 07 Feb 2004 01:14:00 -0000 From: Andrew Cagney User-Agent: Mozilla/5.0 (X11; U; NetBSD macppc; en-US; rv:1.0.2) Gecko/20030820 MIME-Version: 1.0 To: Andrew Cagney Cc: gdb-patches@sources.redhat.com Subject: Re: [commit/tui] Cleanup tui-win.h References: <40243917.5040502@gnu.org> Content-Type: multipart/mixed; boundary="------------010603040102030001000106" X-SW-Source: 2004-02/txt/msg00136.txt.bz2 This is a multi-part message in MIME format. --------------010603040102030001000106 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 33 mutter, mutter, really attached. --------------010603040102030001000106 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 13658 2004-02-06 Andrew Cagney * tui/tui-win.h: Update copyright. Include "tui-data.h". (struct tui_win_info): Declare. (tui_scroll_forward): Rename tuiScrollForward. (tui_scroll_backward): Rename tuiScrollBackward. (tui_scroll_left): Rename tuiScrollLeft. (tui_scroll_right): Rename tuiScrollRight. (tui_set_win_focus_to): Rename tuiSetWinFocusTo. (tui_resize_all): Rename tuiResizeAll. (tui_refresh_all_win): Rename tuiRefreshAll. (tui_sigwinch_handler): Rename tuiSigwinchHandler. * tui/tui-layout.c, * tui/tui-io.c: Update references. * tui/tui-wingeneral.h, * tui/tui.c: Update references. * tui/tui-disasm.c, * tui/tui-command.c: Update references. Index: tui/tui-command.c =================================================================== RCS file: /cvs/src/src/gdb/tui/tui-command.c,v retrieving revision 1.3 diff -u -r1.3 tui-command.c --- tui/tui-command.c 21 Jan 2004 04:16:53 -0000 1.3 +++ tui/tui-command.c 7 Feb 2004 01:00:28 -0000 @@ -104,27 +104,27 @@ switch (chCopy) { case KEY_NPAGE: - tuiScrollForward (winInfo, 0); + tui_scroll_forward (winInfo, 0); break; case KEY_PPAGE: - tuiScrollBackward (winInfo, 0); + tui_scroll_backward (winInfo, 0); break; case KEY_DOWN: case KEY_SF: - tuiScrollForward (winInfo, 1); + tui_scroll_forward (winInfo, 1); break; case KEY_UP: case KEY_SR: - tuiScrollBackward (winInfo, 1); + tui_scroll_backward (winInfo, 1); break; case KEY_RIGHT: - tuiScrollLeft (winInfo, 1); + tui_scroll_left (winInfo, 1); break; case KEY_LEFT: - tuiScrollRight (winInfo, 1); + tui_scroll_right (winInfo, 1); break; case '\f': - tuiRefreshAll (); + tui_refresh_all_win (); break; default: c = chCopy; Index: tui/tui-disasm.c =================================================================== RCS file: /cvs/src/src/gdb/tui/tui-disasm.c,v retrieving revision 1.5 diff -u -r1.5 tui-disasm.c --- tui/tui-disasm.c 6 Feb 2004 22:42:18 -0000 1.5 +++ tui/tui-disasm.c 7 Feb 2004 01:00:29 -0000 @@ -286,7 +286,7 @@ ** source view isn't split */ if (currentLayout () != SRC_DISASSEM_COMMAND && winWithFocus == srcWin) - tuiSetWinFocusTo (disassemWin); + tui_set_win_focus_to (disassemWin); return; } Index: tui/tui-io.c =================================================================== RCS file: /cvs/src/src/gdb/tui/tui-io.c,v retrieving revision 1.3 diff -u -r1.3 tui-io.c --- tui/tui-io.c 21 Jan 2004 04:16:53 -0000 1.3 +++ tui/tui-io.c 7 Feb 2004 01:00:34 -0000 @@ -584,7 +584,7 @@ resetty (); /* Force a refresh of the screen. */ - tuiRefreshAll (); + tui_refresh_all_win (); /* Update cursor position on the screen. */ wmove (cmdWin->generic.handle, @@ -712,7 +712,7 @@ { if (tuiWinResized ()) { - tuiRefreshAll (); + tui_refresh_all_win (); dont_repeat (); tuiSetWinResizedTo (FALSE); return '\n'; Index: tui/tui-layout.c =================================================================== RCS file: /cvs/src/src/gdb/tui/tui-layout.c,v retrieving revision 1.8 diff -u -r1.8 tui-layout.c --- tui/tui-layout.c 7 Feb 2004 00:23:56 -0000 1.8 +++ tui/tui-layout.c 7 Feb 2004 01:00:36 -0000 @@ -178,7 +178,7 @@ switch (newLayout) { case SRC_COMMAND: - tuiSetWinFocusTo (srcWin); + tui_set_win_focus_to (srcWin); layoutDef->displayMode = SRC_WIN; layoutDef->split = FALSE; break; @@ -191,7 +191,7 @@ ** We still want to show the assembly though! */ addr = tui_get_begin_asm_address (); - tuiSetWinFocusTo (disassemWin); + tui_set_win_focus_to (disassemWin); layoutDef->displayMode = DISASSEM_WIN; layoutDef->split = FALSE; break; @@ -205,16 +205,16 @@ */ addr = tui_get_begin_asm_address (); if (winWithFocus == srcWin) - tuiSetWinFocusTo (srcWin); + tui_set_win_focus_to (srcWin); else - tuiSetWinFocusTo (disassemWin); + tui_set_win_focus_to (disassemWin); layoutDef->split = TRUE; break; case SRC_DATA_COMMAND: if (winWithFocus != dataWin) - tuiSetWinFocusTo (srcWin); + tui_set_win_focus_to (srcWin); else - tuiSetWinFocusTo (dataWin); + tui_set_win_focus_to (dataWin); layoutDef->displayMode = SRC_WIN; layoutDef->split = FALSE; break; @@ -228,9 +228,9 @@ */ addr = tui_get_begin_asm_address (); if (winWithFocus != dataWin) - tuiSetWinFocusTo (disassemWin); + tui_set_win_focus_to (disassemWin); else - tuiSetWinFocusTo (dataWin); + tui_set_win_focus_to (dataWin); layoutDef->displayMode = DISASSEM_WIN; layoutDef->split = FALSE; break; @@ -239,7 +239,7 @@ } } if (newWinWithFocus != (TuiWinInfoPtr) NULL) - tuiSetWinFocusTo (newWinWithFocus); + tui_set_win_focus_to (newWinWithFocus); /* ** Now update the window content */ @@ -561,7 +561,7 @@ if (layoutDef->split) { tui_set_layout (SRC_DISASSEM_COMMAND, TUI_UNDEFINED_REGS); - tuiSetWinFocusTo (winList[layoutDef->displayMode]); + tui_set_win_focus_to (winList[layoutDef->displayMode]); } else { Index: tui/tui-win.c =================================================================== RCS file: /cvs/src/src/gdb/tui/tui-win.c,v retrieving revision 1.7 diff -u -r1.7 tui-win.c --- tui/tui-win.c 7 Feb 2004 00:23:56 -0000 1.7 +++ tui/tui-win.c 7 Feb 2004 01:00:42 -0000 @@ -423,12 +423,9 @@ } -/* - ** tuiSetWinFocusTo - ** Set the logical focus to winInfo - */ +/* Set the logical focus to winInfo. */ void -tuiSetWinFocusTo (TuiWinInfoPtr winInfo) +tui_set_win_focus_to (TuiWinInfoPtr winInfo) { if (m_winPtrNotNull (winInfo)) { @@ -446,11 +443,8 @@ } /* tuiSetWinFocusTo */ -/* - ** tuiScrollForward(). - */ void -tuiScrollForward (TuiWinInfoPtr winToScroll, int numToScroll) +tui_scroll_forward (TuiWinInfoPtr winToScroll, int numToScroll) { if (winToScroll != cmdWin) { @@ -471,16 +465,10 @@ else if (winToScroll == dataWin) tui_vertical_data_scroll (FORWARD_SCROLL, _numToScroll); } +} - return; -} /* tuiScrollForward */ - - -/* - ** tuiScrollBackward(). - */ void -tuiScrollBackward (TuiWinInfoPtr winToScroll, int numToScroll) +tui_scroll_backward (TuiWinInfoPtr winToScroll, int numToScroll) { if (winToScroll != cmdWin) { @@ -501,15 +489,11 @@ else if (winToScroll == dataWin) tui_vertical_data_scroll (BACKWARD_SCROLL, _numToScroll); } - return; -} /* tuiScrollBackward */ +} -/* - ** tuiScrollLeft(). - */ void -tuiScrollLeft (TuiWinInfoPtr winToScroll, int numToScroll) +tui_scroll_left (TuiWinInfoPtr winToScroll, int numToScroll) { if (winToScroll != cmdWin) { @@ -526,15 +510,11 @@ if (winToScroll == srcWin || winToScroll == disassemWin) tui_horizontal_source_scroll (winToScroll, LEFT_SCROLL, _numToScroll); } - return; -} /* tuiScrollLeft */ +} -/* - ** tuiScrollRight(). - */ void -tuiScrollRight (TuiWinInfoPtr winToScroll, int numToScroll) +tui_scroll_right (TuiWinInfoPtr winToScroll, int numToScroll) { if (winToScroll != cmdWin) { @@ -551,14 +531,10 @@ if (winToScroll == srcWin || winToScroll == disassemWin) tui_horizontal_source_scroll (winToScroll, RIGHT_SCROLL, _numToScroll); } - return; -} /* tuiScrollRight */ +} -/* - ** tui_scroll(). - ** Scroll a window. Arguments are passed through a va_list. - */ +/* Scroll a window. Arguments are passed through a va_list. */ void tui_scroll (TuiScrollDirection direction, TuiWinInfoPtr winToScroll, @@ -567,16 +543,16 @@ switch (direction) { case FORWARD_SCROLL: - tuiScrollForward (winToScroll, numToScroll); + tui_scroll_forward (winToScroll, numToScroll); break; case BACKWARD_SCROLL: - tuiScrollBackward (winToScroll, numToScroll); + tui_scroll_backward (winToScroll, numToScroll); break; case LEFT_SCROLL: - tuiScrollLeft (winToScroll, numToScroll); + tui_scroll_left (winToScroll, numToScroll); break; case RIGHT_SCROLL: - tuiScrollRight (winToScroll, numToScroll); + tui_scroll_right (winToScroll, numToScroll); break; default: break; @@ -584,11 +560,8 @@ } -/* - ** tuiRefreshAll(). - */ void -tuiRefreshAll (void) +tui_refresh_all_win (void) { TuiWinType type; @@ -905,7 +878,7 @@ The window name specified must be valid and visible.\n"); else { - tuiSetWinFocusTo (winInfo); + tui_set_win_focus_to (winInfo); keypad (cmdWin->generic.handle, (winInfo != cmdWin)); } @@ -968,7 +941,7 @@ /* Make sure the curses mode is enabled. */ tui_enable (); - tuiRefreshAll (); + tui_refresh_all_win (); } Index: tui/tui-win.h =================================================================== RCS file: /cvs/src/src/gdb/tui/tui-win.h,v retrieving revision 1.1 diff -u -r1.1 tui-win.h --- tui/tui-win.h 19 Jan 2004 04:31:51 -0000 1.1 +++ tui/tui-win.h 7 Feb 2004 01:00:42 -0000 @@ -1,5 +1,8 @@ /* TUI window generic functions. - Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + + Copyright 1998, 1999, 2000, 2001, 2002, 2004 Free Software + Foundation, Inc. + Contributed by Hewlett-Packard Company. This file is part of GDB. @@ -19,27 +22,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _TUI_WIN_H -#define _TUI_WIN_H - -/***************************************** -** TYPE DEFINITIONS ** -******************************************/ +#ifndef TUI_WIN_H +#define TUI_WIN_H +#include "tui/tui-data.h" +struct tui_win_info; -/***************************************** -** PUBLIC FUNCTION EXTERNAL DECLS ** -******************************************/ -extern void tuiScrollForward (TuiWinInfoPtr, int); -extern void tuiScrollBackward (TuiWinInfoPtr, int); -extern void tuiScrollLeft (TuiWinInfoPtr, int); -extern void tuiScrollRight (TuiWinInfoPtr, int); -extern void tui_scroll (TuiScrollDirection, TuiWinInfoPtr, int); -extern void tuiSetWinFocusTo (TuiWinInfoPtr); -extern void tuiResizeAll (void); -extern void tuiRefreshAll (void); -extern void tuiSigwinchHandler (int); +extern void tui_scroll_forward (struct tui_win_info *, int); +extern void tui_scroll_backward (struct tui_win_info *, int); +extern void tui_scroll_left (struct tui_win_info *, int); +extern void tui_scroll_right (struct tui_win_info *, int); +extern void tui_scroll (enum tui_scroll_direction, struct tui_win_info *, int); +extern void tui_set_win_focus_to (struct tui_win_info *); +extern void tui_resize_all (void); +extern void tui_refresh_all_win (void); +extern void tui_sigwinch_handler (int); extern chtype tui_border_ulcorner; extern chtype tui_border_urcorner; @@ -50,10 +48,9 @@ extern int tui_border_attrs; extern int tui_active_border_attrs; -extern int tui_update_variables (); +extern int tui_update_variables (void); /* Update gdb's knowledge of the terminal size. */ extern void tui_update_gdb_sizes (void); #endif -/*_TUI_WIN_H*/ Index: tui/tui-wingeneral.h =================================================================== RCS file: /cvs/src/src/gdb/tui/tui-wingeneral.h,v retrieving revision 1.2 diff -u -r1.2 tui-wingeneral.h --- tui/tui-wingeneral.h 6 Feb 2004 23:55:34 -0000 1.2 +++ tui/tui-wingeneral.h 7 Feb 2004 01:00:42 -0000 @@ -38,7 +38,7 @@ extern void tui_box_win (struct tui_gen_win_info *, int); extern void tui_highlight_win (struct tui_win_info *); extern void tui_check_and_display_highlight_if_needed (struct tui_win_info *); -extern void tui_refresh_all (struct tui_win_info * *); +extern void tui_refresh_all (struct tui_win_info **); extern void tui_delete_win (WINDOW * window); extern void tui_refresh_win (struct tui_gen_win_info *); Index: tui/tui-winsource.c =================================================================== RCS file: /cvs/src/src/gdb/tui/tui-winsource.c,v retrieving revision 1.5 diff -u -r1.5 tui-winsource.c --- tui/tui-winsource.c 6 Feb 2004 23:55:34 -0000 1.5 +++ tui/tui-winsource.c 7 Feb 2004 01:00:42 -0000 @@ -122,7 +122,7 @@ */ if (tuiWinWithFocus () == disassemWin && currentLayout () != SRC_DISASSEM_COMMAND) - tuiSetWinFocusTo (srcWin); + tui_set_win_focus_to (srcWin); } } Index: tui/tui.c =================================================================== RCS file: /cvs/src/src/gdb/tui/tui.c,v retrieving revision 1.38 diff -u -r1.38 tui.c --- tui/tui.c 7 Feb 2004 00:23:56 -0000 1.38 +++ tui/tui.c 7 Feb 2004 01:00:42 -0000 @@ -223,7 +223,7 @@ winInfo = tuiNextWin (tuiWinWithFocus ()); if (winInfo) { - tuiSetWinFocusTo (winInfo); + tui_set_win_focus_to (winInfo); if (dataWin && dataWin->generic.isVisible) tui_refresh_data_win (); keypad (cmdWin->generic.handle, (winInfo != cmdWin)); @@ -390,7 +390,7 @@ tui_show_frame_info (0); tui_set_layout (SRC_COMMAND, TUI_UNDEFINED_REGS); - tuiSetWinFocusTo (srcWin); + tui_set_win_focus_to (srcWin); keypad (cmdWin->generic.handle, TRUE); wrefresh (cmdWin->generic.handle); tui_finish_init = 0; @@ -417,7 +417,7 @@ /* Restore TUI keymap. */ tui_set_key_mode (tui_current_key_mode); - tuiRefreshAll (); + tui_refresh_all_win (); /* Update gdb's knowledge of its terminal. */ target_terminal_save_ours (); --------------010603040102030001000106--