aboutsummaryrefslogtreecommitdiff
path: root/mbone/rtpmon
diff options
context:
space:
mode:
Diffstat (limited to 'mbone/rtpmon')
-rw-r--r--mbone/rtpmon/Makefile4
-rw-r--r--mbone/rtpmon/files/patch-aa302
-rw-r--r--mbone/rtpmon/files/patch-ac245
3 files changed, 512 insertions, 39 deletions
diff --git a/mbone/rtpmon/Makefile b/mbone/rtpmon/Makefile
index 8da5ea843e73..92f2dd8c4bf6 100644
--- a/mbone/rtpmon/Makefile
+++ b/mbone/rtpmon/Makefile
@@ -7,12 +7,12 @@
#
DISTNAME= rtpmon-1.0a7
-CATEGORIES= mbone tk42
+CATEGORIES= mbone tk82
MASTER_SITES= ftp://mm-ftp.cs.berkeley.edu/pub/rtpmon/
MAINTAINER= fenner@FreeBSD.org
-LIB_DEPENDS= tk42.1:${PORTSDIR}/x11-toolkits/tk42
+LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
GNU_CONFIGURE= yes
diff --git a/mbone/rtpmon/files/patch-aa b/mbone/rtpmon/files/patch-aa
index 39dbb2a57514..f794feddf129 100644
--- a/mbone/rtpmon/files/patch-aa
+++ b/mbone/rtpmon/files/patch-aa
@@ -1,40 +1,268 @@
---- configure.in.orig Wed Jan 15 14:44:04 1997
-+++ configure.in Wed Sep 24 17:09:03 1997
-@@ -109,6 +109,7 @@
- /usr/src/tcl7.6/generic \
- /usr/local/src/tcl7.6/generic \
- /usr/src/local/tcl7.6/generic \
-+ /usr/local/include/tcl7.6 \
- ../tcl7.5/generic \
- /usr/src/tcl7.5/generic \
- /usr/local/src/tcl7.5/generic \
-@@ -189,6 +190,10 @@
- AC_MSG_RESULT($place/libtcl7.6.a)
+--- configure.in.orig Wed Jan 15 16:44:04 1997
++++ configure.in Tue Nov 2 17:36:27 1999
+@@ -89,35 +89,8 @@
+ found_tcl_h="no"
+ libtcl="no"
+
+-AC_ARG_WITH(tcl, --with-tcl=path Specify a path for Tcl, dir=$withval, dir="none")
+-
+-if test "$dir" = "none" ; then
+- AC_CHECK_HEADER(tcl.h, found_tcl_h="yes", found_tcl_h="no")
+- AC_CHECK_LIB(tcl7.6, Tcl_Init, libtcl="-ltcl7.6", libtcl="no")
+- if test "$libtcl" = "no" ; then
+- AC_CHECK_LIB(tcl7.5, Tcl_Init, libtcl="-ltcl7.5", libtcl="no")
+- fi
+- if test "$libtcl" = "no" ; then
+- AC_CHECK_LIB(tcl, Tcl_Init, libtcl="-ltcl", libtcl="no")
+- fi
+-fi
+-
+-if test "$found_tcl_h" = "no" ; then
+ AC_MSG_CHECKING(for tcl.h)
+- places="$dir/include \
+- ../tcl7.6/generic \
+- /usr/src/tcl7.6/generic \
+- /usr/local/src/tcl7.6/generic \
+- /usr/src/local/tcl7.6/generic \
+- ../tcl7.5/generic \
+- /usr/src/tcl7.5/generic \
+- /usr/local/src/tcl7.5/generic \
+- /usr/src/local/tcl7.5/generic \
+- /usr/include \
+- /usr/local/include \
+- /usr/contrib/include \
+- $prefix/include \
+- $x_includes"
++ places="/usr/local/include/tcl8.2"
+
+ for place in $places ; do
+ if test -r $place/tcl.h ; then
+@@ -136,22 +109,10 @@
+ AC_MSG_RESULT(nope)
+ AC_MSG_ERROR([Can't find tcl.h. Try the --with-tcl option.])
+ fi
+-fi
+
+-if test "$libtcl" = "no" ; then
+ AC_MSG_CHECKING(for libtcl)
+ places="$dir/lib \
+- ../tcl7.6/unix \
+- /usr/src/tcl7.6/unix \
+- /usr/local/src/tcl7.6/unix \
+- /usr/src/local/tcl7.6/unix \
+- ../tcl7.5/unix \
+- /usr/src/tcl7.5/unix \
+- /usr/local/src/tcl7.5/unix \
+- /usr/src/local/tcl7.5/unix \
+- /usr/lib \
+ /usr/local/lib \
+- /usr/contrib/lib \
+ $prefix/lib \
+ $x_libraries"
+
+@@ -185,18 +146,10 @@
+ fi
+
+ if test "$libtcl" = "no" ; then
+- if test -r $place/libtcl7.6.a ; then
+- AC_MSG_RESULT($place/libtcl7.6.a)
+- LDFLAGS="$LDFLAGS -L$place"
+- libtcl="-ltcl7.6"
+- elif test -r $place/libtcl7.5.a ; then
+- AC_MSG_RESULT($place/libtcl7.5.a)
+- LDFLAGS="$LDFLAGS -L$place"
+- libtcl="-ltcl7.5"
+- elif test -r $place/libtcl.a ; then
+- AC_MSG_RESULT($place/libtcl.a)
++ if test -r $place/libtcl82.a ; then
++ AC_MSG_RESULT($place/libtcl82.a)
LDFLAGS="$LDFLAGS -L$place"
- libtcl="-ltcl7.6"
-+ elif test -r $place/libtcl76.a ; then
-+ AC_MSG_RESULT($place/libtcl7.6.a)
-+ LDFLAGS="$LDFLAGS -L$place"
-+ libtcl="-ltcl76"
- elif test -r $place/libtcl7.5.a ; then
- AC_MSG_RESULT($place/libtcl7.5.a)
- LDFLAGS="$LDFLAGS -L$place"
-@@ -287,6 +292,7 @@
- if test "$found_tk_h" = "no" ; then
+- libtcl="-ltcl"
++ libtcl="-ltcl82"
+ fi
+ fi
+
+@@ -209,40 +162,10 @@
+ AC_MSG_RESULT(nope)
+ AC_MSG_ERROR([Can't find libtcl. Try the --with-tcl option.])
+ fi
+-fi
+
+ found_init_tcl="no"
+ AC_MSG_CHECKING(for Tcl runtime libraries)
+-places="$dir/lib/tcl7.6 \
+- $dir/share/lib/tcl7.6 \
+- ../tcl7.6/library \
+- /usr/src/tcl7.6/library \
+- /usr/local/src/tcl7.6/library \
+- /usr/src/local/tcl7.6/library \
+- /usr/lib/tcl7.6 \
+- /usr/share/lib/tcl7.6 \
+- /usr/local/lib/tcl7.6 \
+- /usr/local/share/lib/tcl7.6 \
+- /usr/contrib/lib/tcl7.6 \
+- /usr/contrib/share/lib/tcl7.6 \
+- $prefix/lib/tcl7.6 \
+- $prefix/share/lib/tcl7.6 \
+- $x_libraries/tcl7.6 \
+- $dir/lib/tcl7.5 \
+- $dir/share/lib/tcl7.5 \
+- ../tcl7.5/library \
+- /usr/src/tcl7.5/library \
+- /usr/local/src/tcl7.5/library \
+- /usr/src/local/tcl7.5/library \
+- /usr/lib/tcl7.5 \
+- /usr/share/lib/tcl7.5 \
+- /usr/local/lib/tcl7.5 \
+- /usr/local/share/lib/tcl7.5 \
+- /usr/contrib/lib/tcl7.5 \
+- /usr/contrib/share/lib/tcl7.5 \
+- $prefix/lib/tcl7.5 \
+- $prefix/share/lib/tcl7.5 \
+- $x_libraries/tcl7.5"
++places="/usr/local/lib/tcl8.2"
+
+ for place in $places; do
+ if test -r $place/init.tcl ; then
+@@ -263,39 +186,8 @@
+ found_tk_h="no"
+ libtk="no"
+
+-AC_ARG_WITH(tk, --with-tk=path Specify a path for Tk, dir=$withval, dir="none")
+-
+-if test "$dir" = "none" ; then
+- AC_CHECK_HEADER(tk.h, found_tk_h="yes", found_tk_h="no")
+- if test "$sunos" = 1 ; then
+- AC_CHECK_LIB(tk42, Tk_Init, libtk="-ltk42", libtk="no")
+- if test "$libtk" = "no" ; then
+- AC_CHECK_LIB(tk41, Tk_Init, libtk="-ltk41", libtk="no")
+- fi
+- else
+- AC_CHECK_LIB(tk4.2, Tk_init, libtk="-ltk4.2", libtk="no")
+- if test "$libtk" = "no" ; then
+- AC_CHECK_LIB(tk4.1, Tk_Init, libtk="-ltk4.1", libtk="no")
+- fi
+- fi
+-
+- if test "$libtk" = "no" ; then
+- AC_CHECK_LIB(tk, Tk_Init, libtk="-ltk", libtk="no")
+- fi
+-fi
+-
+-if test "$found_tk_h" = "no" ; then
AC_MSG_CHECKING(for tk.h)
- places="$dir/include \
-+ /usr/local/include/tk4.2 \
- ../tk4.1/generic \
- /usr/src/tk4.1/generic \
- /usr/local/src/tk4.1/generic \
-@@ -349,6 +355,10 @@
- AC_MSG_RESULT($place/libtk4.2.a)
- LDFLAGS="$LDFLAGS -L$place"
- libtk="-ltk4.2"
-+ elif test -r $place/libtk42.a ; then
-+ AC_MSG_RESULT($place/libtk42.a)
-+ LDFLAGS="$LDFLAGS -L$place"
-+ libtk="-ltk42"
- elif test -r $place/libtk4.1.a ; then
- AC_MSG_RESULT($place/libtk4.1.a)
+- places="$dir/include \
+- ../tk4.1/generic \
+- /usr/src/tk4.1/generic \
+- /usr/local/src/tk4.1/generic \
+- /usr/src/local/tk4.1/generic \
+- /usr/include \
+- /usr/local/include \
+- /usr/contrib/include \
+- $prefix/include \
+- $x_includes"
++ places="/usr/local/include/tk8.2"
+
+ for place in $places; do
+ if test -r $place/tk.h ; then
+@@ -310,55 +202,19 @@
+ AC_MSG_RESULT(nope)
+ AC_MSG_ERROR([Can't find tk.h. Try the --with-tk option.])
+ fi
+-fi
+
+-if test "$libtk" = "no" ; then
+ AC_MSG_CHECKING(for libtk)
+ places="$dir/lib \
+- ../tk4.1/unix \
+- /usr/src/tk4.1/unix \
+- /usr/local/src/tk4.1/unix \
+- /usr/src/local/tk4.1/unix \
+- /usr/lib \
+ /usr/local/lib \
+- /usr/contrib/lib \
+ $prefix/lib \
+ $x_libraries"
+
+ for place in $places; do
+- if test "$solaris" = 1 ; then
+- if test -r $place/libtk4.1.so ; then
+- AC_MSG_RESULT($place/libtk4.1.so)
+- LDFLAGS="$LDFLAGS -R$place -L$place"
+- libtk="-ltk4.1"
+- elif test -r $place/libtk.so ; then
+- AC_MSG_RESULT($place/libtk.so)
+- LDFLAGS="$LDFLAGS -R$place -L$place"
+- libtk="-ltk"
+- fi
+- fi
+-
+- if test "$sunos" = 1 -a -r $place/libtk41.a ; then
+- AC_MSG_RESULT($place/libtk41.a)
+- LDFLAGS="$LDFLAGS -L$place"
+- libtk="-ltk41"
+- fi
+-
+- if test "$libtk" = "no" ; then
+- if test -r $place/libtk4.2.a ; then
+- AC_MSG_RESULT($place/libtk4.2.a)
++ if test -r $place/libtk82.a ; then
++ AC_MSG_RESULT($place/libtk82.a)
LDFLAGS="$LDFLAGS -L$place"
+- libtk="-ltk4.2"
+- elif test -r $place/libtk4.1.a ; then
+- AC_MSG_RESULT($place/libtk4.1.a)
+- LDFLAGS="$LDFLAGS -L$place"
+- libtk="-ltk4.1"
+- elif test -r $place/libtk.a ; then
+- AC_MSG_RESULT($place/libtk.a)
+- LDFLAGS="$LDFLAGS -L$place"
+- libtk="-ltk"
++ libtk="-ltk82"
+ fi
+- fi
+
+ if test "$libtk" != "no" ; then
+ break
+@@ -373,40 +229,10 @@
+ AC_MSG_RESULT(nope)
+ AC_MSG_ERROR([Can't find libtk. Try the --with-tk option.])
+ fi
+-fi
+
+ found_tk_tcl="no"
+ AC_MSG_CHECKING(for Tk runtime libraries)
+-places="$dir/lib/tk4.2 \
+- $dir/share/lib/tk4.2 \
+- ../tk4.2/library \
+- /usr/src/tk4.2/library \
+- /usr/local/src/tk4.2/library \
+- /usr/src/local/tk4.2/library \
+- /usr/lib/tk4.2 \
+- /usr/share/lib/tk4.2 \
+- /usr/local/lib/tk4.2 \
+- /usr/local/share/lib/tk4.2 \
+- /usr/contrib/lib/tk4.2 \
+- /usr/contrib/share/lib/tk4.2 \
+- $prefix/lib/tk4.2 \
+- $prefix/share/lib/tk4.2 \
+- $x_libraries/tk4.2 \
+- $dir/lib/tk4.1 \
+- $dir/share/lib/tk4.1 \
+- ../tk4.1/library \
+- /usr/src/tk4.1/library \
+- /usr/local/src/tk4.1/library \
+- /usr/src/local/tk4.1/library \
+- /usr/lib/tk4.1 \
+- /usr/share/lib/tk4.1 \
+- /usr/local/lib/tk4.1 \
+- /usr/local/share/lib/tk4.1 \
+- /usr/contrib/lib/tk4.1 \
+- /usr/contrib/share/lib/tk4.1 \
+- $prefix/lib/tk4.1 \
+- $prefix/share/lib/tk4.1 \
+- $x_libraries/tk4.1"
++places="/usr/local/lib/tk8.2"
+
+ for place in $places; do
+ if test -r $place/tk.tcl ; then
diff --git a/mbone/rtpmon/files/patch-ac b/mbone/rtpmon/files/patch-ac
new file mode 100644
index 000000000000..f47d4bf8103a
--- /dev/null
+++ b/mbone/rtpmon/files/patch-ac
@@ -0,0 +1,245 @@
+--- iohandler.cc.orig Wed Jan 15 16:44:05 1997
++++ iohandler.cc Tue Nov 2 17:06:47 1999
+@@ -37,13 +37,13 @@
+ void IOHandler::link(int fd, int mask)
+ {
+ fd_ = fd;
+- Tk_CreateFileHandler((ClientData) fd, mask, callback, (ClientData)this);
++ Tk_CreateFileHandler(fd, mask, callback, (ClientData)this);
+ }
+
+ void IOHandler::unlink()
+ {
+ if (fd_ >= 0) {
+- Tk_DeleteFileHandler((ClientData) fd_);
++ Tk_DeleteFileHandler(fd_);
+ fd_ = -1;
+ }
+ }
+--- main.cc.orig Wed Jan 15 16:44:05 1997
++++ main.cc Tue Nov 2 17:07:41 1999
+@@ -28,10 +28,8 @@
+ #endif
+ #include <X11/Xlib.h>
+
+-#ifdef _AIX
+ #include <stdlib.h>
+ #include <unistd.h>
+-#endif
+
+ /* Get FD_SETSIZE */
+ #if defined(linux)
+@@ -79,7 +77,7 @@
+ else {
+ Tk_Window tk = t.tkmain();
+ Tk_Uid uid = Tk_GetUid((char*)argv[1]);
+- XFontStruct* p = Tk_GetFontStruct(t.interp(), tk, uid);
++ Tk_Font p = Tk_GetFont(t.interp(), tk, uid);
+ t.result(p != 0 ? "1" : "0");
+ }
+ return (TCL_OK);
+--- member.cc.orig Wed Jan 15 16:44:05 1997
++++ member.cc Tue Nov 2 17:08:40 1999
+@@ -31,6 +31,8 @@
+ #include "Tcl.h"
+ #include "member.h"
+
++#include <stdlib.h>
++
+ #ifndef HAVE_SNPRINTF
+ extern "C" {
+ int snprintf(char* buf, int s, const char* fmt, ...);
+--- monitor.cc.orig Wed Jan 15 16:44:05 1997
++++ monitor.cc Tue Nov 2 17:09:04 1999
+@@ -922,7 +922,7 @@
+ sprintf(val, "%u ms", j);
+ break;
+ }
+- Tcl_SetVar2(interp, "median", s->name(), val, TCL_GLOBAL_ONLY);
++ Tcl_SetVar2(interp, "median", (char*)s->name(), val, TCL_GLOBAL_ONLY);
+ }
+ }
+
+--- tkStripchart.c.orig Wed Jan 15 16:44:06 1997
++++ tkStripchart.c Tue Nov 2 17:18:48 1999
+@@ -30,10 +30,6 @@
+ #include <math.h>
+ #include "tk.h"
+
+-#if TK_MINOR_VERSION<1
+-#define Tk_Cursor Cursor
+-#endif
+-
+ #define BLACK "Black"
+ #define WHITE "White"
+ #define GRAY "#b0b0b0"
+@@ -145,7 +141,7 @@
+ int scrollrequired;
+ int guarantee_draw;
+ int grow_up;
+- XFontStruct *fontPtr; /* Information about text font, or NULL. */
++ Tk_Font font; /* TK font */
+ XColor *textColorPtr; /* Color for drawing text. */
+ GC textGC; /* GC for drawing text. */
+ XColor *tickColorPtr; /* Color for drawing ticks. */
+@@ -254,7 +250,7 @@
+ {TK_CONFIG_SYNONYM, "-fg", "stripcolor", 0,
+ 0, 0, 0},
+ {TK_CONFIG_FONT, "-font", "font", "Font",
+- DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, fontPtr),
++ DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, font),
+ 0},
+ {TK_CONFIG_BOOLEAN, "-guaranteedrawing", "guaranteedrawing",
+ "Guaranteedrawing", DEF_GUARANTEE_DRAW,
+@@ -567,8 +563,8 @@
+ if (StripchartPtr->value != NULL)
+ free(StripchartPtr->value);
+
+- if (StripchartPtr->fontPtr != NULL)
+- Tk_FreeFontStruct(StripchartPtr->fontPtr);
++ if (StripchartPtr->font != NULL)
++ Tk_FreeFont(StripchartPtr->font);
+
+ if (StripchartPtr->textColorPtr != NULL)
+ Tk_FreeColor(StripchartPtr->textColorPtr);
+@@ -628,7 +624,7 @@
+
+ Tk_SetBackgroundFromBorder(StripchartPtr->tkwin, StripchartPtr->border);
+
+- gcValues.font = StripchartPtr->fontPtr->fid;
++ gcValues.font = Tk_FontId(StripchartPtr->font);
+ gcValues.foreground = StripchartPtr->textColorPtr->pixel;
+ newGC = Tk_GetGC(StripchartPtr->tkwin, GCForeground|GCFont, &gcValues);
+ if (StripchartPtr->textGC != None && StripchartPtr->tkwin) {
+@@ -689,9 +685,11 @@
+ {
+ int tt = hasatitle(StripchartPtr);
+ int bd = StripchartPtr->borderWidth;
+- int lineHeight = StripchartPtr->fontPtr->ascent +
+- StripchartPtr->fontPtr->descent;
++ int lineHeight;
++ Tk_FontMetrics metrics;
+
++ Tk_GetFontMetrics(StripchartPtr->font, &metrics);
++ lineHeight = metrics.ascent + metrics.descent;
+ Tk_GeometryRequest(StripchartPtr->tkwin,
+ 2 * (bd + PADDING) + StripchartPtr->num_strips *
+ StripchartPtr->strip_width,
+@@ -723,11 +721,14 @@
+ /*
+ * Variable declarations used in the title drawing routines
+ */
+- XFontStruct *fp = StripchartPtr->fontPtr;
+ XCharStruct bbox;
+ int x, dummy;
+- int lineHeight = StripchartPtr->fontPtr->ascent +
+- StripchartPtr->fontPtr->descent;
++ Tk_Font tkf = StripchartPtr->font;
++ int lineHeight;
++ Tk_FontMetrics fm;
++
++ Tk_GetFontMetrics(tkf, &fm);
++ lineHeight = fm.ascent + fm.descent;
+
+ StripchartPtr->displaybits &= ~REDRAW_PENDING;
+ if ((StripchartPtr->tkwin == NULL) || !Tk_IsMapped(tkwin))
+@@ -744,19 +745,20 @@
+ * space. Otherwise left justified and clipped on the right.
+ */
+ if (tt && StripchartPtr->displaybits & DISPLAY_TITLE) {
+- XTextExtents(fp, StripchartPtr->title,
+- strlen(StripchartPtr->title),
+- &dummy, &dummy, &dummy, &bbox);
+- if (bbox.lbearing + bbox.rbearing < Tk_Width(tkwin) - 2 * bd)
+- x = (Tk_Width(tkwin) - bbox.lbearing - bbox.rbearing)/2;
++ int width = Tk_TextWidth(tkf, StripchartPtr->title,
++ strlen(StripchartPtr->title));
++ if (width < Tk_Width(tkwin) - 2 * bd)
++ x = (Tk_Width(tkwin) - width)/2;
+ else
+- x = bd + PADDING;
+-
++ x = bd + PADDING;
+ XClearArea(Tk_Display(tkwin), Tk_WindowId(tkwin), bd, bd,
+- Tk_Width(tkwin) - 2 * bd, lineHeight + PADDING, False);
++ Tk_Width(tkwin) - 2*bd,
++ lineHeight + PADDING, False);
++ /* XXX In the absence of max_bounds, approximate... */
+ XDrawString(Tk_Display(tkwin), Tk_WindowId(tkwin),
+- StripchartPtr->textGC, x, fp->max_bounds.ascent + bd,
+- StripchartPtr->title, strlen(StripchartPtr->title));
++ StripchartPtr->textGC, x, fm.ascent + bd,
++ StripchartPtr->title,
++ strlen(StripchartPtr->title));
+ }
+ /*
+ * draw the strips
+@@ -827,7 +829,8 @@
+ Tk_CancelIdleCall(DisplayStripchart,
+ (ClientData)StripchartPtr);
+ }
+- Tk_EventuallyFree((ClientData)StripchartPtr, DestroyStripchart);
++ Tk_EventuallyFree((ClientData)StripchartPtr,
++ (Tcl_FreeProc*)DestroyStripchart);
+ } else if (eventPtr->type == ConfigureNotify) {
+ int n = eventPtr->xconfigure.width;
+ n -= 2 * (StripchartPtr->borderWidth + PADDING);
+@@ -1056,14 +1059,20 @@
+ DrawStripi(Stripchart* SPtr, int i)
+ {
+ Tk_Window tkwin = SPtr->tkwin;
+- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent;
++ int lineHeight;
+ int x = SPtr->borderWidth + PADDING + (i - 1) * SPtr->strip_width;
+- int y = SPtr->borderWidth + PADDING +
+- hasatitle(SPtr) * (lineHeight + PADDING);
++ int y;
+ int w = SPtr->strip_width;
+ int h;
+ double maxv = SPtr->max_value;
+ double minv = SPtr->min_value;
++ Tk_FontMetrics metrics;
++
++ Tk_GetFontMetrics(SPtr->font, &metrics);
++ lineHeight = metrics.ascent + metrics.descent;
++
++ y = SPtr->borderWidth + PADDING +
++ hasatitle(SPtr) * (lineHeight + PADDING);
+
+ if (i < 1 || i > SPtr->num_strips)
+ return;
+@@ -1135,14 +1144,20 @@
+ ScrollStrips(Stripchart* SPtr)
+ {
+ Tk_Window tkwin = SPtr->tkwin;
+- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent;
++ int lineHeight;
+ int src_x = SPtr->borderWidth + PADDING + SPtr->strip_width;
+- int src_y = SPtr->borderWidth + PADDING +
+- hasatitle(SPtr) * (lineHeight + PADDING);
++ int src_y;
+ int dest_x = src_x - SPtr->strip_width;
+ int dest_y = src_y;
+ int w = (SPtr->num_strips - 1) * SPtr->strip_width;
+ int h = SPtr->max_height;
++ Tk_FontMetrics metrics;
++
++ Tk_GetFontMetrics(SPtr->font, &metrics);
++ lineHeight = metrics.ascent = metrics.descent;
++
++ src_y = SPtr->borderWidth + PADDING +
++ hasatitle(SPtr) * (lineHeight + PADDING);
+
+ XCopyArea(Tk_Display(tkwin), Tk_WindowId(tkwin), Tk_WindowId(tkwin),
+ Tk_GetGC(tkwin, 0, NULL), src_x, src_y, w, h, dest_x, dest_y);
+--- ui-display.tcl.orig Wed Jan 15 16:44:06 1997
++++ ui-display.tcl Tue Nov 2 17:19:30 1999
+@@ -307,7 +307,7 @@
+ bind $b <Leave> "$b conf -bg [option get . background Rtpmon]"
+ bind $b <Button-1> "CreateInfoWindow $s"
+
+- menu $b.menu -transient yes
++ menu $b.menu
+ $b.menu add command -label "Site Info" -font [resource smallfont] \
+ -command "CreateInfoWindow $s"
+ $b.menu add command -label "Ignore" -font [resource smallfont] \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 01:41:46 +0000