frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disinfect mi/ of mfb.

This commit is contained in:
Adam Jackson 2007-11-17 21:23:05 -05:00
parent a969db091c
commit 748cfbc820
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mi/mipushpxl.c
View File

@ -53,11 +53,26 @@ SOFTWARE.
#include "scrnintstr.h" #include "scrnintstr.h"
#include "pixmapstr.h" #include "pixmapstr.h"
#include "regionstr.h" #include "regionstr.h"
#include "../mfb/maskbits.h"
#include "mi.h" #include "mi.h"
#include "servermd.h"
#define NPT 128 #define NPT 128
/* These were stolen from mfb. They don't really belong here. */
#define LONG2CHARSSAMEORDER(x) ((MiBits)(x))
#define LONG2CHARSDIFFORDER( x ) ( ( ( ( x ) & (MiBits)0x000000FF ) << 0x18 ) \
| ( ( ( x ) & (MiBits)0x0000FF00 ) << 0x08 ) \
| ( ( ( x ) & (MiBits)0x00FF0000 ) >> 0x08 ) \
| ( ( ( x ) & (MiBits)0xFF000000 ) >> 0x18 ) )
#define PGSZB 4
#define PPW (PGSZB<<3) /* assuming 8 bits per byte */
#define PGSZ PPW
#define PLST (PPW-1)
#define PIM PLST
#define PWSH 5
/* miPushPixels -- squeegees the fill style of pGC through pBitMap /* miPushPixels -- squeegees the fill style of pGC through pBitMap
* into pDrawable. pBitMap is a stencil (dx by dy of it is used, it may * into pDrawable. pBitMap is a stencil (dx by dy of it is used, it may
* be bigger) which is placed on the drawable at xOrg, yOrg. Where a 1 bit * be bigger) which is placed on the drawable at xOrg, yOrg. Where a 1 bit
@ -94,7 +109,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg)
DDXPointRec pt[NPT], ptThisLine; DDXPointRec pt[NPT], ptThisLine;
int width[NPT]; int width[NPT];
#if 1 #if 1
PixelType startmask; MiBits startmask;
if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER)
if (screenInfo.bitmapBitOrder == LSBFirst) if (screenInfo.bitmapBitOrder == LSBFirst)
startmask = (MiBits)(-1) ^ startmask = (MiBits)(-1) ^