diff options
Diffstat (limited to 'mbone/vic/patches/patch-ae')
-rw-r--r-- | mbone/vic/patches/patch-ae | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/mbone/vic/patches/patch-ae b/mbone/vic/patches/patch-ae index f97e6c37c73..cd2ea2c99ee 100644 --- a/mbone/vic/patches/patch-ae +++ b/mbone/vic/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ +$NetBSD: patch-ae,v 1.4 2010/01/25 21:14:45 is Exp $ ---- /usr/local/pkgsrc//mbone/vic/work/vic-2.8/tkStripchart.c Sat Mar 16 22:14:00 1996 -+++ tkStripchart.c Tue Nov 18 13:16:26 1997 -@@ -148,7 +148,7 @@ +--- /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/tkStripchart.c.orig 1996-03-16 21:14:00.000000000 +0000 ++++ /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/tkStripchart.c +@@ -148,7 +148,7 @@ struct strip_struct { int scrollrequired; int guarantee_draw; int grow_up; @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ XColor *textColorPtr; /* Color for drawing text. */ GC textGC; /* GC for drawing text. */ XColor *tickColorPtr; /* Color for drawing ticks. */ -@@ -257,7 +257,7 @@ +@@ -257,7 +257,7 @@ static Tk_ConfigSpec configSpecs[] = {TK_CONFIG_SYNONYM, "-fg", "stripcolor", 0, 0, 0, 0}, {TK_CONFIG_FONT, "-font", "font", "Font", @@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ 0}, {TK_CONFIG_BOOLEAN, "-guaranteedrawing", "guaranteedrawing", "Guaranteedrawing", DEF_GUARANTEE_DRAW, -@@ -570,8 +570,8 @@ +@@ -570,8 +570,8 @@ DestroyStripchart(ClientData clientData) if (StripchartPtr->value != NULL) free(StripchartPtr->value); @@ -31,7 +31,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ if (StripchartPtr->textColorPtr != NULL) Tk_FreeColor(StripchartPtr->textColorPtr); -@@ -631,7 +631,7 @@ +@@ -631,7 +631,7 @@ ConfigureStripchart(Tcl_Interp *interp, Tk_SetBackgroundFromBorder(StripchartPtr->tkwin, StripchartPtr->border); @@ -40,7 +40,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ gcValues.foreground = StripchartPtr->textColorPtr->pixel; newGC = Tk_GetGC(StripchartPtr->tkwin, GCForeground|GCFont, &gcValues); if (StripchartPtr->textGC != None && StripchartPtr->tkwin) { -@@ -692,8 +692,11 @@ +@@ -692,8 +692,11 @@ ComputeStripchartGeometry(Stripchart* St { int tt = hasatitle(StripchartPtr); int bd = StripchartPtr->borderWidth; @@ -54,7 +54,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ Tk_GeometryRequest(StripchartPtr->tkwin, 2 * (bd + PADDING) + StripchartPtr->num_strips * -@@ -726,11 +729,13 @@ +@@ -726,11 +729,13 @@ DisplayStripchart(ClientData clientData) /* * Variable declarations used in the title drawing routines */ @@ -73,7 +73,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ StripchartPtr->displaybits &= ~REDRAW_PENDING; if ((StripchartPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) -@@ -747,18 +752,17 @@ +@@ -747,18 +752,17 @@ DisplayStripchart(ClientData clientData) * space. Otherwise left justified and clipped on the right. */ if (tt && StripchartPtr->displaybits & DISPLAY_TITLE) { @@ -97,7 +97,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ StripchartPtr->title, strlen(StripchartPtr->title)); } /* -@@ -1057,7 +1061,8 @@ +@@ -1057,7 +1061,8 @@ static void DrawStripi(Stripchart* SPtr, int i) { Tk_Window tkwin = SPtr->tkwin; @@ -107,7 +107,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ int x = SPtr->borderWidth + PADDING + (i - 1) * SPtr->strip_width; int y = SPtr->borderWidth + PADDING + hasatitle(SPtr) * (lineHeight + PADDING); -@@ -1066,6 +1071,9 @@ +@@ -1066,6 +1071,9 @@ DrawStripi(Stripchart* SPtr, int i) double maxv = SPtr->max_value; double minv = SPtr->min_value; @@ -117,7 +117,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ if (i < 1 || i > SPtr->num_strips) return; -@@ -1136,7 +1144,8 @@ +@@ -1136,7 +1144,8 @@ static void ScrollStrips(Stripchart* SPtr) { Tk_Window tkwin = SPtr->tkwin; @@ -127,12 +127,12 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ int src_x = SPtr->borderWidth + PADDING + SPtr->strip_width; int src_y = SPtr->borderWidth + PADDING + hasatitle(SPtr) * (lineHeight + PADDING); -@@ -1144,6 +1153,8 @@ - int dest_y = src_y; +@@ -1145,6 +1154,8 @@ ScrollStrips(Stripchart* SPtr) int w = (SPtr->num_strips - 1) * SPtr->strip_width; int h = SPtr->max_height; -+ -+ Tk_GetFontMetrics(SPtr->tkfont, &fm); ++ Tk_GetFontMetrics(SPtr->tkfont, &fm); ++ 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); + } |