Moved X11 DIB stuff to x11drv.

graphics/x11drv/Makefile.in

@@ -10,12 +10,13 @@ C_SRCS = \
 	bitmap.c \
 	brush.c \
 	clipping.c \
-	xfont.c \
+	dib.c \
 	graphics.c \
 	init.c \
 	objects.c \
 	pen.c \
-	text.c
+	text.c \
+	xfont.c
 
 all: $(MODULE).o
 

graphics/x11drv/init.c

@@ -66,7 +66,7 @@ static const DC_FUNCTIONS X11DRV_Funcs =
     X11DRV_SetBkColor,               /* pSetBkColor */
     NULL,                            /* pSetBkMode */
     X11DRV_SetDeviceClipping,        /* pSetDeviceClipping */
-    NULL,                            /* pSetDIBitsToDevice */
+    X11DRV_SetDIBitsToDevice,        /* pSetDIBitsToDevice */
     NULL,                            /* pSetMapMode (optional) */
     NULL,                            /* pSetMapperFlags */
     X11DRV_SetPixel,                 /* pSetPixel */
@@ -115,6 +115,8 @@ BOOL32 X11DRV_Init(void)
 {
     /* FIXME: colormap management should be merged with the X11DRV */
 
+    if( !X11DRV_DIB_Init() ) return FALSE;
+
     if( !COLOR_Init() ) return FALSE;
 
     /* Finish up device caps */

include/x11drv.h

@@ -141,6 +141,7 @@ extern INT32 X11DRV_DeviceBitmapBits( struct tagDC *dc, HBITMAP32 hbitmap,
 
 extern BOOL32 X11DRV_BITMAP_Init(void);
 extern BOOL32 X11DRV_BRUSH_Init(void);
+extern BOOL32 X11DRV_DIB_Init(void);
 extern BOOL32 X11DRV_FONT_Init( struct tagDeviceCaps* );
 
 struct tagBITMAPOBJ;
@@ -163,5 +164,38 @@ extern void _XInitImageFuncPtrs(XImage *);
                            (width), (height), 32, width_bytes ); \
 }
 
+
+/* exported dib functions for now */
+
+/* This structure holds the arguments for DIB_SetImageBits() */
+typedef struct
+{
+    struct tagDC     *dc;
+    LPCVOID           bits;
+    XImage           *image;
+    int               lines;
+    DWORD             infoWidth;
+    WORD              depth;
+    WORD              infoBpp;
+    WORD              compression;
+    int              *colorMap;
+    int               nColorMap;
+    Drawable          drawable;
+    GC                gc;
+    int               xSrc;
+    int               ySrc;
+    int               xDest;
+    int               yDest;
+    int               width;
+    int               height;
+} DIB_SETIMAGEBITS_DESCR;
+
+extern int X11DRV_DIB_GetImageBits( const DIB_SETIMAGEBITS_DESCR *descr );
+extern int X11DRV_DIB_SetImageBits( const DIB_SETIMAGEBITS_DESCR *descr );
+extern int *X11DRV_DIB_BuildColorMap( struct tagDC *dc, WORD coloruse,
+				      WORD depth, const BITMAPINFO *info,
+				      int *nColors );
+
+
 #endif  /* __WINE_X11DRV_H */
 

objects/gdiobj.c

@@ -244,8 +244,6 @@ BOOL32 GDI_Init(void)
 
     /* Initialize drivers */
 
-    DIB_Init();	/* always before X11DRV_Init() */
-
     if( ! X11DRV_Init() )
         return FALSE;