hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-22 20:35:43 +00:00
Code Issues Projects Releases Wiki Activity

XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks

Browse source
This commit is contained in:
Kaleb Keithley 2003-11-25 19:29:01 +00:00
commit adc7f9a4eb
705 changed files with 30330 additions and 26603 deletions
Download patch file Download diff file Expand all files Collapse all files

21
fb/fb.h
View file

@ -1,5 +1,5 @@
/*
* $XFree86: xc/programs/Xserver/fb/fb.h,v 1.35 2003/01/30 21:46:30 tsi Exp $
* $XFree86: xc/programs/Xserver/fb/fb.h,v 1.37 2003/11/03 05:11:00 tsi Exp $
*
* Copyright © 1998 Keith Packard
*
@ -105,7 +105,8 @@ typedef unsigned __int64 FbBits;
defined(ia64) || defined(__ia64__) || \
defined(__sparc64__) || \
defined(__s390x__) || \
defined(x86_64) || defined (__x86_64__)
defined(AMD64) || defined (__AMD64__) || \
(defined(sgi) && (_MIPS_SZLONG == 64))
typedef unsigned long FbBits;
# else
typedef unsigned long long FbBits;
@ -652,10 +653,10 @@ typedef struct {
else \
_pPix = (PixmapPtr) (pDrawable); \
(pointer) = (FbBits *) _pPix->devPrivate.ptr; \
(stride) = ((int) _pPix->devKind) / sizeof (FbBits); \
(bpp) = _pPix->drawable.bitsPerPixel; \
(xoff) = __fbPixOriginX(_pPix); \
(yoff) = __fbPixOriginY(_pPix); \
(stride) = ((int) _pPix->devKind) / sizeof (FbBits); (void)(stride); \
(bpp) = _pPix->drawable.bitsPerPixel; (void)(bpp); \
(xoff) = __fbPixOriginX(_pPix); (void)(xoff); \
(yoff) = __fbPixOriginY(_pPix); (void)(yoff); \
}
#define fbGetStipDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { \
@ -665,10 +666,10 @@ typedef struct {
else \
_pPix = (PixmapPtr) (pDrawable); \
(pointer) = (FbStip *) _pPix->devPrivate.ptr; \
(stride) = ((int) _pPix->devKind) / sizeof (FbStip); \
(bpp) = _pPix->drawable.bitsPerPixel; \
(xoff) = __fbPixOriginX(_pPix); \
(yoff) = __fbPixOriginY(_pPix); \
(stride) = ((int) _pPix->devKind) / sizeof (FbStip); (void)(stride); \
(bpp) = _pPix->drawable.bitsPerPixel; (void)(bpp); \
(xoff) = __fbPixOriginX(_pPix); (void)(xoff); \
(yoff) = __fbPixOriginY(_pPix); (void)(yoff); \
}
/*

5
fb/fbbits.h
View file

@ -1,5 +1,5 @@
/*
* Id: fbbits.h,v 1.1 1999/11/02 03:54:45 keithp Exp $
* $XFree86: xc/programs/Xserver/fb/fbbits.h,v 1.14 2003/11/03 05:11:00 tsi Exp $
*
* Copyright © 1998 Keith Packard
*
@ -21,7 +21,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $XFree86: xc/programs/Xserver/fb/fbbits.h,v 1.13 2001/11/18 05:00:25 torrey Exp $ */
/*
* This file defines functions for drawing some primitives using
@ -824,8 +823,6 @@ POLYSEGMENT (DrawablePtr pDrawable,
ul = coordToInt(pBox->x1 - xoff, pBox->y1 - yoff);
lr = coordToInt(pBox->x2 - xoff - 1, pBox->y2 - yoff - 1);
bits += bitsStride * yoff + xoff * MUL;
capNotLast = pGC->capStyle == CapNotLast;
while (nseg--)

35
fb/fbcompose.c
View file

@ -1,5 +1,5 @@
/*
* $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.16 2002/11/06 22:45:35 keithp Exp $
* $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17 2003/11/03 05:11:00 tsi Exp $
*
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
*
@ -2826,9 +2826,6 @@ fbCompositeGeneral (CARD8 op,
CARD16 height)
{
FbCompositeOperand src[4],msk[4],dst[4],*pmsk;
FbCompositeOperand *srcPict, *srcAlpha;
FbCompositeOperand *dstPict, *dstAlpha;
FbCompositeOperand *mskPict = 0, *mskAlpha = 0;
FbCombineFunc f;
int w;
@ -2836,26 +2833,6 @@ fbCompositeGeneral (CARD8 op,
return;
if (!fbBuildCompositeOperand (pDst, dst, xDst, yDst, FALSE, TRUE))
return;
if (pSrc->alphaMap)
{
srcPict = &src[1];
srcAlpha = &src[2];
}
else
{
srcPict = &src[0];
srcAlpha = 0;
}
if (pDst->alphaMap)
{
dstPict = &dst[1];
dstAlpha = &dst[2];
}
else
{
dstPict = &dst[0];
dstAlpha = 0;
}
f = fbCombineFuncU[op];
if (pMask)
{
@ -2864,16 +2841,6 @@ fbCompositeGeneral (CARD8 op,
pmsk = msk;
if (pMask->componentAlpha)
f = fbCombineFuncC[op];
if (pMask->alphaMap)
{
mskPict = &msk[1];
mskAlpha = &msk[2];
}
else
{
mskPict = &msk[0];
mskAlpha = 0;
}
}
else
pmsk = 0;

4
fb/fbcopy.c
View file

@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.12 2001/07/16 05:04:05 keithp Exp $ */
/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.13 2003/11/10 18:21:47 tsi Exp $ */
#include "fb.h"
#ifdef IN_MODULE
@ -531,7 +531,7 @@ fbDoCopy (DrawablePtr pSrcDrawable,
/* Check to see if the region is empty */
if (box.x1 >= box.x2 || box.y1 >= box.y2)
{
REGION_INIT(pGC->pScreen, &rgnDst, NullBox, 0);
REGION_NULL(pGC->pScreen, &rgnDst);
}
else
{

8
fb/fbline.c
View file

@ -1,5 +1,5 @@
/*
* Id: fbline.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
* $XFree86: xc/programs/Xserver/fb/fbline.c,v 1.8 2003/11/03 05:11:00 tsi Exp $
*
* Copyright © 1998 Keith Packard
*
@ -21,7 +21,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $XFree86: xc/programs/Xserver/fb/fbline.c,v 1.7 2001/01/17 07:40:02 keithp Exp $ */
#include "fb.h"
@ -32,20 +31,15 @@ fbZeroLine (DrawablePtr pDrawable,
int npt,
DDXPointPtr ppt)
{
FbGCPrivPtr pPriv = fbGetGCPrivate (pGC);
int x1, y1, x2, y2;
int x, y;
int dashOffset;
int totalDash;
x = pDrawable->x;
y = pDrawable->y;
x1 = ppt->x;
y1 = ppt->y;
dashOffset = pGC->dashOffset;
totalDash = 0;
if (pGC->lineStyle != LineSolid)
totalDash = pPriv->dashLength;
while (--npt)
{
++ppt;

11
fb/fboverlay.c
View file

@ -1,5 +1,5 @@
/*
* $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.5 2002/09/16 18:05:34 eich Exp $
* $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.7 2003/11/10 18:21:47 tsi Exp $
*
* Copyright © 2000 SuSE, Inc.
*
@ -179,7 +179,7 @@ fbOverlayUpdateLayerRegion (ScreenPtr pScreen,
&pScrPriv->layer[i].u.run.region))
{
/* paint new piece with chroma key */
REGION_INIT (pScreen, &rgnNew, NullBox, 0);
REGION_NULL (pScreen, &rgnNew);
REGION_INTERSECT (pScreen,
&rgnNew,
prgn,
@ -210,13 +210,10 @@ fbOverlayCopyWindow(WindowPtr pWin,
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen);
RegionRec rgnDst;
int dx, dy;
WindowPtr pwinRoot;
int i;
RegionRec layerRgn[FB_OVERLAY_MAX];
PixmapPtr pPixmap;
pwinRoot = WindowTable[pWin->drawable.pScreen->myNum];
dx = ptOldOrg.x - pWin->drawable.x;
dy = ptOldOrg.y - pWin->drawable.y;
@ -224,7 +221,7 @@ fbOverlayCopyWindow(WindowPtr pWin,
* Clip to existing bits
*/
REGION_TRANSLATE(pScreen, prgnSrc, -dx, -dy);
REGION_INIT (pScreen, &rgnDst, NullBox, 0);
REGION_NULL (pScreen, &rgnDst);
REGION_INTERSECT(pScreen, &rgnDst, &pWin->borderClip, prgnSrc);
REGION_TRANSLATE(pScreen, &rgnDst, dx, dy);
/*
@ -232,7 +229,7 @@ fbOverlayCopyWindow(WindowPtr pWin,
*/
for (i = 0; i < pScrPriv->nlayers; i++)
{
REGION_INIT (pScreen, &layerRgn[i], NullBox, 0);
REGION_NULL (pScreen, &layerRgn[i]);
REGION_INTERSECT(pScreen, &layerRgn[i], &rgnDst,
&pScrPriv->layer[i].u.run.region);
if (REGION_NOTEMPTY (pScreen, &layerRgn[i]))

4
fb/fbwindow.c
View file

@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.10 2003/01/31 00:01:45 torrey Exp $ */
/* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.11 2003/11/10 18:21:47 tsi Exp $ */
#include "fb.h"
#ifdef IN_MODULE
@ -129,7 +129,7 @@ fbCopyWindow(WindowPtr pWin,
dy = ptOldOrg.y - pWin->drawable.y;
REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy);
REGION_INIT (pWin->drawable.pScreen, &rgnDst, NullBox, 0);
REGION_NULL (pWin->drawable.pScreen, &rgnDst);
REGION_INTERSECT(pWin->drawable.pScreen, &rgnDst, &pWin->borderClip, prgnSrc);