Merge branch 'sunweaver-pr/drop-mfb-maskbits-h' into 3.6.x

nx-X11/programs/Xserver/Imakefile

@@ -46,35 +46,20 @@ INSTPGMFLAGS =
 #endif
 
 #define PreFbLibs $(DIX) $(OS) $(XPDDX)
-#define PreFbLibsNoFont $(DIX) $(OS)
-#define BarePostFbLibs $(MFB) $(XPFBLIBS) $(MI)
+#define BarePostFbLibs $(XPFBLIBS) $(MI)
 #define PostFbLibs BarePostFbLibs $(EXTENSIONS)
-#define NoMfbBarePostFbLibs $(XPFBLIBS) $(MI)
+
 #if !BuildXinerama
-#define NoMfbPostFbLibs NoMfbBarePostFbLibs $(EXTENSIONS)
+#define FbPostFbLibs $(FB) BarePostFbLibs $(EXTENSIONS)
 #else
-#define NoMfbPostFbLibs $(EXTENSIONS) NoMfbBarePostFbLibs $(EXTENSIONS)
-#endif
-
-#define MFBBareLibs PreFbLibs BarePostFbLibs
-#define NoMFBBareLibs PreFbLibs NoMfbBarePostFbLibs
-#define MFBLibs PreFbLibs PostFbLibs
-#define NoMFBLibs PreFbLibs NoMfbPostFbLibs
-#define CFBLibs PreFbLibs $(CFB) PostFbLibs
-#define CFB4Libs PreFbLibs $(CFB4) PostFbLibs
-#define CFB8Libs PreFbLibs $(CFB8) PostFbLibs
-#define CFB16Libs PreFbLibs $(CFB16) PostFbLibs
-#define CFB24Libs PreFbLibs $(CFB24) PostFbLibs
-#define CFB32Libs PreFbLibs $(CFB32) PostFbLibs
-
-#define NoMFBCFBLibs PreFbLibs $(CFB) NoMfbPostFbLibs
-#define NoMFBCFB8Libs PreFbLibs $(CFB8) NoMfbPostFbLibs
-#define FbPostFbLibs  $(FB) NoMfbPostFbLibs
+#define FbPostFbLibs $(FB) $(EXTENSIONS) BarePostFbLibs $(EXTENSIONS)
+#endif
+
 #define FBLibs PreFbLibs FbPostFbLibs
 
 #define MiExtLibs $(SHADOW)
 
-#define AllFBLibs PreFbLibs $(FB) $(CFB) PostFbLibs
+#define AllFBLibs PreFbLibs $(FB) PostFbLibs
 
 #if BuildGlxExt
 # if DoLoadableServer
@@ -172,54 +157,14 @@ INSTPGMFLAGS =
              OS = os/LibraryTargetName(os)
         BSDEMUL = $(DEPXBSDLIB)
 #if DoLoadableServer
-            MFB = mfb/ModuleLibraryTargetName(mfb)
              FB = fb/ModuleLibraryTargetName(fb)
-#if XF8_32Wid
-            CFB = cfb/ModuleLibraryTargetName(cfb) \
-		  cfb16/ModuleLibraryTargetName(cfb16) \
-		  cfb24/ModuleLibraryTargetName(cfb24) \
-		  cfb32/ModuleLibraryTargetName(cfb32)
-#else
-            CFB = cfb/ModuleLibraryTargetName(cfb) \
-		  cfb16/ModuleLibraryTargetName(cfb16) \
-		  cfb32/ModuleLibraryTargetName(cfb32)
-#endif
-           CFB8 = cfb/ModuleLibraryTargetName(cfb)
-           CFB4 = cfb/ModuleLibraryTargetName(cfb) \
-		  cfb4/ModuleLibraryTargetName(cfb4)
-          CFB16 = cfb/ModuleLibraryTargetName(cfb) \
-		  cfb16/ModuleLibraryTargetName(cfb16)
-          CFB24 = cfb/ModuleLibraryTargetName(cfb) \
-		  cfb24/ModuleLibraryTargetName(cfb24)
-          CFB32 = cfb/ModuleLibraryTargetName(cfb) \
-		  cfb32/ModuleLibraryTargetName(cfb32)
 #if (!(defined(NXAgentServer) && NXAgentServer))
          DAMAGE = miext/damage/ModuleLibraryTargetName(damage)
 #endif
          SHADOW = miext/shadow/ModuleLibraryTargetName(shadow)
           LAYER = miext/layer/ModuleLibraryTargetName(layer) 
 #else 
-            MFB = mfb/LibraryTargetName(mfb)
              FB = fb/LibraryTargetName(fb)
