Author: dnusinow
Date: 2006-02-26 19:10:27 -0500 (Sun, 26 Feb 2006)
New Revision: 1332
Added:
branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/patches/
branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/patches/01_Xaw_StripChart_fix.diff
branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/patches/series
Modified:
branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/changelog
branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/rules
Log:
* Port patches from trunk
+ general/012_Xaw_StripChart_fix.diff
Modified: branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/changelog 2006-02-26
23:57:11 UTC (rev 1331)
+++ branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/changelog 2006-02-27
00:10:27 UTC (rev 1332)
@@ -1,3 +1,10 @@
+libxaw (1:1.0.1-2) experimental; urgency=low
+
+ * Port patches from trunk
+ + general/012_Xaw_StripChart_fix.diff
+
+ -- David Nusinow <[EMAIL PROTECTED]> Sun, 26 Feb 2006 19:09:55 -0500
+
libxaw (1:1.0.1-1) UNRLEASED; urgency=low
* First upload to Debian
Added:
branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/patches/01_Xaw_StripChart_fix.diff
===================================================================
---
branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/patches/01_Xaw_StripChart_fix.diff
2006-02-26 23:57:11 UTC (rev 1331)
+++
branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/patches/01_Xaw_StripChart_fix.diff
2006-02-27 00:10:27 UTC (rev 1332)
@@ -0,0 +1,84 @@
+Index: libXaw-X11R7.0-1.0.1/src/StripChart.c
+===================================================================
+--- libXaw-X11R7.0-1.0.1.orig/src/StripChart.c 2005-12-30 14:50:24.000000000
-0500
++++ libXaw-X11R7.0-1.0.1/src/StripChart.c 2006-02-26 19:09:07.000000000
-0500
+@@ -373,12 +373,12 @@
+ * the returned value is identical to the initial value of next and data is
+ * unchanged. Otherwise keeps half a window's worth of data. If data is
+ * changed, then w->strip_chart.max_value is updated to reflect the
+- * largest data point
++ * largest data point.
+ */
+-static int
++static int
+ repaint_window(StripChartWidget w, int left, int width)
+ {
+- int i, j;
++ int i, j, k;
+ int next = w->strip_chart.interval;
+ int scale = w->strip_chart.scale;
+ int scalewidth = 0;
+@@ -423,8 +423,10 @@
+ }
+
+ /* Draw graph reference lines */
++ k = XtHeight(w) % w->strip_chart.scale;
+ for (i = 1; i < w->strip_chart.scale; i++) {
+- j = i * ((int)XtHeight(w) / w->strip_chart.scale);
++ j = i * (XtHeight(w) / w->strip_chart.scale) +
++ ((i * k + w->strip_chart.scale/2) / w->strip_chart.scale);
+ XDrawLine(dpy, win, w->strip_chart.hiGC, left, j, scalewidth, j);
+ }
+ }
+@@ -446,7 +448,7 @@
+ MoveChart(StripChartWidget w, Bool blit)
+ {
+ double old_max;
+- int left, i, j;
++ int left, i, j, k;
+ int next = w->strip_chart.interval;
+
+ if (!XtIsRealized((Widget)w))
+@@ -495,8 +497,10 @@
+
+ /* Draw graph reference lines */
+ left = j;
++ k = XtHeight(w) % w->strip_chart.scale;
+ for (i = 1; i < w->strip_chart.scale; i++) {
+- j = i * (XtHeight(w) / w->strip_chart.scale);
++ j = i * (XtHeight(w) / w->strip_chart.scale) +
++ ((i * k + w->strip_chart.scale/2) / w->strip_chart.scale);
+ XDrawLine(XtDisplay((Widget)w), XtWindow((Widget)w),
+ w->strip_chart.hiGC, left, j, XtWidth(w), j);
+ }
+@@ -557,23 +561,26 @@
+ StripChartWidget w = (StripChartWidget)widget;
+ XPoint *points;
+ Cardinal size;
+- int i;
++ int i, k;
+
+ if (w->strip_chart.scale <= 1) {
+ XtFree((char *)w->strip_chart.points);
+ w->strip_chart.points = NULL;
+ return;
+ }
+-
++
+ size = sizeof(XPoint) * (w->strip_chart.scale - 1);
+
+ points = (XPoint *)XtRealloc((XtPointer)w->strip_chart.points, size);
+ w->strip_chart.points = points;
+
+ /* Draw graph reference lines into clip mask */
+-
++ k = XtHeight(w) % w->strip_chart.scale;
+ for (i = 1; i < w->strip_chart.scale; i++) {
+ points[i - 1].x = 0;
+- points[i - 1].y = XtHeight(w) / w->strip_chart.scale;
++ points[i - 1].y = i * (XtHeight(w) / w->strip_chart.scale) +
++ ((i * k + w->strip_chart.scale/2) / w->strip_chart.scale);
+ }
++ for (i = w->strip_chart.scale - 1; i > 1; i--)
++ points[i - 1].y -= points[i - 2].y;
+ }
Added: branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/patches/series
===================================================================
--- branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/patches/series
2006-02-26 23:57:11 UTC (rev 1331)
+++ branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/patches/series
2006-02-27 00:10:27 UTC (rev 1332)
@@ -0,0 +1 @@
+01_Xaw_StripChart_fix.diff
Modified: branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/rules
===================================================================
--- branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/rules 2006-02-26
23:57:11 UTC (rev 1331)
+++ branches/modular/lib/libXaw-X11R7.0-1.0.1/debian/rules 2006-02-27
00:10:27 UTC (rev 1332)
@@ -29,7 +29,7 @@
endif
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -42,7 +42,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
