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
/
interference.c
diff --git
a/hacks/interference.c
b/hacks/interference.c
index 2112d27a9004be4335a4571e89be0add7c5239d2..fe3084e4c2a78ee7ba3e46f2403b190d143bc3ae 100644
(file)
--- a/
hacks/interference.c
+++ b/
hacks/interference.c
@@
-130,7
+130,7
@@
static const char *interference_defaults [] = {
#ifdef HAVE_XSHM_EXTENSION
"*useSHM: True", /* use shared memory extension */
#endif /* HAVE_XSHM_EXTENSION */
#ifdef HAVE_XSHM_EXTENSION
"*useSHM: True", /* use shared memory extension */
#endif /* HAVE_XSHM_EXTENSION */
-#ifdef
USE_IPHON
E
+#ifdef
HAVE_MOBIL
E
"*ignoreRotation: True",
#endif
THREAD_DEFAULTS
"*ignoreRotation: True",
#endif
THREAD_DEFAULTS
@@
-779,7
+779,7
@@
static void inter_init(Display* dpy, Window win, struct inter_context* c)
unsigned long valmask = 0;
#endif
unsigned long valmask = 0;
#endif
-# ifdef HAVE_
COCOA
/* Don't second-guess Quartz's double-buffering */
+# ifdef HAVE_
JWXYZ
/* Don't second-guess Quartz's double-buffering */
dbuf = False;
# endif
dbuf = False;
# endif
@@
-904,6
+904,7
@@
static void inter_init(Display* dpy, Window win, struct inter_context* c)
c->radius = radius;
#endif
c->radius = radius;
#endif
+ if (c->radius < 1) c->radius = 1;
c->wave_height = calloc(c->radius, sizeof(unsigned));
check_no_mem(dpy, c, c->wave_height);
c->wave_height = calloc(c->radius, sizeof(unsigned));
check_no_mem(dpy, c, c->wave_height);
@@
-1040,7
+1041,7
@@
interference_reshape (Display *dpy, Window window, void *closure,
{
struct inter_context *c = (struct inter_context *) closure;
XWindowAttributes xgwa;
{
struct inter_context *c = (struct inter_context *) closure;
XWindowAttributes xgwa;
- Bool dbuf = (c->pix_buf
+ Bool dbuf = (
!!
c->pix_buf
# ifdef HAVE_DOUBLE_BUFFER_EXTENSION
|| c->back_buf
# endif
# ifdef HAVE_DOUBLE_BUFFER_EXTENSION
|| c->back_buf
# endif