diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:41 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:41 +0000 |
commit | d1f2ce614cc22280b8771fd152034ad72dda557a (patch) | |
tree | cb45f3ee9fb029bd1a25da1b605491bcfd1a6d3f /src/StdCmap.c | |
parent | 709dda59a506e0c4ad17b085aa381f35cd86176f (diff) |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/StdCmap.c')
-rw-r--r-- | src/StdCmap.c | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/src/StdCmap.c b/src/StdCmap.c index 60719e8..fec09ec 100644 --- a/src/StdCmap.c +++ b/src/StdCmap.c @@ -25,6 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xmu/StdCmap.c,v 1.6 2001/12/14 19:55:48 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium @@ -38,7 +39,12 @@ in this Software without prior written authorization from The Open Group. #define lowbit(x) ((x) & (~(x) + 1)) -static Status valid_args(); /* argument restrictions */ +/* + * Prototypes + */ +/* argument restrictions */ +static Status valid_args(XVisualInfo*, unsigned long, unsigned long, + unsigned long, Atom); /* * To create any one standard colormap, use XmuStandardColormap(). @@ -55,15 +61,20 @@ static Status valid_args(); /* argument restrictions */ * caller's responsibility. */ -XStandardColormap *XmuStandardColormap(dpy, screen, visualid, depth, property, - cmap, red_max, green_max, blue_max) - Display *dpy; /* specifies X server connection */ - int screen; /* specifies display screen */ - VisualID visualid; /* identifies the visual type */ - unsigned int depth; /* identifies the visual type */ - Atom property; /* a standard colormap property */ - Colormap cmap; /* specifies colormap ID or None */ - unsigned long red_max, green_max, blue_max; /* allocations */ +XStandardColormap * +XmuStandardColormap(Display *dpy, int screen, VisualID visualid, + unsigned int depth, Atom property, Colormap cmap, + unsigned long red_max, unsigned long green_max, + unsigned long blue_max) + /* + * dpy - specifies X server connection + * screen - specifies display screen + * visualid - identifies the visual type + * depth - identifies the visual type + * property - a standard colormap property + * cmap - specifies colormap ID or None + * red_max, green_max, blue_max - allocations + */ { XStandardColormap *stdcmap; Status status; @@ -146,10 +157,14 @@ XStandardColormap *XmuStandardColormap(dpy, screen, visualid, depth, property, } /****************************************************************************/ -static Status valid_args(vinfo, red_max, green_max, blue_max, property) - XVisualInfo *vinfo; /* specifies visual */ - unsigned long red_max, green_max, blue_max; /* specifies alloc */ - Atom property; /* specifies property name */ +static Status +valid_args(XVisualInfo *vinfo, unsigned long red_max, unsigned long green_max, + unsigned long blue_max, Atom property) + /* + * vinfo - specifies visual + * red_max, green_max, blue_max - specifies alloc + * property - specifies property name + */ { unsigned long ncolors; /* number of colors requested */ |