This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[PATCH]: Add filename title in TUI source window
- From: Stephane Carrez <stcarrez at nerim dot fr>
- To: gdb-patches at sources dot redhat dot com
- Date: Sun, 25 Aug 2002 15:08:47 +0200
- Subject: [PATCH]: Add filename title in TUI source window
Hi!
This patch adds a title to the TUI to display the complete file name on
top of the window (within the border). The file name was also truncated
when it was saved and this resulted in invalid breakpoint marking on the window.
I've committed this patch on mainline.
Stephane
2002-08-25 Stephane Carrez <stcarrez@nerim.fr>
* tuiSourceWin.c (tuiSetHasBreakAt): Use filename for breakpoint
comparison; cleanup.
* tuiSource.c (tuiSetSourceContent): Set window title and filename.
* tuiGeneralWin.c (boxWin): Print optional title on top of window.
* tuiData.h (TuiSourceInfo): Add filename member.
(TuiGenWinInfo): Add title member.
* tuiData.c (initGenericPart): Clear title.
(freeWindow): Free title and filename; remove unused locals.
(initWinInfo): Clear filename.
(tuiDelWindow): Free it; remove unused locals.
Index: tuiData.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiData.c,v
retrieving revision 1.8
diff -u -p -r1.8 tuiData.c
--- tuiData.c 1 Mar 2002 06:19:28 -0000 1.8
+++ tuiData.c 25 Aug 2002 10:44:27 -0000
@@ -843,9 +843,8 @@ initGenericPart (TuiGenWinInfoPtr win)
win->content = (OpaquePtr) NULL;
win->contentInUse =
win->isVisible = FALSE;
-
- return;
-} /* initGenericPart */
+ win->title = 0;
+}
/*
@@ -914,6 +913,7 @@ initWinInfo (TuiWinInfoPtr winInfo)
winInfo->detail.sourceInfo.hasLocator = FALSE;
winInfo->detail.sourceInfo.horizontalOffset = 0;
winInfo->detail.sourceInfo.startLineOrAddr.addr = 0;
+ winInfo->detail.sourceInfo.filename = 0;
break;
case DATA_WIN:
winInfo->detail.dataDisplayInfo.dataContent = (TuiWinContent) NULL;
@@ -1040,19 +1040,13 @@ addContentElements (TuiGenWinInfoPtr win
} /* addContentElements */
-/*
- ** tuiDelWindow().
- ** Delete all curses windows associated with winInfo, leaving everything
- ** else in tact.
- */
+/* Delete all curses windows associated with winInfo, leaving everything
+ else in tact. */
void
tuiDelWindow (TuiWinInfoPtr winInfo)
{
- Opaque detail;
- int i;
TuiGenWinInfoPtr genericWin;
-
switch (winInfo->generic.type)
{
case SRC_WIN:
@@ -1064,6 +1058,11 @@ tuiDelWindow (TuiWinInfoPtr winInfo)
genericWin->handle = (WINDOW *) NULL;
genericWin->isVisible = FALSE;
}
+ if (winInfo->detail.sourceInfo.filename)
+ {
+ xfree (winInfo->detail.sourceInfo.filename);
+ winInfo->detail.sourceInfo.filename = 0;
+ }
genericWin = winInfo->detail.sourceInfo.executionInfo;
if (genericWin != (TuiGenWinInfoPtr) NULL)
{
@@ -1075,14 +1074,10 @@ tuiDelWindow (TuiWinInfoPtr winInfo)
case DATA_WIN:
if (winInfo->generic.content != (OpaquePtr) NULL)
{
- int i;
-
- tuiDelDataWindows (
- winInfo->detail.dataDisplayInfo.regsContent,
- winInfo->detail.dataDisplayInfo.regsContentCount);
- tuiDelDataWindows (
- winInfo->detail.dataDisplayInfo.dataContent,
- winInfo->detail.dataDisplayInfo.dataContentCount);
+ tuiDelDataWindows (winInfo->detail.dataDisplayInfo.regsContent,
+ winInfo->detail.dataDisplayInfo.regsContentCount);
+ tuiDelDataWindows (winInfo->detail.dataDisplayInfo.dataContent,
+ winInfo->detail.dataDisplayInfo.dataContentCount);
}
break;
default:
@@ -1094,9 +1089,7 @@ tuiDelWindow (TuiWinInfoPtr winInfo)
winInfo->generic.handle = (WINDOW *) NULL;
winInfo->generic.isVisible = FALSE;
}
-
- return;
-} /* tuiDelWindow */
+}
/*
@@ -1105,11 +1098,8 @@ tuiDelWindow (TuiWinInfoPtr winInfo)
void
freeWindow (TuiWinInfoPtr winInfo)
{
- Opaque detail;
- int i;
TuiGenWinInfoPtr genericWin;
-
switch (winInfo->generic.type)
{
case SRC_WIN:
@@ -1121,6 +1111,11 @@ freeWindow (TuiWinInfoPtr winInfo)
genericWin->handle = (WINDOW *) NULL;
}
freeWinContent (genericWin);
+ if (winInfo->detail.sourceInfo.filename)
+ {
+ xfree (winInfo->detail.sourceInfo.filename);
+ winInfo->detail.sourceInfo.filename = 0;
+ }
genericWin = winInfo->detail.sourceInfo.executionInfo;
if (genericWin != (TuiGenWinInfoPtr) NULL)
{
@@ -1161,10 +1156,10 @@ freeWindow (TuiWinInfoPtr winInfo)
winInfo->generic.handle = (WINDOW *) NULL;
freeWinContent (&winInfo->generic);
}
+ if (winInfo->generic.title)
+ xfree (winInfo->generic.title);
xfree (winInfo);
-
- return;
-} /* freeWindow */
+}
/*
Index: tuiData.h
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiData.h,v
retrieving revision 1.8
diff -u -p -r1.8 tuiData.h
--- tuiData.h 25 Aug 2002 09:12:36 -0000 1.8
+++ tuiData.h 25 Aug 2002 10:44:27 -0000
@@ -1,5 +1,5 @@
/* TUI data manipulation routines.
- 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.
@@ -42,6 +42,7 @@
int viewportHeight; /* viewport height */
int lastVisibleLine; /* index of last visible line */
int isVisible; /* whether the window is visible or not */
+ char* title; /* Window title to display. */
}
TuiGenWinInfo, *TuiGenWinInfoPtr;
@@ -244,6 +245,7 @@ typedef struct _TuiSourceInfo
TuiGenWinInfoPtr executionInfo; /* execution information window */
int horizontalOffset; /* used for horizontal scroll */
TuiLineOrAddress startLineOrAddr;
+ char* filename;
}
TuiSourceInfo, *TuiSourceInfoPtr;
Index: tuiGeneralWin.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiGeneralWin.c,v
retrieving revision 1.11
diff -u -p -r1.11 tuiGeneralWin.c
--- tuiGeneralWin.c 24 Aug 2002 12:28:33 -0000 1.11
+++ tuiGeneralWin.c 25 Aug 2002 10:44:27 -0000
@@ -118,6 +118,8 @@ boxWin (TuiGenWinInfoPtr winInfo, int hi
tui_border_hline, tui_border_hline,
tui_border_ulcorner, tui_border_urcorner,
tui_border_llcorner, tui_border_lrcorner);
+ if (winInfo->title)
+ mvwaddstr (win, 0, 3, winInfo->title);
wattroff (win, attrs);
}
}
Index: tuiSource.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiSource.c,v
retrieving revision 1.9
diff -u -p -r1.9 tuiSource.c
--- tuiSource.c 1 Mar 2002 06:19:28 -0000 1.9
+++ tuiSource.c 25 Aug 2002 10:44:28 -0000
@@ -55,32 +55,12 @@
/*****************************************
-** EXTERNAL DATA DECLS **
-******************************************/
-extern int current_source_line;
-extern struct symtab *current_source_symtab;
-
-
-/*****************************************
** STATIC LOCAL FUNCTIONS FORWARD DECLS **
******************************************/
static struct breakpoint *_hasBreak (char *, int);
-/*****************************************
-** STATIC LOCAL DATA **
-******************************************/
-
-
-/*****************************************
-** PUBLIC FUNCTIONS **
-******************************************/
-
-/*********************************
-** SOURCE/DISASSEM FUNCTIONS **
-*********************************/
-
/*
** tuiSetSourceContent().
** Function to display source in the source window.
@@ -94,7 +74,7 @@ tuiSetSourceContent (struct symtab *s, i
{
register FILE *stream;
register int i, desc, c, lineWidth, nlines;
- register char *srcLine;
+ register char *srcLine = 0;
if ((ret = tuiAllocSourceBuffer (srcWin)) == TUI_SUCCESS)
{
@@ -136,17 +116,24 @@ tuiSetSourceContent (struct symtab *s, i
{
register int offset, curLineNo, curLine, curLen, threshold;
TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
- /*
- ** Determine the threshold for the length of the line
- ** and the offset to start the display
- */
- offset = srcWin->detail.sourceInfo.horizontalOffset;
+ TuiSourceInfoPtr src = &srcWin->detail.sourceInfo;
+
+ if (srcWin->generic.title)
+ xfree (srcWin->generic.title);
+ srcWin->generic.title = xstrdup (s->filename);
+
+ if (src->filename)
+ xfree (src->filename);
+ src->filename = xstrdup (s->filename);
+
+ /* Determine the threshold for the length of the line
+ and the offset to start the display. */
+ offset = src->horizontalOffset;
threshold = (lineWidth - 1) + offset;
stream = fdopen (desc, FOPEN_RT);
clearerr (stream);
curLine = 0;
- curLineNo =
- srcWin->detail.sourceInfo.startLineOrAddr.lineNo = lineNo;
+ curLineNo = src->startLineOrAddr.lineNo = lineNo;
if (offset > 0)
srcLine = (char *) xmalloc (
(threshold + 1) * sizeof (char));
Index: tuiSourceWin.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiSourceWin.c,v
retrieving revision 1.14
diff -u -p -r1.14 tuiSourceWin.c
--- tuiSourceWin.c 25 Aug 2002 08:44:44 -0000 1.14
+++ tuiSourceWin.c 25 Aug 2002 10:44:28 -0000
@@ -430,19 +430,11 @@ tuiSetHasBreakAt (struct breakpoint *bp,
if (winInfo == srcWin)
{
- char *fileNameDisplayed = (char *) NULL;
+ TuiSourceInfoPtr src = &winInfo->detail.sourceInfo;
- if (((TuiWinElementPtr)
- locator->content[0])->whichElement.locator.fileName !=
- (char *) NULL)
- fileNameDisplayed = ((TuiWinElementPtr)
- locator->content[0])->whichElement.locator.fileName;
- else if (current_source_symtab != (struct symtab *) NULL)
- fileNameDisplayed = current_source_symtab->filename;
-
- gotIt = (fileNameDisplayed != (char *) NULL &&
+ gotIt = (src->filename != (char *) NULL &&
bp->source_file != NULL &&
- (strcmp (bp->source_file, fileNameDisplayed) == 0) &&
+ (strcmp (bp->source_file, src->filename) == 0) &&
content[i]->whichElement.source.lineOrAddr.lineNo ==
bp->line_number);
}