head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.192 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.190 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.188 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.186 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.184 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.182 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.180 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.178 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.176 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.174 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.172 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.170 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.168 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.166 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.164 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.162 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.160 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.158 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.156 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.154 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.152 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.150 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.148 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.144 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.124 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.146 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.142 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.140 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.138 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.136 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.134 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.132 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.130 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.128 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.126 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.122 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.120 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.118 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.116 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.114 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.112 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.110 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.108 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.106 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.104 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.102 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.100 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.98 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.96 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.94 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.92 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.90 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.88 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.86 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.84 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.82 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.80 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.78 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.76 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.74 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.72 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.70 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.68 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.66 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.64 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.62 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.60 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.58 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.56 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.54 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.52 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.50 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.48 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.46 pkgsrc-2008Q1:1.2.0.44 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.42 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.40 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.38 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.36 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.34 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.32 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.30 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.28 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.26 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2 netbsd-1-3-PATCH002:1.1.1.1 FREEBSD_19971120:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.2 date 98.08.07.11.10.03; author agc; state Exp; branches; next 1.1; 1.1 date 97.11.20.12.20.01; author is; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 97.11.20.12.20.01; author is; state Exp; branches; next ; desc @@ 1.2 log @Add NetBSD RCS Ids. @ text @$NetBSD$ --- tkStripchart.c.orig Tue Sep 9 11:00:42 1997 +++ tkStripchart.c Tue Sep 9 10:52:30 1997 @@@@ -148,7 +148,7 @@@@ int scrollrequired; int guarantee_draw; int grow_up; - XFontStruct *fontPtr; /* Information about text font, or NULL. */ + Tk_Font tkfont; /* Information about text font, or NULL. */ XColor *textColorPtr; /* Color for drawing text. */ GC textGC; /* GC for drawing text. */ XColor *tickColorPtr; /* Color for drawing ticks. */ @@@@ -257,7 +257,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, tkfont), 0}, {TK_CONFIG_BOOLEAN, "-guaranteedrawing", "guaranteedrawing", "Guaranteedrawing", DEF_GUARANTEE_DRAW, @@@@ -570,8 +570,8 @@@@ if (StripchartPtr->value != NULL) free(StripchartPtr->value); - if (StripchartPtr->fontPtr != NULL) - Tk_FreeFontStruct(StripchartPtr->fontPtr); + if (StripchartPtr->tkfont != NULL) + Tk_FreeFont(StripchartPtr->tkfont); if (StripchartPtr->textColorPtr != NULL) Tk_FreeColor(StripchartPtr->textColorPtr); @@@@ -631,7 +631,7 @@@@ Tk_SetBackgroundFromBorder(StripchartPtr->tkwin, StripchartPtr->border); - gcValues.font = StripchartPtr->fontPtr->fid; + gcValues.font = Tk_FontId(StripchartPtr->tkfont); gcValues.foreground = StripchartPtr->textColorPtr->pixel; newGC = Tk_GetGC(StripchartPtr->tkwin, GCForeground|GCFont, &gcValues); if (StripchartPtr->textGC != None && StripchartPtr->tkwin) { @@@@ -692,8 +692,11 @@@@ { int tt = hasatitle(StripchartPtr); int bd = StripchartPtr->borderWidth; - int lineHeight = StripchartPtr->fontPtr->ascent + - StripchartPtr->fontPtr->descent; + Tk_FontMetrics fm; + int lineHeight; + + Tk_GetFontMetrics(StripchartPtr->tkfont, &fm); + lineHeight = fm.ascent + fm.descent; Tk_GeometryRequest(StripchartPtr->tkwin, 2 * (bd + PADDING) + StripchartPtr->num_strips * @@@@ -726,11 +729,13 @@@@ /* * 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->tkfont; + int x; + Tk_FontMetrics fm; + int lineHeight; + + Tk_GetFontMetrics(tkf, &fm); + lineHeight = fm.ascent + fm.descent; StripchartPtr->displaybits &= ~REDRAW_PENDING; if ((StripchartPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) @@@@ -747,18 +752,17 @@@@ * 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; XClearArea(Tk_Display(tkwin), Tk_WindowId(tkwin), bd, bd, Tk_Width(tkwin) - 2 * bd, lineHeight + PADDING, False); XDrawString(Tk_Display(tkwin), Tk_WindowId(tkwin), - StripchartPtr->textGC, x, fp->max_bounds.ascent + bd, + StripchartPtr->textGC, x, fm.ascent + bd, /*XXX no max_bounds */ StripchartPtr->title, strlen(StripchartPtr->title)); } /* @@@@ -1057,7 +1061,8 @@@@ DrawStripi(Stripchart* SPtr, int i) { Tk_Window tkwin = SPtr->tkwin; - int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent; + Tk_FontMetrics fm; + int lineHeight; int x = SPtr->borderWidth + PADDING + (i - 1) * SPtr->strip_width; int y = SPtr->borderWidth + PADDING + hasatitle(SPtr) * (lineHeight + PADDING); @@@@ -1066,6 +1071,9 @@@@ double maxv = SPtr->max_value; double minv = SPtr->min_value; + Tk_GetFontMetrics(SPtr->tkfont, &fm); + lineHeight = fm.ascent + fm.descent; + if (i < 1 || i > SPtr->num_strips) return; @@@@ -1136,7 +1144,8 @@@@ ScrollStrips(Stripchart* SPtr) { Tk_Window tkwin = SPtr->tkwin; - int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent; + Tk_FontMetrics fm; + int lineHeight; 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; int w = (SPtr->num_strips - 1) * SPtr->strip_width; int h = SPtr->max_height; + + 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); @ 1.1 log @Initial revision @ text @d1 2 @ 1.1.1.1 log @Initial import of FreeBSD "vat" port. @ text @@