aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/mi
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-30 23:52:44 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-30 23:52:44 +0100
commit6b3080d547ff63c9d6d8e08d9133c4e47d98ed39 (patch)
treec0413fcad46ac80edee6b62ee1807a6b3c87f2f6 /nx-X11/programs/Xserver/mi
parent23c66f400e52f9f98213fdd88cd77072c05c3e63 (diff)
parentb99c7872177bd22bfa182559f18cd77987382a36 (diff)
downloadnx-libs-6b3080d547ff63c9d6d8e08d9133c4e47d98ed39.tar.gz
nx-libs-6b3080d547ff63c9d6d8e08d9133c4e47d98ed39.tar.bz2
nx-libs-6b3080d547ff63c9d6d8e08d9133c4e47d98ed39.zip
Merge branch 'sunweaver-pr/drop-mfb-maskbits-h' into 3.6.x
Attributes GH PR #266: https://github.com/ArcticaProject/nx-libs/pull/266
Diffstat (limited to 'nx-X11/programs/Xserver/mi')
-rw-r--r--nx-X11/programs/Xserver/mi/mipushpxl.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/mi/mipushpxl.c b/nx-X11/programs/Xserver/mi/mipushpxl.c
index 19a8a3ed9..2bea5ef85 100644
--- a/nx-X11/programs/Xserver/mi/mipushpxl.c
+++ b/nx-X11/programs/Xserver/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];
#ifdef XFree86Server
- PixelType startmask;
+ MiBits startmask;
if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER)
if (screenInfo.bitmapBitOrder == LSBFirst)
startmask = (MiBits)(-1) ^