X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fmoire2.c;h=0b6c9cd62b80d46ebfc16080973441df0b668131;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=72a2f4f23a2cd5a3069ffa0cd90a9d1c9d82f0f3;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver diff --git a/hacks/moire2.c b/hacks/moire2.c index 72a2f4f2..0b6c9cd6 100644 --- a/hacks/moire2.c +++ b/hacks/moire2.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1997, 1998, 2006 Jamie Zawinski +/* xscreensaver, Copyright (c) 1997-2013 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -64,7 +64,8 @@ moire2_init_1 (struct state *st) if (mono_p) ; else - make_smooth_colormap (st->dpy, xgwa.visual, xgwa.colormap, st->colors, &st->ncolors, + make_smooth_colormap (xgwa.screen, xgwa.visual, xgwa.colormap, + st->colors, &st->ncolors, True, 0, True); st->bg_pixel = get_pixel_resource(st->dpy, @@ -306,6 +307,8 @@ static void moire2_reshape (Display *dpy, Window window, void *closure, unsigned int w, unsigned int h) { + struct state *st = (struct state *) closure; + st->reset = 1; } static Bool @@ -326,6 +329,9 @@ static const char *moire2_defaults [] = { "*thickness: 0", "*colors: 150", "*colorShift: 5", +#ifdef HAVE_MOBILE + "*ignoreRotation: True", +#endif #ifdef HAVE_DOUBLE_BUFFER_EXTENSION /* Off by default, since it slows it down a lot, and the flicker isn't really