*** x_pager.c.orig	Wed Jul 20 13:10:25 1994
--- x_pager.c	Wed Jul 20 13:21:45 1994
***************
*** 693,699 ****
        n1 = (Scr.Vx+t->x)/Scr.MyDisplayWidth;
        m1 = (Scr.Vy+t->y)/Scr.MyDisplayHeight;
        x = (Scr.Vx + t->x)*(icon_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!       y = (Scr.Vy + t->y)*(icon_h-n)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
        w = (Scr.Vx + t->x + t->width+2)*(icon_w-n)/
  	(Scr.VxMax + Scr.MyDisplayWidth) - 2 - x + n1;
        h = (Scr.Vy + t->y + t->height+2)*(icon_h-m)/
--- 693,699 ----
        n1 = (Scr.Vx+t->x)/Scr.MyDisplayWidth;
        m1 = (Scr.Vy+t->y)/Scr.MyDisplayHeight;
        x = (Scr.Vx + t->x)*(icon_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!       y = (Scr.Vy + t->y)*(icon_h-m)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
        w = (Scr.Vx + t->x + t->width+2)*(icon_w-n)/
  	(Scr.VxMax + Scr.MyDisplayWidth) - 2 - x + n1;
        h = (Scr.Vy + t->y + t->height+2)*(icon_h-m)/
***************
*** 882,888 ****
    n1 = (Scr.Vx+t->x)/Scr.MyDisplayWidth;
    m1 = (Scr.Vy+t->y)/Scr.MyDisplayHeight;
    x = (Scr.Vx + t->x)*(desk_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   y = (Scr.Vy + t->y)*(desk_h-n)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
    w = (Scr.Vx + t->x + t->width+2)*(desk_w-n)/
      (Scr.VxMax + Scr.MyDisplayWidth) - 2 - x + n1;
    h = (Scr.Vy + t->y + t->height+2)*(desk_h-m)/
--- 882,888 ----
    n1 = (Scr.Vx+t->x)/Scr.MyDisplayWidth;
    m1 = (Scr.Vy+t->y)/Scr.MyDisplayHeight;
    x = (Scr.Vx + t->x)*(desk_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   y = (Scr.Vy + t->y)*(desk_h-m)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
    w = (Scr.Vx + t->x + t->width+2)*(desk_w-n)/
      (Scr.VxMax + Scr.MyDisplayWidth) - 2 - x + n1;
    h = (Scr.Vy + t->y + t->height+2)*(desk_h-m)/
***************
*** 911,917 ****
  
  
    x = (Scr.Vx + t->x)*(icon_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   y = (Scr.Vy + t->y)*(icon_h-n)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
    w = (Scr.Vx + t->x + t->width+2)*(icon_w-n)/
      (Scr.VxMax + Scr.MyDisplayWidth) - 2 - x + n1;
    h = (Scr.Vy + t->y + t->height+2)*(icon_h-m)/
--- 911,917 ----
  
  
    x = (Scr.Vx + t->x)*(icon_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   y = (Scr.Vy + t->y)*(icon_h-m)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
    w = (Scr.Vx + t->x + t->width+2)*(icon_w-n)/
      (Scr.VxMax + Scr.MyDisplayWidth) - 2 - x + n1;
    h = (Scr.Vy + t->y + t->height+2)*(icon_h-m)/
***************
*** 965,971 ****
    n1 = (Scr.Vx+t->x)/Scr.MyDisplayWidth;
    m1 = (Scr.Vy+t->y)/Scr.MyDisplayHeight;
    x = (Scr.Vx + t->x)*(desk_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   y = (Scr.Vy + t->y)*(desk_h-n)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
    w = (Scr.Vx + t->x + t->width+2)*(desk_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) - 2 - x + n1;
    h = (Scr.Vy + t->y + t->height+2)*(desk_h-m)/(Scr.VyMax + Scr.MyDisplayHeight) -2 - y +m1;
    if (w < 1)
--- 965,971 ----
    n1 = (Scr.Vx+t->x)/Scr.MyDisplayWidth;
    m1 = (Scr.Vy+t->y)/Scr.MyDisplayHeight;
    x = (Scr.Vx + t->x)*(desk_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   y = (Scr.Vy + t->y)*(desk_h-m)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
    w = (Scr.Vx + t->x + t->width+2)*(desk_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) - 2 - x + n1;
    h = (Scr.Vy + t->y + t->height+2)*(desk_h-m)/(Scr.VyMax + Scr.MyDisplayHeight) -2 - y +m1;
    if (w < 1)
***************
*** 985,991 ****
    t->desk = i+desk1;
  
    x = (Scr.Vx + t->x)*(icon_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   y = (Scr.Vy + t->y)*(icon_h-n)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
    w = (Scr.Vx + t->x + t->width+2)*(icon_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) - 2 - x + n1;
    h = (Scr.Vy + t->y + t->height+2)*(icon_h-m)/(Scr.VyMax + Scr.MyDisplayHeight) -2 - y +m1;
    if (w < 1)
--- 985,991 ----
    t->desk = i+desk1;
  
    x = (Scr.Vx + t->x)*(icon_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   y = (Scr.Vy + t->y)*(icon_h-m)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
    w = (Scr.Vx + t->x + t->width+2)*(icon_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) - 2 - x + n1;
    h = (Scr.Vy + t->y + t->height+2)*(icon_h-m)/(Scr.VyMax + Scr.MyDisplayHeight) -2 - y +m1;
    if (w < 1)
***************
*** 1007,1013 ****
    n1 = (Scr.Vx+t->x)/Scr.MyDisplayWidth;
    m1 = (Scr.Vy+t->y)/Scr.MyDisplayHeight;
    x = (Scr.Vx + t->x)*(desk_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   y = (Scr.Vy + t->y)*(desk_h-n)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
    w = (Scr.Vx + t->x + t->width+2)*(desk_w-n)/
      (Scr.VxMax + Scr.MyDisplayWidth) - 2 - x + n1;
    h = (Scr.Vy + t->y + t->height+2)*(desk_h-m)/
--- 1007,1013 ----
    n1 = (Scr.Vx+t->x)/Scr.MyDisplayWidth;
    m1 = (Scr.Vy+t->y)/Scr.MyDisplayHeight;
    x = (Scr.Vx + t->x)*(desk_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   y = (Scr.Vy + t->y)*(desk_h-m)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
    w = (Scr.Vx + t->x + t->width+2)*(desk_w-n)/
      (Scr.VxMax + Scr.MyDisplayWidth) - 2 - x + n1;
    h = (Scr.Vy + t->y + t->height+2)*(desk_h-m)/
***************
*** 1027,1033 ****
      }
      
    x = (Scr.Vx + t->x)*(icon_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   y = (Scr.Vy + t->y)*(icon_h-n)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
    w = (Scr.Vx + t->x + t->width+2)*(icon_w-n)/
      (Scr.VxMax + Scr.MyDisplayWidth) - 2 - x + n1;
    h = (Scr.Vy + t->y + t->height+2)*(icon_h-m)/
--- 1027,1033 ----
      }
      
    x = (Scr.Vx + t->x)*(icon_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   y = (Scr.Vy + t->y)*(icon_h-m)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
    w = (Scr.Vx + t->x + t->width+2)*(icon_w-n)/
      (Scr.VxMax + Scr.MyDisplayWidth) - 2 - x + n1;
    h = (Scr.Vy + t->y + t->height+2)*(icon_h-m)/
***************
*** 1230,1236 ****
    n1 = (Scr.Vx+t->x)/Scr.MyDisplayWidth;
    m1 = (Scr.Vy+t->y)/Scr.MyDisplayHeight;
    wx = (Scr.Vx + t->x)*(desk_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   wy = (Scr.Vy + t->y)*(desk_h-n)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
    wx1 = wx+(desk_w+1)*(NewDesk%Columns);
    wy1 = wy + label_h + (desk_h+label_h+1)*(NewDesk/Columns);
  
--- 1230,1236 ----
    n1 = (Scr.Vx+t->x)/Scr.MyDisplayWidth;
    m1 = (Scr.Vy+t->y)/Scr.MyDisplayHeight;
    wx = (Scr.Vx + t->x)*(desk_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   wy = (Scr.Vy + t->y)*(desk_h-m)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
    wx1 = wx+(desk_w+1)*(NewDesk%Columns);
    wy1 = wy + label_h + (desk_h+label_h+1)*(NewDesk/Columns);
  
***************
*** 1499,1505 ****
    n1 = (Scr.Vx+t->x)/Scr.MyDisplayWidth;
    m1 = (Scr.Vy+t->y)/Scr.MyDisplayHeight;
    wx = (Scr.Vx + t->x)*(icon_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   wy = (Scr.Vy + t->y)*(icon_h-n)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
  
    XRaiseWindow(dpy,t->IconView);
  
--- 1499,1505 ----
    n1 = (Scr.Vx+t->x)/Scr.MyDisplayWidth;
    m1 = (Scr.Vy+t->y)/Scr.MyDisplayHeight;
    wx = (Scr.Vx + t->x)*(icon_w-n)/(Scr.VxMax + Scr.MyDisplayWidth) +n1;
!   wy = (Scr.Vy + t->y)*(icon_h-m)/(Scr.VyMax + Scr.MyDisplayHeight)+m1;
  
    XRaiseWindow(dpy,t->IconView);
  
