diff options
| author | Adam Jackson <ajax@aspartame.nwnk.net> | 2007-11-17 21:23:05 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@aspartame.nwnk.net> | 2007-11-17 21:23:05 -0500 |
| commit | 748cfbc820f8cdeb544c54a6db495fecf2e2457b (patch) | |
| tree | 3fdca07ca8b717dfad000fcfcbe9b6c18cf17bcf /mi | |
| parent | a969db091cab16a448f82782e85b3dd19c81627a (diff) | |
Disinfect mi/ of mfb.
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/mipushpxl.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c index 3695f30da..6fc57db11 100644 --- a/mi/mipushpxl.c +++ b/mi/mipushpxl.c @@ -53,11 +53,26 @@ SOFTWARE. #include "scrnintstr.h" #include "pixmapstr.h" #include "regionstr.h" -#include "../mfb/maskbits.h" #include "mi.h" +#include "servermd.h" #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 * 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 @@ -94,7 +109,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) DDXPointRec pt[NPT], ptThisLine; int width[NPT]; #if 1 - PixelType startmask; + MiBits startmask; if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) if (screenInfo.bitmapBitOrder == LSBFirst) startmask = (MiBits)(-1) ^ |