(file) Return to xf86Cursor.c CVS log (file) (dir) Up to [XFree86 CVS] / xc / programs / Xserver / hw / xfree86 / common

Diff for /xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c between version 3.2 and 3.3

version 3.2, 1994/11/30 20:41:12 version 3.3, 1994/12/11 10:54:36
Line 1 
Line 1 
 /* $XConsortium: xf86Cursor.c,v 1.1 94/03/28 21:22:57 dpw Exp $ */ /* $XConsortium: xf86Cursor.c,v 1.1 94/03/28 21:22:57 dpw Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c,v 3.1 1994/10/20 07:25:20 dawes Exp $ */  /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c,v 3.2 1994/11/30 20:41:12 dawes Exp $ */
 /* /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  *  *
Line 59 
Line 59 
 xf86InitViewport(pScr) xf86InitViewport(pScr)
      ScrnInfoPtr pScr;      ScrnInfoPtr pScr;
 { {
   int           EVDisplay;  
   
   EVDisplay = pScr->modes->VDisplay;  
   if (pScr->modes->Flags & V_DBLSCAN)  
         EVDisplay /= 2;  
   
   /*   /*
    * Compute the initial Viewport if necessary    * Compute the initial Viewport if necessary
    */    */
   if (pScr->frameX0 < 0)   if (pScr->frameX0 < 0)
     {     {
       pScr->frameX0 = (pScr->virtualX - pScr->modes->HDisplay) / 2;       pScr->frameX0 = (pScr->virtualX - pScr->modes->HDisplay) / 2;
       pScr->frameY0 = (pScr->virtualY - EVDisplay) / 2;        pScr->frameY0 = (pScr->virtualY - pScr->modes->VDisplay) / 2;
     }     }
   pScr->frameX1 = pScr->frameX0 + pScr->modes->HDisplay - 1;   pScr->frameX1 = pScr->frameX0 + pScr->modes->HDisplay - 1;
   pScr->frameY1 = pScr->frameY0 + EVDisplay - 1;    pScr->frameY1 = pScr->frameY0 + pScr->modes->VDisplay - 1;
  
   /*   /*
    * Now adjust the initial Viewport, so it lies within the virtual area    * Now adjust the initial Viewport, so it lies within the virtual area
Line 87 
Line 81 
  
   if (pScr->frameY1 >= pScr->virtualY)   if (pScr->frameY1 >= pScr->virtualY)
     {     {
         pScr->frameY0 = pScr->virtualY - EVDisplay;          pScr->frameY0 = pScr->virtualY - pScr->modes->VDisplay;
         pScr->frameY1 = pScr->frameY0 + EVDisplay - 1;          pScr->frameY1 = pScr->frameY0 + pScr->modes->VDisplay - 1;
     }     }
 } }
  
Line 105 
Line 99 
 { {
   Bool          frameChanged = FALSE;   Bool          frameChanged = FALSE;
   ScrnInfoPtr   pScr = XF86SCRNINFO(pScreen);   ScrnInfoPtr   pScr = XF86SCRNINFO(pScreen);
   int           EVDisplay;  
   
   EVDisplay = pScr->modes->VDisplay;  
   if (pScr->modes->Flags & V_DBLSCAN)  
         EVDisplay /= 2;  
  
   /*   /*
    * check wether (x,y) belongs to the visual part of the screen    * check wether (x,y) belongs to the visual part of the screen
Line 129 
Line 118 
  
   if ( pScr->frameY0 > y) {   if ( pScr->frameY0 > y) {
     pScr->frameY0 = y;     pScr->frameY0 = y;
     pScr->frameY1 = y + EVDisplay - 1;      pScr->frameY1 = y + pScr->modes->VDisplay - 1;
     frameChanged = TRUE;     frameChanged = TRUE;
   }   }
  
   if ( pScr->frameY1 < y) {   if ( pScr->frameY1 < y) {
     pScr->frameY1 = y;     pScr->frameY1 = y;
     pScr->frameY0 = y - EVDisplay + 1;      pScr->frameY0 = y - pScr->modes->VDisplay + 1;
     frameChanged = TRUE;     frameChanged = TRUE;
   }   }
  
Line 155 
Line 144 
      int        zoom;      int        zoom;
 { {
   ScrnInfoPtr   pScr = XF86SCRNINFO(pScreen);   ScrnInfoPtr   pScr = XF86SCRNINFO(pScreen);
   int           EVDisplay;  
  
   if (pScr->modes != pScr->modes->next)   if (pScr->modes != pScr->modes->next)
   {   {
Line 163 
Line 151 
  
     if ((pScr->SwitchMode)(pScr->modes))     if ((pScr->SwitchMode)(pScr->modes))
     {     {
   
       EVDisplay = pScr->modes->VDisplay;  
       if (pScr->modes->Flags & V_DBLSCAN)  
           EVDisplay /= 2;  
   
       /*       /*
        * adjust new frame for the displaysize        * adjust new frame for the displaysize
        */        */
Line 185 
Line 168 
           pScr->frameX1 = pScr->frameX0 + pScr->modes->HDisplay - 1;           pScr->frameX1 = pScr->frameX0 + pScr->modes->HDisplay - 1;
         }         }
  
       pScr->frameY0 = (pScr->frameY1 + pScr->frameY0 - EVDisplay)/2;        pScr->frameY0 = (pScr->frameY1 + pScr->frameY0 - pScr->modes->VDisplay)/2;
       pScr->frameY1 = pScr->frameY0 + EVDisplay - 1;        pScr->frameY1 = pScr->frameY0 + pScr->modes->VDisplay - 1;
  
       if (pScr->frameY0 < 0)       if (pScr->frameY0 < 0)
         {         {
           pScr->frameY0 = 0;           pScr->frameY0 = 0;
           pScr->frameY1 = pScr->frameY0 + EVDisplay - 1;            pScr->frameY1 = pScr->frameY0 + pScr->modes->VDisplay - 1;
         }         }
       else if (pScr->frameY1 >= pScr->virtualY)       else if (pScr->frameY1 >= pScr->virtualY)
         {         {
           pScr->frameY0 = pScr->virtualY - EVDisplay;            pScr->frameY0 = pScr->virtualY - pScr->modes->VDisplay;
           pScr->frameY1 = pScr->frameY0 + EVDisplay - 1;            pScr->frameY1 = pScr->frameY0 + pScr->modes->VDisplay - 1;
         }         }
     }     }
     else /* switch failed, so go back to old mode */     else /* switch failed, so go back to old mode */

Legend:
Removed from v.3.2  
changed lines
  Added in v.3.3
Powered by
ViewCVS 0.9.2