X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fhalo.c;h=42b6a552e8843c07734f2ba4130299bb523fc083;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=2b7e30fb79616a307fc67a50b7148d224e1a0e3e;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/halo.c b/hacks/halo.c
index 2b7e30fb..42b6a552 100644
--- a/hacks/halo.c
+++ b/hacks/halo.c
@@ -1,5 +1,4 @@
-/* xscreensaver, Copyright (c) 1993, 1995, 1996, 1997, 1998, 1999, 2003, 2006
- *  Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1993-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
@@ -139,10 +138,12 @@ halo_init (Display *dpy, Window window)
   if (mono_p)
     ;
   else if (random() % (cmode == seuss_mode ? 2 : 10))
-    make_uniform_colormap (st->dpy, xgwa.visual, st->cmap, st->colors, &st->ncolors,
+    make_uniform_colormap (xgwa.screen, xgwa.visual, st->cmap,
+                           st->colors, &st->ncolors,
 			   True, 0, True);
   else
-    make_smooth_colormap (st->dpy, xgwa.visual, st->cmap, st->colors, &st->ncolors,
+    make_smooth_colormap (xgwa.screen, xgwa.visual, st->cmap,
+                          st->colors, &st->ncolors,
 			  True, 0, True);
 
   if (st->ncolors <= 2) mono_p = True;
@@ -184,7 +185,7 @@ halo_init (Display *dpy, Window window)
   gcv.background = st->bg_pixel;
   st->copy_gc = XCreateGC (st->dpy, st->window, GCForeground | GCBackground, &gcv);
 
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
   jwxyz_XSetAntiAliasing (dpy, st->draw_gc,  False);
   jwxyz_XSetAntiAliasing (dpy, st->erase_gc, False);
   jwxyz_XSetAntiAliasing (dpy, st->copy_gc,  False);
@@ -404,6 +405,9 @@ static const char *halo_defaults [] = {
   "*delay2:		20",
   "*increment:		0",
   "*animate:		False",
+#ifdef HAVE_MOBILE
+  "*ignoreRotation:     True",
+#endif
   0
 };