From c1fc4ba7890728cd3afb0e9b6ae1c6c41e0d5376 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 11 Mar 2017 00:48:03 +0100 Subject: dix: Remove insane BC hacks commit 6b5206e7cb8e5279816b48f014d47d3f03f16972 Author: Daniel Stone Date: Fri Jul 18 15:38:10 2008 +0300 dix: Remove insane BC hacks If your DDX needs a 1bpp mode and doesn't set it up, your DDX is incompetent. Backported-to-NX-by: Mike Gabriel --- nx-X11/programs/Xserver/dix/main.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/nx-X11/programs/Xserver/dix/main.c b/nx-X11/programs/Xserver/dix/main.c index 4e1051efd..68b1c17f6 100644 --- a/nx-X11/programs/Xserver/dix/main.c +++ b/nx-X11/programs/Xserver/dix/main.c @@ -161,7 +161,7 @@ ReplyNotSwappd( int main(int argc, char *argv[], char *envp[]) { - int i, j, k, error; + int i, error; char *xauthfile; HWEventQueueType alwaysCheckForInput[2]; @@ -250,17 +250,6 @@ main(int argc, char *argv[], char *envp[]) screenInfo.numScreens = 0; screenInfo.numVideoScreens = -1; - /* - * Just in case the ddx doesnt supply a format for depth 1 (like qvss). - */ - j = indexForBitsPerPixel[ 1 ]; - k = indexForScanlinePad[ BITMAP_SCANLINE_PAD ]; - PixmapWidthPaddingInfo[1].padRoundUp = BITMAP_SCANLINE_PAD-1; - PixmapWidthPaddingInfo[1].padPixelsLog2 = answer[j][k]; - j = indexForBitsPerPixel[8]; /* bits per byte */ - PixmapWidthPaddingInfo[1].padBytesLog2 = answer[j][k]; - PixmapWidthPaddingInfo[1].bitsPerPixel = 1; - InitAtoms(); InitEvents(); InitGlyphCaching(); -- cgit v1.2.3