Commit 0642e99a authored by Kaleb Keithley Keithley's avatar Kaleb Keithley Keithley

merge latest (4.3.99.16) from XFree86 (vendor) branch

parent 400780e6
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
/* $XFree86: xc/lib/X11/Xlocale.h,v 1.4 2001/12/14 19:54:09 dawes Exp $ */
/* $XFree86: xc/lib/X11/Xlocale.h,v 1.5 2003/11/17 22:20:11 dawes Exp $ */
#ifndef _XLOCALE_H_
#define _XLOCALE_H_
......@@ -47,10 +47,8 @@ from The Open Group.
_XFUNCPROTOBEGIN
extern char *_Xsetlocale(
#if NeedFunctionPrototypes
int /* category */,
_Xconst char* /* name */
#endif
);
_XFUNCPROTOEND
......
......@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/lib/X11/Xresource.h,v 3.8 2001/12/14 19:54:10 dawes Exp $ */
/* $XFree86: xc/lib/X11/Xresource.h,v 3.9 2003/11/17 22:20:11 dawes Exp $ */
#ifndef _XRESOURCE_H_
#define _XRESOURCE_H_
......@@ -74,9 +74,7 @@ _XFUNCPROTOBEGIN
****************************************************************/
extern char *Xpermalloc(
#if NeedFunctionPrototypes
unsigned int /* size */
#endif
);
/****************************************************************
......@@ -93,28 +91,20 @@ typedef char *XrmString;
/* find quark for string, create new quark if none already exists */
extern XrmQuark XrmStringToQuark(
#if NeedFunctionPrototypes
_Xconst char* /* string */
#endif
);
extern XrmQuark XrmPermStringToQuark(
#if NeedFunctionPrototypes
_Xconst char* /* string */
#endif
);
/* find string for quark */
extern XrmString XrmQuarkToString(
#if NeedFunctionPrototypes
XrmQuark /* quark */
#endif
);
extern XrmQuark XrmUniqueQuark(
#if NeedFunctionPrototypes
void
#endif
);
#define XrmStringsEqual(a1, a2) (strcmp(a1, a2) == 0)
......@@ -129,18 +119,14 @@ extern XrmQuark XrmUniqueQuark(
typedef enum {XrmBindTightly, XrmBindLoosely} XrmBinding, *XrmBindingList;
extern void XrmStringToQuarkList(
#if NeedFunctionPrototypes
_Xconst char* /* string */,
XrmQuarkList /* quarks_return */
#endif
);
extern void XrmStringToBindingQuarkList(
#if NeedFunctionPrototypes
_Xconst char* /* string */,
XrmBindingList /* bindings_return */,
XrmQuarkList /* quarks_return */
#endif
);
/****************************************************************
......@@ -192,92 +178,72 @@ typedef struct _XrmHashBucketRec *XrmDatabase;
extern void XrmDestroyDatabase(
#if NeedFunctionPrototypes
XrmDatabase /* database */
#endif
);
extern void XrmQPutResource(
#if NeedFunctionPrototypes
XrmDatabase* /* database */,
XrmBindingList /* bindings */,
XrmQuarkList /* quarks */,
XrmRepresentation /* type */,
XrmValue* /* value */
#endif
);
extern void XrmPutResource(
#if NeedFunctionPrototypes
XrmDatabase* /* database */,
_Xconst char* /* specifier */,
_Xconst char* /* type */,
XrmValue* /* value */
#endif
);
extern void XrmQPutStringResource(
#if NeedFunctionPrototypes
XrmDatabase* /* database */,
XrmBindingList /* bindings */,
XrmQuarkList /* quarks */,
_Xconst char* /* value */
#endif
);
extern void XrmPutStringResource(
#if NeedFunctionPrototypes
XrmDatabase* /* database */,
_Xconst char* /* specifier */,
_Xconst char* /* value */
#endif
);
extern void XrmPutLineResource(
#if NeedFunctionPrototypes
XrmDatabase* /* database */,
_Xconst char* /* line */
#endif
);
extern Bool XrmQGetResource(
#if NeedFunctionPrototypes
XrmDatabase /* database */,
XrmNameList /* quark_name */,
XrmClassList /* quark_class */,
XrmRepresentation* /* quark_type_return */,
XrmValue* /* value_return */
#endif
);
extern Bool XrmGetResource(
#if NeedFunctionPrototypes
XrmDatabase /* database */,
_Xconst char* /* str_name */,
_Xconst char* /* str_class */,
char** /* str_type_return */,
XrmValue* /* value_return */
#endif
);
extern Bool XrmQGetSearchList(
#if NeedFunctionPrototypes
XrmDatabase /* database */,
XrmNameList /* names */,
XrmClassList /* classes */,
XrmSearchList /* list_return */,
int /* list_length */
#endif
);
extern Bool XrmQGetSearchResource(
#if NeedFunctionPrototypes
XrmSearchList /* list */,
XrmName /* name */,
XrmClass /* class */,
XrmRepresentation* /* type_return */,
XrmValue* /* value_return */
#endif
);
/****************************************************************
......@@ -289,89 +255,67 @@ extern Bool XrmQGetSearchResource(
#ifndef _XP_PRINT_SERVER_
extern void XrmSetDatabase(
#if NeedFunctionPrototypes
Display* /* display */,
XrmDatabase /* database */
#endif
);
extern XrmDatabase XrmGetDatabase(
#if NeedFunctionPrototypes
Display* /* display */
#endif
);
#endif /* !_XP_PRINT_SERVER_ */
extern XrmDatabase XrmGetFileDatabase(
#if NeedFunctionPrototypes
_Xconst char* /* filename */
#endif
);
extern Status XrmCombineFileDatabase(
#if NeedFunctionPrototypes
_Xconst char* /* filename */,
XrmDatabase* /* target */,
Bool /* override */
#endif
);
extern XrmDatabase XrmGetStringDatabase(
#if NeedFunctionPrototypes
_Xconst char* /* data */ /* null terminated string */
#endif
);
extern void XrmPutFileDatabase(
#if NeedFunctionPrototypes
XrmDatabase /* database */,
_Xconst char* /* filename */
#endif
);
extern void XrmMergeDatabases(
#if NeedFunctionPrototypes
XrmDatabase /* source_db */,
XrmDatabase* /* target_db */
#endif
);
extern void XrmCombineDatabase(
#if NeedFunctionPrototypes
XrmDatabase /* source_db */,
XrmDatabase* /* target_db */,
Bool /* override */
#endif
);
#define XrmEnumAllLevels 0
#define XrmEnumOneLevel 1
extern Bool XrmEnumerateDatabase(
#if NeedFunctionPrototypes
XrmDatabase /* db */,
XrmNameList /* name_prefix */,
XrmClassList /* class_prefix */,
int /* mode */,
Bool (*)(
#if NeedNestedPrototypes
XrmDatabase* /* db */,
XrmBindingList /* bindings */,
XrmQuarkList /* quarks */,
XrmRepresentation* /* type */,
XrmValue* /* value */,
XPointer /* closure */
#endif
) /* proc */,
XPointer /* closure */
#endif
);
extern const char *XrmLocaleOfDatabase(
#if NeedFunctionPrototypes
XrmDatabase /* database */
#endif
);
......@@ -402,14 +346,12 @@ typedef struct {
extern void XrmParseCommand(
#if NeedFunctionPrototypes
XrmDatabase* /* database */,
XrmOptionDescList /* table */,
int /* table_count */,
_Xconst char* /* name */,
int* /* argc_in_out */,
char** /* argv_in_out */
#endif
);
_XFUNCPROTOEND
......
This diff is collapsed.
......@@ -40,7 +40,7 @@
.\" of this documentation for any purpose.
.\" It is provided ``as is'' without express or implied warranty.
.\"
.\" $XFree86: xc/doc/man/X11/AllPlanes.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
.\" $XFree86: xc/doc/man/X11/AllPlanes.man,v 1.3 2003/04/28 22:17:53 herrb Exp $
.\"
.ds xT X Toolkit Intrinsics \- C Language Interface
.ds xW Athena X Widgets \- C Language X Toolkit Interface
......@@ -144,67 +144,63 @@
.SH NAME
AllPlanes, BlackPixel, WhitePixel, ConnectionNumber, DefaultColormap, DefaultDepth, XListDepths, DefaultGC, DefaultRootWindow, DefaultScreenOfDisplay, DefaultScreen, DefaultVisual, DisplayCells, DisplayPlanes, DisplayString, XMaxRequestSize, XExtendedMaxRequestSize, LastKnownRequestProcessed, NextRequest, ProtocolVersion, ProtocolRevision, QLength, RootWindow, ScreenCount, ScreenOfDisplay, ServerVendor, VendorRelease \- Display macros and functions
.SH SYNTAX
AllPlanes
.LP
BlackPixel\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
.LP
WhitePixel\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
.LP
ConnectionNumber\^(\^\fIdisplay\fP\^)
.LP
DefaultColormap\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
.LP
DefaultDepth\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
.LP
int *XListDepths\^(\^\fIdisplay\fP, \fIscreen_number\fP, \fIcount_return\fP\^)
.br
Display *\fIdisplay\fP;
.br
int \fIscreen_number\fP;
.br
int *\fIcount_return\fP;
.LP
DefaultGC\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
.LP
DefaultRootWindow\^(\^\fIdisplay\fP\^)
.LP
DefaultScreenOfDisplay\^(\^\fIdisplay\fP\^)
.LP
DefaultScreen\^(\^\fIdisplay\fP\^)
.LP
DefaultVisual\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
.LP
DisplayCells\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
.LP
DisplayPlanes\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
.LP
DisplayString\^(\^\fIdisplay\fP\^)
.LP
long XMaxRequestSize(\^\fIdisplay\fP\^)
Display *\fIdisplay\fP\^;
.LP
long XExtendedMaxRequestSize(\^\fIdisplay\fP\^)
Display *\fIdisplay\fP\^;
.LP
LastKnownRequestProcessed\^(\^\fIdisplay\fP\^)
.LP
NextRequest\^(\^\fIdisplay\fP\^)
.LP
ProtocolVersion\^(\^\fIdisplay\fP\^)
.LP
ProtocolRevision\^(\^\fIdisplay\fP\^)
.LP
QLength\^(\^\fIdisplay\fP\^)
.LP
RootWindow\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
.LP
ScreenCount\^(\^\fIdisplay\fP\^)
.LP
ScreenOfDisplay\^(\^\fIdisplay\fP, \fIscreen_number\fP\^)
.LP
ServerVendor\^(\^\fIdisplay\fP\^)
.LP
VendorRelease\^(\^\fIdisplay\fP\^)
unsigned long AllPlanes;
.HP
unsigned long BlackPixel\^(\^Display *\fIdisplay\fP\^, int \^\fIscreen_number\fP\^);
.HP
unsigned long WhitePixel\^(\^Display *\fIdisplay\fP\^, int \^\fIscreen_number\fP\^);
.HP
int ConnectionNumber\^(\^Display *\fIdisplay\fP\^);
.HP
Colormap DefaultColormap\^(\^Display *\fIdisplay\fP\^,
\^int \fIscreen_number\fP\^);
.HP
int DefaultDepth\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
.HP
int *XListDepths\^(\^Display *\fIdisplay\fP, int \fIscreen_number\fP, int
\fIcount_return\fP\^);
.HP
GC DefaultGC\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
.HP
Window DefaultRootWindow\^(\^Display *\fIdisplay\fP\^);
.HP
Screen *DefaultScreenOfDisplay\^(\^Display *\fIdisplay\fP\^);
.HP
int DefaultScreen\^(\^Display *\fIdisplay\fP\^);
.HP
Visual *DefaultVisual\^(\^Display *\fIdisplay\fP\^, \^int
\fIscreen_number\fP\^);
.HP
int DisplayCells\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
.HP
int DisplayPlanes\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
.HP
char *DisplayString\^(\^Display *\fIdisplay\fP\^);
.HP
long XMaxRequestSize(\^Display *\fIdisplay\fP\^)
.HP
long XExtendedMaxRequestSize(\^Display *\fIdisplay\fP\^)
.HP
unsigned long LastKnownRequestProcessed\^(\^Display *\fIdisplay\fP\^);
.HP
unsigned long NextRequest\^(\^Display *\fIdisplay\fP\^);
.HP
int ProtocolVersion\^(\^Display *\fIdisplay\fP\^);
.HP
int ProtocolRevision\^(\^Display *\fIdisplay\fP\^);
.HP
int QLength\^(\^Display *\fIdisplay\fP\^);
.HP
Window RootWindow\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
.HP
int ScreenCount\^(\^Display *\fIdisplay\fP\^);
.HP
Screen *ScreenOfDisplay\^(\^Display *\fIdisplay\fP, int
\fIscreen_number\fP\^);
.HP
char *ServerVendor\^(\^Display *\fIdisplay\fP\^)
.HP
int VendorRelease\^(\^Display *\fIdisplay\fP\^)
.SH ARGUMENTS
.IP \fIdisplay\fP 1i
Specifies the connection to the X server.
......
......@@ -40,7 +40,7 @@
.\" of this documentation for any purpose.
.\" It is provided ``as is'' without express or implied warranty.
.\"
.\" $XFree86: xc/doc/man/X11/BlkPScrn.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
.\" $XFree86: xc/doc/man/X11/BlkPScrn.man,v 1.3 2003/04/28 22:17:53 herrb Exp $
.\"
.ds xT X Toolkit Intrinsics \- C Language Interface
.ds xW Athena X Widgets \- C Language X Toolkit Interface
......@@ -144,47 +144,46 @@
.SH NAME
BlackPixelOfScreen, WhitePixelOfScreen, CellsOfScreen, DefaultColormapOfScreen, DefaultDepthOfScreen, DefaultGCOfScreen, DefaultVisualOfScreen, DoesBackingStore, DoesSaveUnders, DisplayOfScreen, XScreenNumberOfScreen, EventMaskOfScreen, HeightOfScreen, HeightMMOfScreen, MaxCmapsOfScreen, MinCmapsOfScreen, PlanesOfScreen, RootWindowOfScreen, WidthOfScreen, WidthMMOfScreen \- screen information functions and macros
.SH SYNTAX
BlackPixelOfScreen\^(\^\fIscreen\fP\^)
.LP
WhitePixelOfScreen\^(\^\fIscreen\fP\^)
.LP
CellsOfScreen\^(\^\fIscreen\fP\^)
.LP
DefaultColormapOfScreen\^(\^\fIscreen\fP\^)
.LP
DefaultDepthOfScreen\^(\^\fIscreen\fP\^)
.LP
DefaultGCOfScreen\^(\^\fIscreen\fP\^)
.LP
DefaultVisualOfScreen\^(\^\fIscreen\fP\^)
.LP
DoesBackingStore\^(\^\fIscreen\fP\^)
.LP
DoesSaveUnders\^(\^\fIscreen\fP\^)
.LP
DisplayOfScreen\^(\^\fIscreen\fP\^)
.LP
int XScreenNumberOfScreen\^(\^\fIscreen\fP\^)
.br
Screen *\fIscreen\fP\^;
.LP
EventMaskOfScreen\^(\^\fIscreen\fP\^)
.LP
HeightOfScreen\^(\^\fIscreen\fP\^)
.LP
HeightMMOfScreen\^(\^\fIscreen\fP\^)
.LP
MaxCmapsOfScreen\^(\^\fIscreen\fP\^)
.LP
MinCmapsOfScreen\^(\^\fIscreen\fP\^)
.LP
PlanesOfScreen\^(\^\fIscreen\fP\^)
.LP
RootWindowOfScreen\^(\^\fIscreen\fP\^)
.LP
WidthOfScreen\^(\^\fIscreen\fP\^)
.LP
WidthMMOfScreen\^(\^\fIscreen\fP\^)
.HP
unsigned long BlackPixelOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
unsigned long WhitePixelOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
int CellsOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
Colormap DefaultColormapOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
int DefaultDepthOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
GC DefaultGCOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
Visual *DefaultVisualOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
int DoesBackingStore\^(\^Screen *\fIscreen\fP\^);
.HP
Bool DoesSaveUnders\^(\^Screen *\fIscreen\fP\^);
.HP
Display *DisplayOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
int XScreenNumberOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
long EventMaskOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
int HeightOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
int HeightMMOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
int MaxCmapsOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
int MinCmapsOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
int PlanesOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
Window RootWindowOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
int WidthOfScreen\^(\^Screen *\fIscreen\fP\^);
.HP
int WidthMMOfScreen\^(\^Screen *\fIscreen\fP\^);
.SH ARGUMENTS
.IP \fIscreen\fP 1i
Specifies the appropriate
......
......@@ -40,7 +40,7 @@
.\" of this documentation for any purpose.
.\" It is provided ``as is'' without express or implied warranty.
.\"
.\" $XFree86: xc/doc/man/X11/Dis3C.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
.\" $XFree86: xc/doc/man/X11/Dis3C.man,v 1.3 2003/04/28 22:17:53 herrb Exp $
.\"
.ds xT X Toolkit Intrinsics \- C Language Interface
.ds xW Athena X Widgets \- C Language X Toolkit Interface
......@@ -144,25 +144,16 @@
.SH NAME
DisplayOfCCC, VisualOfCCC, ScreenNumberOfCCC, ScreenWhitePointOfCCC, ClientWhitePointOfCCC \- Color Conversion Context macros
.SH SYNTAX
DisplayOfCCC\^(\^\fIccc\fP\^)
.br
XcmsCCC \fIccc\fP\^;
.LP
VisualOfCCC\^(\^\fIccc\fP\^)
.br
XcmsCCC \fIccc\fP\^;
.LP
ScreenNumberOfCCC\^(\^\fIccc\fP\^)
.br
XcmsCCC \fIccc\fP\^;
.LP
ScreenWhitePointOfCCC\^(\^\fIccc\fP\^)
.br
XcmsCCC \fIccc\fP\^;
.LP
ClientWhitePointOfCCC\^(\^\fIccc\fP\^)
.br
XcmsCCC \fIccc\fP\^;
.HP
Display *DisplayOfCCC\^(\^XcmsCCC \fIccc\fP\^);
.HP
Visual *VisualOfCCC\^(\^XcmsCCC \fIccc\fP\^);
.HP
int ScreenNumberOfCCC\^(\^XcmsCCC \fIccc\fP\^);
.HP
XcmsColor *ScreenWhitePointOfCCC\^(\^XcmsCCC \fIccc\fP\^);
.HP
XcmsColor *ClientWhitePointOfCCC\^(\^XcmsCCC \fIccc\fP\^);
.SH ARGUMENTS
.IP \fIccc\fP 1i
Specifies the CCC.
......
......@@ -40,7 +40,7 @@
.\" of this documentation for any purpose.
.\" It is provided ``as is'' without express or implied warranty.
.\"
.\" $XFree86: xc/doc/man/X11/ImageOrd.man,v 1.2 2001/01/27 18:19:56 dawes Exp $
.\" $XFree86: xc/doc/man/X11/ImageOrd.man,v 1.3 2003/04/28 22:17:53 herrb Exp $
.\"
.ds xT X Toolkit Intrinsics \- C Language Interface
.ds xW Athena X Widgets \- C Language X Toolkit Interface
......@@ -144,27 +144,24 @@
.SH NAME
ImageByteOrder, BitmapBitOrder, BitmapPad, BitmapUnit, DisplayHeight, DisplayHeightMM, DisplayWidth, DisplayWidthMM, XListPixmapFormats, XPixmapFormatValues \- image format functions and macros
.SH SYNTAX
XPixmapFormatValues *XListPixmapFormats\^(\^\fIdisplay\fP, \fIcount_return\fP\^)
.br
Display *\fIdisplay\fP\^;
.br
int *\fIcount_return\fP\^;
.LP
ImageByteOrder\^(\^\fIdisplay\fP\^)
.LP
BitmapBitOrder\^(\^\fIdisplay\fP\^)
.LP
BitmapPad\^(\^\fIdisplay\fP\^)
.LP
BitmapUnit\^(\^\fIdisplay\fP\^)
.LP
DisplayHeight\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
.LP
DisplayHeightMM\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
.LP
DisplayWidth\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
.LP
DisplayWidthMM\^(\^\fIdisplay\fP\^, \^\fIscreen_number\fP\^)
.HP