X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fhalftone.c;h=b70a636d1dae3230c1c386815a9e201b12ef121e;hb=39809ded547bdbb08207d3e514950425215b4410;hp=7c62111ac360287add996736c1f43df46408b592;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/halftone.c b/hacks/halftone.c
index 7c62111a..b70a636d 100644
--- a/hacks/halftone.c
+++ b/hacks/halftone.c
@@ -78,14 +78,14 @@ static void update_buffer(halftone_screen *halftone, XWindowAttributes * attrs)
     if (halftone->buffer_width != -1 &&
 	halftone->buffer_height != -1)
     {
-      if (halftone->buffer == halftone->window)
+      if (halftone->buffer != halftone->window)
         XFreePixmap(halftone->dpy, halftone->buffer);
       XFreeGC(halftone->dpy, halftone->buffer_gc);
     }
 
     halftone->buffer_width = attrs->width;
     halftone->buffer_height = attrs->height;
-#ifdef HAVE_COCOA	/* Don't second-guess Quartz's double-buffering */
+#ifdef HAVE_JWXYZ	/* Don't second-guess Quartz's double-buffering */
     halftone->buffer = halftone->window;
 #else
     halftone->buffer = XCreatePixmap(halftone->dpy, halftone->window, halftone->buffer_width, halftone->buffer_height, attrs->depth);
@@ -191,7 +191,7 @@ halftone_init (Display *dpy, Window window)
   halftone->ncolors = get_integer_resource (dpy, "colors", "Colors");
   if (halftone->ncolors < 4) halftone->ncolors = 4;
   halftone->colors = (XColor *) calloc(halftone->ncolors, sizeof(XColor));
-  make_smooth_colormap (dpy, attrs.visual, attrs.colormap,
+  make_smooth_colormap (attrs.screen, attrs.visual, attrs.colormap,
                         halftone->colors, &halftone->ncolors,
                         True, 0, False);
   halftone->color0 = 0;
@@ -373,6 +373,9 @@ static const char *halftone_defaults [] = {
   "*sizeFactor:		1.5",
   "*colors:		200",
   "*cycleSpeed:		10",
+#ifdef HAVE_MOBILE
+  "*ignoreRotation:     True",
+#endif
   0
 };