--- modules/FvwmPager/FvwmPager.c.orig	Fri Oct  1 10:19:03 1999
+++ modules/FvwmPager/FvwmPager.c	Tue Jul  4 19:24:13 2000
@@ -982,13 +982,8 @@
 
   Scr.MyDisplayWidth = DisplayWidth(dpy, Scr.screen);
   Scr.MyDisplayHeight = DisplayHeight(dpy, Scr.screen);
-
-  Scr.VxMax = 3*Scr.MyDisplayWidth - Scr.MyDisplayWidth;
-  Scr.VyMax = 3*Scr.MyDisplayHeight - Scr.MyDisplayHeight;
-  if(Scr.VxMax <0)
-    Scr.VxMax = 0;
-  if(Scr.VyMax <0)
-    Scr.VyMax = 0;
+  Scr.VxMax = 0;
+  Scr.VyMax = 0;
   Scr.Vx = 0;
   Scr.Vy = 0;
 
--- modules/FvwmPager/x_pager.c.orig	Fri Oct 15 02:45:15 1999
+++ modules/FvwmPager/x_pager.c	Tue Jul  4 19:26:43 2000
@@ -216,13 +216,13 @@
     }
   if(window_w > 0)
     {
-      window_w = ((window_w - n)/(n+1))*(n+1)+n;
+      window_w = window_w*Columns*(n+1) + Columns*(n+1)-1;
       Scr.VScale = Columns*(Scr.VxMax + Scr.MyDisplayWidth)/
 	(window_w-Columns+1-Columns*n);
     }
   if(window_h > 0)
     {
-      window_h = ((window_h - m)/(m+1))*(m+1)+m;
+      window_h = window_h*Rows*(m+1) + Rows*(m+1)-2;
       Scr.VScale = Rows*(Scr.VyMax + Scr.MyDisplayHeight)/
 	(window_h+2-Rows*(label_h -m-1));
     }
@@ -263,10 +263,10 @@
   sizehints.y = window_y;
   sizehints.width_inc = Columns*(n+1);
   sizehints.height_inc = Rows*(m+1);
-  sizehints.base_width = Columns * n + Columns - 1;
-  sizehints.base_height = Rows*(m + label_h+1) -2;
+  sizehints.base_width = window_w;
+  sizehints.base_height = window_h;
   sizehints.min_width = Columns * n + Columns - 1;
-  sizehints.min_height = Rows*(m + label_h+1) -2;
+  sizehints.min_height = Rows*(m + label_h+1) - 2;
 
   Scr.Pager_w = XCreateWindow (dpy, Scr.Root, window_x, window_y, window_w,
 			       window_h, (unsigned int) 1,