-#if XF8_32Wid
-            CFB = cfb16/LibraryTargetName(cfb16) \
-		  cfb24/LibraryTargetName(cfb24) \
-		  cfb32/LibraryTargetName(cfb32) \
-		  cfb/LibraryTargetName(cfb)
-#else
-            CFB = cfb16/LibraryTargetName(cfb16) \
-		  cfb32/LibraryTargetName(cfb32) \
-		  cfb/LibraryTargetName(cfb)
-#endif
-           CFB8 = cfb/LibraryTargetName(cfb)
-           CFB4 = cfb4/LibraryTargetName(cfb4) \
-		  cfb/LibraryTargetName(cfb)
-          CFB16 = cfb16/LibraryTargetName(cfb16) \
-		  cfb/LibraryTargetName(cfb)
-          CFB24 = cfb24/LibraryTargetName(cfb24) \
-		  cfb/LibraryTargetName(cfb)
-          CFB32 = cfb32/LibraryTargetName(cfb32) \
-		  cfb/LibraryTargetName(cfb)
 #if (!(defined(NXAgentServer) && NXAgentServer))
          DAMAGE = miext/damage/LibraryTargetName(damage)
 #endif
@@ -259,13 +204,6 @@ INSTPGMFLAGS =
 #endif
         STDDIRS = include dix os mi $(XPDDXDIR) $(EXTDIRS)
           FBDIR = fb
-         MFBDIR = mfb
-        CFB4DIR = cfb4
-        CFB8DIR = cfb
-       CFB16DIR = cfb16
-       CFB24DIR = cfb24
-       CFB32DIR = cfb32
-         AFBDIR = afb
 
 XCOMM
 XCOMM This turns off the default rule for compiling .c files because
@@ -276,25 +214,6 @@ XCOMM
 
 .s.o:
 
-/*  		  Build rule blocks, add one for each server
- *  
- *  If a server needs mfb, its build block should have a line like:
- *  MFBSUBDIR = mfb
- *  Similarly, its build block should have:
- *  CFB4SUBDIR  = cfb4  (if the server needs 4 bit cfb)
- *  CFB8SUBDIR  = cfb   (8 bit cfb)
- *  CFB16SUBDIR = cfb16 (16 bit cfb)
- *  CFB24SUBDIR = cfb24 (24 bit cfb)
- *  CFB32SUBDIR = cfb32 (32 bit cfb)
- *  
- *  If a server does not need all of the above components, simply
- *  omit the relevant lines from the build block.
- *  
- *  If these guidelines are followed, a make at the top of the server
- *  tree should result in each subdirectory being built only once,
- *  even if multiple servers that share subdirectories are being built.
- */
-
 #if HasParallelMake
 XCOMM
 XCOMM force non-parallel build of XF86 servers to prevent MUTEX overrides
@@ -309,7 +228,7 @@ NXWIN = NXWin
     (!MakeDllModules && defined(NXWinServer) && NXWinServer) 
 MakeMutex($(NXAGENT) $(NXWIN))
 #endif
-MakeMutex($(STDDIRS) mfb fb cfb cfb16 cfb24 cfb32)
+MakeMutex($(STDDIRS) fb)
 #endif
 
 
@@ -326,7 +245,7 @@ NXAGENTDDXDIR = hw/nxagent
 NXAGENTDDXDIR = hw
 #endif
 
-NXAGENTDIRS = $(STDDIRS) $(MFBDIR) $(FBDIR) $(MIDAMAGEDIR) $(NXAGENTDDXDIR) $(DEPDIRS)
+NXAGENTDIRS = $(STDDIRS) $(FBDIR) $(MIDAMAGEDIR) $(NXAGENTDDXDIR) $(DEPDIRS)
 
 NX_XCOMP_HEADERS = \
               ../../../nxcomp/NXalert.h         \
@@ -626,14 +545,13 @@ ServerTarget(NXWin,$(NXWINDIRS),$(NXWINOBJS), \
 #endif /* NXWinServer */
 #endif
 
-CFBSUBDIRS = $(CFB8SUBDIR) $(CFB16SUBDIR) $(CFB24SUBDIR) $(CFB32SUBDIR)
 MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR)
 IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
 DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) $(LYNXDDXDIR) \
 	  $(HPDDXDIR) $(XFREE86DDXDIR) \
 	  $(NXAGENTDDXDIR) $(NXWINDDXDIR)
-SUBDIRS = $(STDDIRS) $(MFBSUBDIR) $(CFBSUBDIRS) \
-	  $(IPLANDIRS) $(ILBMDIR) $(AFBSUBDIR) \
+SUBDIRS = $(STDDIRS) \
+	  $(IPLANDIRS) $(ILBMDIR) \
           $(DDXDIRS) $(FBSUBDIR) $(KDRIVEDIRS) $(MIEXTDIRS)
 
 #if  defined(ServerToInstall) && !defined(OS2Architecture)

nx-X11/programs/Xserver/fb/fb.h

@@ -66,9 +66,6 @@
 #if GLYPHPADBYTES != 4
 #error "GLYPHPADBYTES must be 4"
 #endif
-#if GETLEFTBITS_ALIGNMENT != 1
-#error "GETLEFTBITS_ALIGNMENT must be 1"
-#endif
 /* whether to bother to include 24bpp support */
 #ifndef FBNO24BIT
 #define FB_24BIT

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) ^