rpms/xdvik/devel xdvik-22.84.13-keepflag-scrollfix.patch, NONE, 1.1 xdvik.spec, 1.3, 1.4 texlive-2007-xdvi-keepflag.patch, 1.1, NONE

[Jonathan G. Underwood (jgu)]

Author: jgu

Update of /cvs/extras/rpms/xdvik/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31955

Modified Files:
	xdvik.spec 
Added Files:
	xdvik-22.84.13-keepflag-scrollfix.patch 
Removed Files:
	texlive-2007-xdvi-keepflag.patch 
Log Message:
* Wed Jan  16 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-7
- Replace texlive-2007-xdvi-keepflag.patch with
  xdvik-22.84.13-keepflag-fixscroll.patch to fix - BZ 417461 (Michal Jaegermann)


xdvik-22.84.13-keepflag-scrollfix.patch:

--- NEW FILE xdvik-22.84.13-keepflag-scrollfix.patch ---
--- xdvik-22.84.13/texk/xdvik/events.c.orig	2007-08-06 13:33:20.000000000 -0600
+++ xdvik-22.84.13/texk/xdvik/events.c	2008-01-18 13:30:19.000000000 -0700
@@ -700,10 +700,12 @@ home(wide_bool scrl)
     {
 	int value;
 
-	value = (globals.page.w - mane.width) / 2;
-	if (value > resource.sidemargin_int / mane.shrinkfactor)
-	    value = resource.sidemargin_int / mane.shrinkfactor;
-	(void)set_bar_value(globals.widgets.x_bar, value, (int)(globals.page.w - mane.width));
+	if (!resource.keep_flag) {
+	    value = (globals.page.w - mane.width) / 2;
+	    if (value > resource.sidemargin_int / mane.shrinkfactor)
+		value = resource.sidemargin_int / mane.shrinkfactor;
+	    (void)set_bar_value(globals.widgets.x_bar, value, (int)(globals.page.w - mane.width));
+	}
 
 	value = (globals.page.h - mane.height) / 2;
 	if (value > resource.topmargin_int / mane.shrinkfactor)
@@ -712,7 +714,7 @@ home(wide_bool scrl)
     }
 # else
     get_xy();
-    if (globals.widgets.x_bar != NULL) {
+    if (!resource.keep_flag && globals.widgets.x_bar != NULL) {
 	int coord = (globals.page.w - mane.width) / 2;
 
 	if (coord > resource.sidemargin_int / mane.shrinkfactor)
@@ -749,16 +751,18 @@ home_bottom(wide_bool scrl)
     {
 	int value;
 
-	value = (globals.page.w - mane.width) / 2;
-	if (value > resource.sidemargin_int / mane.shrinkfactor)
-	    value = resource.sidemargin_int / mane.shrinkfactor;
-	(void)set_bar_value(globals.widgets.x_bar, value, (int)(globals.page.w - mane.width));
+	if (!resource.keep_flag) {
+	    value = (globals.page.w - mane.width) / 2;
+	    if (value > resource.sidemargin_int / mane.shrinkfactor)
+		value = resource.sidemargin_int / mane.shrinkfactor;
+	    (void)set_bar_value(globals.widgets.x_bar, value, (int)(globals.page.w - mane.width));
+	}
 
 	(void)set_bar_value(globals.widgets.y_bar, (int)(globals.page.h - mane.height), (int)(globals.page.h - mane.height));
     }
 #else /* MOTIF */
     get_xy();
-    if (globals.widgets.x_bar != NULL) {
+    if (!resource.keep_flag && globals.widgets.x_bar != NULL) {
 	int coord = (globals.page.w - mane.width) / 2;
 
 	if (coord > resource.sidemargin_int / mane.shrinkfactor)
--- xdvik-22.84.13/texk/xdvik/xdvi.1.in.orig	2008-01-18 13:55:01.000000000 -0700
+++ xdvik-22.84.13/texk/xdvik/xdvi.1.in	2008-01-18 13:55:35.000000000 -0700
@@ -859,6 +859,14 @@ actions, not by
 .B up-or-previous()
 and
 .BR down-or-next() .
+(Note: this version of the program is modified to honour this
+flag for
+.B up-or-previous()
+and
+.BR down-or-next()
+although only for a horizontal position and not vertical. That allows
+for a "continuous" scrolling back an forth through a document with
+a display window narrower than a page width.)
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
 .B \-l


Index: xdvik.spec
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/xdvik.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xdvik.spec	15 Jan 2008 14:06:31 -0000	1.3
+++ xdvik.spec	19 Jan 2008 00:58:31 -0000	1.4
@@ -5,7 +5,7 @@
 Summary:        An X viewer for DVI files
 Name:           xdvik
 Version:        22.84.13
-Release:        6%{?dist}
+Release:        7%{?dist}
 Url:            http://xdvi.sourceforge.net/
 # encodings.c is GPLv2+ and LGPL and MIT
 # read-mapfile.c tfmload.c are from dvips
@@ -39,7 +39,7 @@
 %endif
 
 Patch1:         texlive-2007-xprint.patch
-Patch2:         texlive-2007-xdvi-keepflag.patch
+Patch2:         xdvik-22.84.13-keepflag-scrollfix.patch
 Patch3:         texlive-xdvi-maxchar.patch
 Patch4:         texlive-source-xdvi-numlock.patch
 Patch5:         xdvik-22.84.13-xdgopen.patch
@@ -72,7 +72,8 @@
 
 %patch1 -p1
 
-# Fix for navigation with a spacebar does not keep position (RH bug #168124)
+# Fix for navigation with a spacebar does not keep position
+# BZ #417461, 168124.
 %patch2 -p1
 
 %patch3 -p1
@@ -255,6 +256,10 @@
 %endif
 
 %changelog
+* Wed Jan  16 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-7
+- Replace texlive-2007-xdvi-keepflag.patch with
+  xdvik-22.84.13-keepflag-fixscroll.patch to fix - BZ 417461 (Michal Jaegermann)
+
 * Tue Jan  15 2008 Jindrich Novy <jnovy at redhat.com> - 22.84.13-6
 - apply temporary file creation fix for xdvizilla
 - better obsolete xdvi


--- texlive-2007-xdvi-keepflag.patch DELETED ---