projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.35.tar.gz
[xscreensaver]
/
hacks
/
deluxe.c
diff --git
a/hacks/deluxe.c
b/hacks/deluxe.c
index 06cfe1b9dc7373b3c4d1b15e4331930f8f6fcc04..3db698c9ddbdf3ea98dca8380111c1b48488f183 100644
(file)
--- a/
hacks/deluxe.c
+++ b/
hacks/deluxe.c
@@
-173,7
+173,7
@@
make_throbber (struct state *st, Drawable d, int w, int h, unsigned long pixel)
if (t->speed > 0) t->speed = -t->speed;
flags = GCForeground;
if (t->speed > 0) t->speed = -t->speed;
flags = GCForeground;
-# ifndef HAVE_
COCOA
+# ifndef HAVE_
JWXYZ
if (st->transparent_p)
{
gcv.foreground = ~0L;
if (st->transparent_p)
{
gcv.foreground = ~0L;
@@
-181,7
+181,7
@@
make_throbber (struct state *st, Drawable d, int w, int h, unsigned long pixel)
flags |= GCPlaneMask;
}
else
flags |= GCPlaneMask;
}
else
-# endif /* !HAVE_
COCOA
*/
+# endif /* !HAVE_
JWXYZ
*/
{
gcv.foreground = pixel;
}
{
gcv.foreground = pixel;
}
@@
-193,7
+193,7
@@
make_throbber (struct state *st, Drawable d, int w, int h, unsigned long pixel)
flags |= (GCLineWidth | GCCapStyle | GCJoinStyle);
t->gc = XCreateGC (st->dpy, d, flags, &gcv);
flags |= (GCLineWidth | GCCapStyle | GCJoinStyle);
t->gc = XCreateGC (st->dpy, d, flags, &gcv);
-# ifdef HAVE_
COCOA
+# ifdef HAVE_
JWXYZ
if (st->transparent_p)
{
/* give a non-opaque alpha to the color */
if (st->transparent_p)
{
/* give a non-opaque alpha to the color */
@@
-205,7
+205,7
@@
make_throbber (struct state *st, Drawable d, int w, int h, unsigned long pixel)
jwxyz_XSetAlphaAllowed (st->dpy, t->gc, True);
XSetForeground (st->dpy, t->gc, pixel);
}
jwxyz_XSetAlphaAllowed (st->dpy, t->gc, True);
XSetForeground (st->dpy, t->gc, pixel);
}
-# endif /* HAVE_
COCOA
*/
+# endif /* HAVE_
JWXYZ
*/
switch (random() % 11) {
case 0: case 1: case 2: case 3: t->draw = draw_star; break;
switch (random() % 11) {
case 0: case 1: case 2: case 3: t->draw = draw_star; break;
@@
-275,7
+275,7
@@
deluxe_init (Display *dpy, Window window)
st->dbeclear_p = get_boolean_resource (st->dpy, "useDBEClear", "Boolean");
#endif
st->dbeclear_p = get_boolean_resource (st->dpy, "useDBEClear", "Boolean");
#endif
-# ifdef HAVE_
COCOA
/* Don't second-guess Quartz's double-buffering */
+# ifdef HAVE_
JWXYZ
/* Don't second-guess Quartz's double-buffering */
st->dbuf = False;
# endif
st->dbuf = False;
# endif
@@
-292,7
+292,7
@@
deluxe_init (Display *dpy, Window window)
st->colors[0].pixel = get_pixel_resource(st->dpy, st->xgwa.colormap,
"foreground", "Foreground");
}
st->colors[0].pixel = get_pixel_resource(st->dpy, st->xgwa.colormap,
"foreground", "Foreground");
}
-#ifndef HAVE_
COCOA
+#ifndef HAVE_
JWXYZ
else if (st->transparent_p)
{
st->nplanes = get_integer_resource (st->dpy, "planes", "Planes");
else if (st->transparent_p)
{
st->nplanes = get_integer_resource (st->dpy, "planes", "Planes");
@@
-313,10
+313,10
@@
deluxe_init (Display *dpy, Window window)
goto COLOR;
}
}
goto COLOR;
}
}
-#endif /* !HAVE_
COCOA
*/
+#endif /* !HAVE_
JWXYZ
*/
else
{
else
{
-#ifndef HAVE_
COCOA
+#ifndef HAVE_
JWXYZ
COLOR:
#endif
make_random_colormap (st->xgwa.screen, st->xgwa.visual, st->xgwa.colormap,
COLOR:
#endif
make_random_colormap (st->xgwa.screen, st->xgwa.visual, st->xgwa.colormap,
@@
-438,7
+438,7
@@
static const char *deluxe_defaults [] = {
"*useDBE: True",
"*useDBEClear: True",
#endif /* HAVE_DOUBLE_BUFFER_EXTENSION */
"*useDBE: True",
"*useDBEClear: True",
#endif /* HAVE_DOUBLE_BUFFER_EXTENSION */
-#ifdef
USE_IPHON
E
+#ifdef
HAVE_MOBIL
E
"*ignoreRotation: True",
#endif
0
"*ignoreRotation: True",
#endif
0