-/* xscreensaver, Copyright (c) 1997 Jamie Zawinski <jwz@netscape.com>
+/* xscreensaver, Copyright (c) 1997-2013 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
extern char *progname;
void
-free_colors(Display *dpy, Colormap cmap, XColor *colors, int ncolors)
+free_colors (Screen *screen, Colormap cmap, XColor *colors, int ncolors)
{
+ Display *dpy = screen ? DisplayOfScreen (screen) : 0;
int i;
if (ncolors > 0)
{
void
-allocate_writable_colors (Display *dpy, Colormap cmap,
+allocate_writable_colors (Screen *screen, Colormap cmap,
unsigned long *pixels, int *ncolorsP)
{
+ Display *dpy = screen ? DisplayOfScreen (screen) : 0;
int desired = *ncolorsP;
int got = 0;
int requested = desired;
while (got < desired
&& requested > 0)
{
- if (desired - got > requested)
+ if (desired - got < requested)
requested = desired - got;
if (XAllocColorCells (dpy, cmap, False, 0, 0, new_pixels, requested))
}
+static void
+complain (int wanted_colors, int got_colors,
+ Bool wanted_writable, Bool got_writable)
+{
+ if (got_colors > wanted_colors - 10)
+ /* don't bother complaining if we're within ten pixels. */
+ return;
+
+ if (wanted_writable && !got_writable)
+ fprintf (stderr,
+ "%s: wanted %d writable colors; got %d read-only colors.\n",
+ progname, wanted_colors, got_colors);
+ else
+ fprintf (stderr, "%s: wanted %d%s colors; got %d.\n",
+ progname, wanted_colors, (got_writable ? " writable" : ""),
+ got_colors);
+}
+
+
void
-make_color_ramp (Display *dpy, Colormap cmap,
+make_color_ramp (Screen *screen, Visual *visual, Colormap cmap,
int h1, double s1, double v1, /* 0-360, 0-1.0, 0-1.0 */
int h2, double s2, double v2, /* 0-360, 0-1.0, 0-1.0 */
XColor *colors, int *ncolorsP,
Bool closed_p,
Bool allocate_p,
- Bool writable_p)
+ Bool *writable_pP)
{
+ Display *dpy = screen ? DisplayOfScreen (screen) : 0;
+ Bool verbose_p = True; /* argh. */
int i;
- int ncolors = *ncolorsP;
+ int total_ncolors = *ncolorsP;
+ int ncolors, wanted;
+ Bool wanted_writable = (allocate_p && writable_pP && *writable_pP);
double dh, ds, dv; /* deltas */
+ wanted = total_ncolors;
+ if (closed_p)
+ wanted = (wanted / 2) + 1;
+
+ /* If this visual doesn't support writable cells, don't bother trying.
+ */
+ if (wanted_writable && !has_writable_cells(screen, visual))
+ *writable_pP = False;
+
AGAIN:
+ ncolors = total_ncolors;
memset (colors, 0, (*ncolorsP) * sizeof(*colors));
if (!allocate_p)
return;
- if (writable_p)
+ if (writable_pP && *writable_pP)
{
unsigned long *pixels = (unsigned long *)
malloc(sizeof(*pixels) * ((*ncolorsP) + 1));
}
else
{
- free_colors (dpy, cmap, colors, i);
+ free_colors (screen, cmap, colors, i);
goto FAIL;
}
}
}
- return;
+ goto WARN;
FAIL:
/* we weren't able to allocate all the colors we wanted;
decrease the requested number and try again.
*/
- ncolors = (ncolors > 170 ? ncolors - 20 :
- ncolors > 100 ? ncolors - 10 :
- ncolors > 75 ? ncolors - 5 :
- ncolors > 25 ? ncolors - 3 :
- ncolors > 10 ? ncolors - 2 :
- ncolors > 2 ? ncolors - 1 :
- 0);
- *ncolorsP = ncolors;
- if (ncolors > 0)
+ total_ncolors = (total_ncolors > 170 ? total_ncolors - 20 :
+ total_ncolors > 100 ? total_ncolors - 10 :
+ total_ncolors > 75 ? total_ncolors - 5 :
+ total_ncolors > 25 ? total_ncolors - 3 :
+ total_ncolors > 10 ? total_ncolors - 2 :
+ total_ncolors > 2 ? total_ncolors - 1 :
+ 0);
+ *ncolorsP = total_ncolors;
+ ncolors = total_ncolors;
+ if (total_ncolors > 0)
goto AGAIN;
+
+ WARN:
+
+ if (verbose_p &&
+ /* don't warn if we got 0 writable colors -- probably TrueColor. */
+ (ncolors != 0 || !wanted_writable))
+ complain (wanted, ncolors, wanted_writable,
+ (wanted_writable && writable_pP && *writable_pP));
}
static void
-make_color_path (Display *dpy, Colormap cmap,
+make_color_path (Screen *screen, Visual *visual, Colormap cmap,
int npoints, int *h, double *s, double *v,
XColor *colors, int *ncolorsP,
Bool allocate_p,
- Bool writable_p)
+ Bool *writable_pP)
{
+ Display *dpy = screen ? DisplayOfScreen (screen) : 0;
int i, j, k;
int total_ncolors = *ncolorsP;
}
else if (npoints == 2) /* using make_color_ramp() will be faster */
{
- make_color_ramp (dpy, cmap,
+ make_color_ramp (screen, visual, cmap,
h[0], s[0], v[0], h[1], s[1], v[1],
colors, ncolorsP,
True, /* closed_p */
- allocate_p, writable_p);
+ allocate_p, writable_pP);
return;
}
else if (npoints >= MAXPOINTS)
k = 0;
for (i = 0; i < npoints; i++)
{
- int distance, direction;
- distance = h[(i+1) % npoints] - h[i];
- direction = (distance >= 0 ? -1 : 1);
-
- if (distance > 180)
- distance = 180 - (distance - 180);
- else if (distance < -180)
- distance = -(180 - ((-distance) - 180));
- else
- direction = -direction;
+ int distance = h[(i+1) % npoints] - h[i];
+ int direction = (distance >= 0 ? -1 : 1);
+
+ if (distance <= 180 && distance >= -180)
+ direction = -direction;
#ifdef DEBUG
fprintf (stderr, "point %d: %3d %.2f %.2f\n",
if (!allocate_p)
return;
- if (writable_p)
+ if (writable_pP && *writable_pP)
{
unsigned long *pixels = (unsigned long *)
malloc(sizeof(*pixels) * ((*ncolorsP) + 1));
}
else
{
- free_colors (dpy, cmap, colors, i);
+ free_colors (screen, cmap, colors, i);
goto FAIL;
}
}
void
-make_color_loop (Display *dpy, Colormap cmap,
+make_color_loop (Screen *screen, Visual *visual, Colormap cmap,
int h0, double s0, double v0, /* 0-360, 0-1.0, 0-1.0 */
int h1, double s1, double v1, /* 0-360, 0-1.0, 0-1.0 */
int h2, double s2, double v2, /* 0-360, 0-1.0, 0-1.0 */
XColor *colors, int *ncolorsP,
Bool allocate_p,
- Bool writable_p)
+ Bool *writable_pP)
{
+ Bool wanted_writable = (allocate_p && writable_pP && *writable_pP);
+
int h[3];
double s[3], v[3];
h[0] = h0; h[1] = h1; h[2] = h2;
s[0] = s0; s[1] = s1; s[2] = s2;
v[0] = v0; v[1] = v1; v[2] = v2;
- make_color_path(dpy, cmap,
- 3, h, s, v,
- colors, ncolorsP,
- allocate_p, writable_p);
-}
+ /* If this visual doesn't support writable cells, don't bother trying.
+ */
+ if (wanted_writable && !has_writable_cells(screen, visual))
+ *writable_pP = False;
-static void
-complain (int wanted_colors, int got_colors,
- Bool wanted_writable, Bool got_writable)
-{
- if (wanted_writable && !got_writable)
- fprintf(stderr,
- "%s: wanted %d writable colors; got %d read-only colors.\n",
- progname, wanted_colors, got_colors);
-
- else if (wanted_colors > (got_colors + 10))
- /* don't bother complaining if we're within ten pixels. */
- fprintf(stderr, "%s: wanted %d%s colors; got %d.\n",
- progname, wanted_colors, (got_writable ? " writable" : ""),
- got_colors);
+ make_color_path (screen, visual, cmap,
+ 3, h, s, v,
+ colors, ncolorsP,
+ allocate_p, writable_pP);
}
void
-make_smooth_colormap (Display *dpy, Visual *visual, Colormap cmap,
+make_smooth_colormap (Screen *screen, Visual *visual, Colormap cmap,
XColor *colors, int *ncolorsP,
Bool allocate_p,
Bool *writable_pP,
double v[MAXPOINTS];
double total_s = 0;
double total_v = 0;
- Screen *screen = DefaultScreenOfDisplay(dpy); /* #### WRONG! */
+ int loop = 0;
if (*ncolorsP <= 0) return;
for (i = 0; i < npoints; i++)
{
REPICK_THIS_COLOR:
+ if (++loop > 10000) abort();
h[i] = random() % 360;
s[i] = frand(1.0);
v[i] = frand(0.8) + 0.2;
if (dh < 0) dh = -dh;
if (dh > 0.5) dh = 0.5 - (dh - 0.5);
distance = sqrt ((dh * dh) +
- ((s[j] - s[i]) * (s[j] - v[i])) +
+ ((s[j] - s[i]) * (s[j] - s[i])) +
((v[j] - v[i]) * (v[j] - v[i])));
if (distance < 0.2)
goto REPICK_THIS_COLOR;
*writable_pP = False;
RETRY_NON_WRITABLE:
- make_color_path (dpy, cmap, npoints, h, s, v, colors, &ncolors,
- allocate_p, (writable_pP && *writable_pP));
+ make_color_path (screen, visual, cmap, npoints, h, s, v, colors, &ncolors,
+ allocate_p, writable_pP);
/* If we tried for writable cells and got none, try for non-writable. */
- if (allocate_p && *ncolorsP == 0 && *writable_pP)
+ if (allocate_p && *ncolorsP == 0 && writable_pP && *writable_pP)
{
*writable_pP = False;
goto RETRY_NON_WRITABLE;
void
-make_uniform_colormap (Display *dpy, Visual *visual, Colormap cmap,
+make_uniform_colormap (Screen *screen, Visual *visual, Colormap cmap,
XColor *colors, int *ncolorsP,
Bool allocate_p,
Bool *writable_pP,
{
int ncolors = *ncolorsP;
Bool wanted_writable = (allocate_p && writable_pP && *writable_pP);
- Screen *screen = DefaultScreenOfDisplay(dpy); /* #### WRONG! */
double S = ((double) (random() % 34) + 66) / 100.0; /* range 66%-100% */
double V = ((double) (random() % 34) + 66) / 100.0; /* range 66%-100% */
*writable_pP = False;
RETRY_NON_WRITABLE:
- make_color_ramp(dpy, cmap,
+ make_color_ramp(screen, visual, cmap,
0, S, V,
359, S, V,
colors, &ncolors,
- False, True, wanted_writable);
+ False, allocate_p, writable_pP);
/* If we tried for writable cells and got none, try for non-writable. */
if (allocate_p && *ncolorsP == 0 && writable_pP && *writable_pP)
void
-make_random_colormap (Display *dpy, Visual *visual, Colormap cmap,
+make_random_colormap (Screen *screen, Visual *visual, Colormap cmap,
XColor *colors, int *ncolorsP,
Bool bright_p,
Bool allocate_p,
Bool *writable_pP,
Bool verbose_p)
{
+ Display *dpy = screen ? DisplayOfScreen (screen) : 0;
Bool wanted_writable = (allocate_p && writable_pP && *writable_pP);
int ncolors = *ncolorsP;
int i;
- Screen *screen = DefaultScreenOfDisplay(dpy); /* #### WRONG! */
if (*ncolorsP <= 0) return;
if (wanted_writable && !has_writable_cells(screen, visual))
*writable_pP = False;
+ RETRY_ALL:
for (i = 0; i < ncolors; i++)
{
colors[i].flags = DoRed|DoGreen|DoBlue;
}
}
+ /* If there are a small number of colors, make sure at least the first
+ two contrast well.
+ */
+ if (!bright_p && ncolors <= 4)
+ {
+ int h0, h1;
+ double s0, s1, v0, v1;
+ rgb_to_hsv (colors[0].red, colors[0].green, colors[0].blue, &h0,&s0,&v0);
+ rgb_to_hsv (colors[1].red, colors[1].green, colors[1].blue, &h1,&s1,&v1);
+ if (fabs (v1-v0) < 0.5)
+ goto RETRY_ALL;
+ }
+
if (!allocate_p)
return;
unsigned long *pixels = (unsigned long *)
malloc(sizeof(*pixels) * (ncolors + 1));
- allocate_writable_colors (dpy, cmap, pixels, &ncolors);
+ allocate_writable_colors (screen, cmap, pixels, &ncolors);
if (ncolors > 0)
for (i = 0; i < ncolors; i++)
colors[i].pixel = pixels[i];
void
-rotate_colors (Display *dpy, Colormap cmap,
+rotate_colors (Screen *screen, Colormap cmap,
XColor *colors, int ncolors, int distance)
{
+ Display *dpy = screen ? DisplayOfScreen (screen) : 0;
int i;
- XColor *colors2 = (XColor *) malloc(sizeof(*colors2) * ncolors);
+ XColor *colors2;
if (ncolors < 2) return;
+ colors2 = (XColor *) malloc(sizeof(*colors2) * ncolors);
distance = distance % ncolors;
for (i = 0; i < ncolors; i++)
{