Merge remote-tracking branch 'origin/released'

1 files changed, 99 insertions, 77 deletions

diff --git a/libX11/src/QuColors.c b/libX11/src/QuColors.c
index 3aa2838ac..237b8bf03 100644
--- a/libX11/src/QuColors.c
+++ b/libX11/src/QuColors.c
@@ -1,77 +1,99 @@
-/*

-

-Copyright 1986, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include "Xlibint.h"

-

-int

-XQueryColors(

-    register Display *dpy,

-    Colormap cmap,

-    XColor *defs, 		/* RETURN */

-    int ncolors)

-{

-    register int i;

-    xrgb *color;

-    xQueryColorsReply rep;

-    long nbytes;

-    register xQueryColorsReq *req;

-

-    LockDisplay(dpy);

-    GetReq(QueryColors, req);

-

-    req->cmap = cmap;

-    req->length += ncolors; /* each pixel is a CARD32 */

-

-    for (i = 0; i < ncolors; i++)

-      Data32 (dpy, (long *)&defs[i].pixel, 4L);

-       /* XXX this isn't very efficient */

-

-    if (_XReply(dpy, (xReply *) &rep, 0, xFalse) != 0) {

-	if ((color = (xrgb *)

-	    Xmalloc((unsigned) (nbytes = (long) ncolors * SIZEOF(xrgb))))) {

-

-	    _XRead(dpy, (char *) color, nbytes);

-

-	    for (i = 0; i < ncolors; i++) {

-		register XColor *def = &defs[i];

-		register xrgb *rgb = &color[i];

-		def->red = rgb->red;

-		def->green = rgb->green;

-		def->blue = rgb->blue;

-		def->flags = DoRed | DoGreen | DoBlue;

-	    }

-	    Xfree((char *)color);

-	}

-	else _XEatData(dpy, (unsigned long) nbytes);

-    }

-    UnlockDisplay(dpy);

-    SyncHandle();

-    return 1;

-}

-

+/*
+
+Copyright 1986, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+
+static void
+_XQueryColors(
+    register Display *dpy,
+    Colormap cmap,
+    XColor *defs, 		/* RETURN */
+    int ncolors)
+{
+    register int i;
+    xrgb *color;
+    xQueryColorsReply rep;
+    long nbytes;
+    register xQueryColorsReq *req;
+
+    GetReq(QueryColors, req);
+
+    req->cmap = cmap;
+    SetReqLen(req, ncolors, ncolors); /* each pixel is a CARD32 */
+
+    for (i = 0; i < ncolors; i++)
+      Data32 (dpy, (long *)&defs[i].pixel, 4L);
+       /* XXX this isn't very efficient */
+
+    if (_XReply(dpy, (xReply *) &rep, 0, xFalse) != 0) {
+	if ((color = (xrgb *)
+	    Xmalloc((unsigned) (nbytes = (long) ncolors * SIZEOF(xrgb))))) {
+
+	    _XRead(dpy, (char *) color, nbytes);
+
+	    for (i = 0; i < ncolors; i++) {
+		register XColor *def = &defs[i];
+		register xrgb *rgb = &color[i];
+		def->red = rgb->red;
+		def->green = rgb->green;
+		def->blue = rgb->blue;
+		def->flags = DoRed | DoGreen | DoBlue;
+	    }
+	    Xfree((char *)color);
+	}
+	else _XEatData(dpy, (unsigned long) nbytes);
+    }
+}
+
+int
+XQueryColors(
+    register Display * const dpy,
+    const Colormap cmap,
+    XColor *defs, 		/* RETURN */
+    int ncolors)
+{
+    int n;
+
+    if (dpy->bigreq_size > 0)
+	n = dpy->bigreq_size - (sizeof (xQueryColorsReq) >> 2) - 1;
+    else
+	n = dpy->max_request_size - (sizeof (xQueryColorsReq) >> 2);
+
+    LockDisplay(dpy);
+    while (ncolors >= n) {
+	_XQueryColors(dpy, cmap, defs, n);
+	defs += n;
+	ncolors -= n;
+    }
+    if (ncolors > 0)
+	_XQueryColors(dpy, cmap, defs, ncolors);
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return 1;
+}