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
/
distort.c
diff --git
a/hacks/distort.c
b/hacks/distort.c
index a4c7843ccdf90bac457ed342fd605fac9523dea7..477ee63b77844dbdaae1a07bf68f628558a7627d 100644
(file)
--- a/
hacks/distort.c
+++ b/
hacks/distort.c
@@
-35,6
+35,7
@@
*/
#include <math.h>
*/
#include <math.h>
+#include <time.h>
#include "screenhack.h"
/*#include <X11/Xmd.h>*/
#include "screenhack.h"
/*#include <X11/Xmd.h>*/
@@
-289,7
+290,7
@@
distort_init (Display *dpy, Window window)
st->img_loader = load_image_async_simple (0, st->xgwa.screen, st->window,
st->window, 0, 0);
st->img_loader = load_image_async_simple (0, st->xgwa.screen, st->window,
st->window, 0, 0);
- st->start_time = time ((time_t) 0);
+ st->start_time = time ((time_t
*
) 0);
return st;
}
return st;
}
@@
-298,7
+299,7
@@
distort_finish_loading (struct state *st)
{
int i;
{
int i;
- st->start_time = time ((time_t) 0);
+ st->start_time = time ((time_t
*
) 0);
st->buffer_map = 0;
st->orig_map = XGetImage(st->dpy, st->window, 0, 0, st->xgwa.width, st->xgwa.height,
st->buffer_map = 0;
st->orig_map = XGetImage(st->dpy, st->window, 0, 0, st->xgwa.width, st->xgwa.height,
@@
-771,7
+772,7
@@
distort_draw (Display *dpy, Window window, void *closure)
}
if (!st->img_loader &&
}
if (!st->img_loader &&
- st->start_time + st->duration < time ((time_t) 0)) {
+ st->start_time + st->duration < time ((time_t
*
) 0)) {
st->img_loader = load_image_async_simple (0, st->xgwa.screen, st->window,
st->window, 0, 0);
return st->delay;
st->img_loader = load_image_async_simple (0, st->xgwa.screen, st->window,
st->window, 0, 0);
return st->delay;
@@
-847,7
+848,7
@@
static const char *distort_defaults [] = {
#ifdef HAVE_XSHM_EXTENSION
"*useSHM: False", /* xshm turns out not to help. */
#endif /* HAVE_XSHM_EXTENSION */
#ifdef HAVE_XSHM_EXTENSION
"*useSHM: False", /* xshm turns out not to help. */
#endif /* HAVE_XSHM_EXTENSION */
-#ifdef
USE_IPHON
E
+#ifdef
HAVE_MOBIL
E
"*ignoreRotation: True",
"*rotateImages: True",
#endif
"*ignoreRotation: True",
"*rotateImages: True",
#endif