Merging XORG-CURRENT into trunk

1 files changed, 25 insertions, 63 deletions

diff --git a/man/XReadBitmapFile.man b/man/XReadBitmapFile.man
index 4c384e0..1880f37 100644
--- a/man/XReadBitmapFile.man
+++ b/man/XReadBitmapFile.man
@@ -40,6 +40,8 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
+.\" $XFree86: xc/doc/man/X11/XReadBF.man,v 1.3 2001/02/07 22:35:20 tsi Exp $
+.\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
 .ds xL Xlib \- C Language X Interface
@@ -138,71 +140,31 @@
 .el .sp 10p
 ..
 .ny0
-.TH XReadBitmapFile 3X11 "Release 6.6" "X Version 11" "XLIB FUNCTIONS"
+.TH XReadBitmapFile 3X11 __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
 XReadBitmapFile, XReadBitmapFileData, XWriteBitmapFile, XCreatePixmapFromBitmapData, XCreateBitmapFromData \- manipulate bitmaps
 .SH SYNTAX
-int XReadBitmapFile(\^\fIdisplay\fP, \fId\fP, \fIfilename\fP, \fIwidth_return\fP, \fIheight_return\fP, \fIbitmap_return\fP, \fIx_hot_return\fP, 
-.br
-                       \fIy_hot_return\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      char *\fIfilename\fP\^;
-.br
-      unsigned int *\fIwidth_return\fP, *\fIheight_return\fP\^;
-.br
-      Pixmap *\fIbitmap_return\fP\^;
-.br
-      int *\fIx_hot_return\fP, *\fIy_hot_return\fP\^;	
-.LP
-int XReadBitmapFileData(\^\fIfilename\fP, \fIwidth_return\fP, \fIheight_return\fP, \fIdata_return\fP, \fIx_hot_return\fP, \fIy_hot_return\fP\^)
-.br
-      char *\fIfilename\fP\^;
-.br
-      unsigned int *\fIwidth_return\fP, *\fIheight_return\fP\^;
-.br
-      unsigned char *\fIdata_return\fP\^;
-.br
-      int *\fIx_hot_return\fP, *\fIy_hot_return\fP\^;	
-.LP
-int XWriteBitmapFile(\^\fIdisplay\fP, \fIfilename\fP, \fIbitmap\fP, \fIwidth\fP, \fIheight\fP, \fIx_hot\fP, \fIy_hot\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char *\fIfilename\fP\^;
-.br
-      Pixmap \fIbitmap\fP\^;
-.br
-      unsigned int \fIwidth\fP, \fIheight\fP\^;
-.br
-      int \fIx_hot\fP, \fIy_hot\fP\^;
-.LP
-Pixmap XCreatePixmapFromBitmapData\^(\^\fIdisplay\fP, \fId\fP, \fIdata\fP, \fIwidth\fP, \fIheight\fP, \fIfg\fP, \fIbg\fP, \fIdepth\fP\^)
-.br
-     Display *\fIdisplay\fP\^;
-.br
-     Drawable \fId\fP\^;
-.br
-     char *\fIdata\fP\^;
-.br
-     unsigned int \fIwidth\fP, \fIheight\fP\^;
-.br
-     unsigned long \fIfg\fP, \fIbg\fP\^;
-.br
-     unsigned int \fIdepth\fP\^;
-.LP
-Pixmap XCreateBitmapFromData(\^\fIdisplay\fP, \fId\fP, \fIdata\fP, \fIwidth\fP, \fIheight\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Drawable \fId\fP\^;
-.br
-      char *\fIdata\fP\^;
-.br
-      unsigned int \fIwidth\fP, \fIheight\fP\^;
+.HP
+int XReadBitmapFile(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, char
+*\fIfilename\fP\^, unsigned int *\fIwidth_return\fP, unsigned int
+*\fIheight_return\fP\^, Pixmap *\fIbitmap_return\fP\^, int
+*\fIx_hot_return\fP, int *\fIy_hot_return\fP\^); 
+.HP
+int XReadBitmapFileData(\^char *\fIfilename\fP\^, unsigned int
+*\fIwidth_return\fP, unsigned int *\fIheight_return\fP\^, unsigned char
+*\fIdata_return\fP\^, int *\fIx_hot_return\fP, int *\fIy_hot_return\fP\^); 
+.HP
+int XWriteBitmapFile(\^Display *\fIdisplay\fP\^, char *\fIfilename\fP\^,
+Pixmap \fIbitmap\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^,
+int \fIx_hot\fP, int \fIy_hot\fP\^); 
+.HP
+Pixmap XCreatePixmapFromBitmapData\^(\^Display *\fIdisplay\fP\^, Drawable
+\fId\fP\^, char *\fIdata\fP\^, unsigned int \fIwidth\fP, unsigned int
+\fIheight\fP\^, unsigned long \fIfg\fP, unsigned int \fIbg\fP\^, unsigned int
+\fIdepth\fP\^); 
+.HP
+Pixmap XCreateBitmapFromData(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+char *\fIdata\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^); 
 .SH ARGUMENTS
 .IP \fIbitmap\fP 1i
 Specifies the bitmap.
@@ -357,7 +319,7 @@ a bitmap file that was written out by
 The following example creates a gray bitmap:
 .LP
 .Ds 0
-#include "gray.bitmap"
+\&#include "gray.bitmap"
 .sp 6p
 Pixmap bitmap;
 bitmap = XCreateBitmapFromData(display, window, gray_bits, gray_width, gray_height);