-/* xscreensaver, Copyright (c) 1992-2008 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1992-2014 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
#include "screenhack.h"
#include "xpm-pixmap.h"
#include <stdio.h>
+#include <time.h>
#include "images/som.xbm"
So, on OSX, we implement the blitter by hand. It is correct, but
orders of magnitude slower.
*/
-#ifndef HAVE_COCOA
+#ifndef HAVE_JWXYZ
# define USE_XCOPYAREA
#endif
st->first_time = 0;
st->loaded_p = True;
st->qwad = -1;
- st->start_time = time ((time_t) 0);
+ st->start_time = time ((time_t *) 0);
blitspin_init_2 (st);
}
if (!st->img_loader &&
st->load_ext_p &&
- st->start_time + st->duration < time ((time_t) 0)) {
+ st->start_time + st->duration < time ((time_t *) 0)) {
/* Start a new image loading, but keep rotating the old image
until the new one arrives. */
st->img_loader = load_image_async_simple (0, st->xgwa.screen, st->window,
if (st->delay2 < 0) st->delay2 = 0;
if (st->duration < 1) st->duration = 1;
- st->start_time = time ((time_t) 0);
+ st->start_time = time ((time_t *) 0);
bitmap_name = get_string_resource (st->dpy, "bitmap", "Bitmap");
if (! bitmap_name || !*bitmap_name)
st->bitmap = xpm_file_to_pixmap (st->dpy, st->window, bitmap_name,
&st->width, &st->height, 0);
st->scale_up = True; /* probably? */
+ blitspin_init_2 (st);
}
return st;
static Bool
blitspin_event (Display *dpy, Window window, void *closure, XEvent *event)
{
+ struct state *st = (struct state *) closure;
+ if (screenhack_event_helper (dpy, window, event))
+ {
+ st->start_time = 0;
+ return True;
+ }
return False;
}
"*delay2: 500000",
"*duration: 120",
"*bitmap: (default)",
- "*geometry: 512x512",
+ "*geometry: 1080x1080",
+#ifdef HAVE_MOBILE
+ "*ignoreRotation: True",
+#endif
0
};