Commit c6349f43 authored by Egbert Eich's avatar Egbert Eich

Merging XORG-CURRENT into trunk

parent c3c4ddc6
/* $XFree86: xc/lib/X11/ImUtil.h,v 1.3 2003/04/23 22:04:58 torrey Exp $ */
/* $XFree86: xc/lib/X11/ImUtil.h,v 1.2 2003/04/15 22:10:07 herrb Exp $ */
#ifndef _IMUTIL_H_
#define _IMUTIL_H_
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -26,6 +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 $ */
#ifndef _XLOCALE_H_
#define _XLOCALE_H_
......@@ -33,12 +34,6 @@ from The Open Group.
#include <X11/Xfuncproto.h>
#include <X11/Xosdefs.h>
#ifndef X_LOCALE
#ifdef X_NOT_STDC_ENV
#define X_LOCALE
#endif
#endif
#ifndef X_LOCALE
#include <locale.h>
#else
......@@ -52,18 +47,14 @@ from The Open Group.
_XFUNCPROTOBEGIN
extern char *_Xsetlocale(
#if NeedFunctionPrototypes
int /* category */,
_Xconst char* /* name */
#endif
);
_XFUNCPROTOEND
#define setlocale _Xsetlocale
#ifndef NULL
#define NULL 0
#endif
#include <stddef.h>
#endif /* X_LOCALE */
......
......@@ -46,13 +46,14 @@ 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 $ */
#ifndef _XRESOURCE_H_
#define _XRESOURCE_H_
/* You must include <X11/Xlib.h> before including this file */
#ifndef _XP_PRINT_SERVER_
#include <X11/Xlib.h>
#endif
/****************************************************************
****************************************************************
......@@ -73,9 +74,7 @@ _XFUNCPROTOBEGIN
****************************************************************/
extern char *Xpermalloc(
#if NeedFunctionPrototypes
unsigned int /* size */
#endif
);
/****************************************************************
......@@ -84,7 +83,7 @@ extern char *Xpermalloc(
*
****************************************************************/
typedef int XrmQuark, *XrmQuarkList;
typedef int XrmQuark, *XrmQuarkList;
#define NULLQUARK ((XrmQuark) 0)
typedef char *XrmString;
......@@ -92,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)
......@@ -128,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
);
/****************************************************************
......@@ -191,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
);
/****************************************************************
......@@ -285,88 +252,70 @@ 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 char *XrmLocaleOfDatabase(
#if NeedFunctionPrototypes
extern const char *XrmLocaleOfDatabase(
XrmDatabase /* database */
#endif
);
......@@ -397,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,6 +40,8 @@
.\" 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 $
.\"
.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,67 @@
.el .sp 10p
..
.ny0
.TH AllPlanes 3X11 "Release 6.6" "X Version 11" "XLIB FUNCTIONS"
.TH AllPlanes 3X11 __xorgversion__ "XLIB FUNCTIONS"
.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\^)