From http://www.jwz.org/xscreensaver/xscreensaver-5.39.tar.gz

[xscreensaver] / hacks / cwaves.c

diff --git a/hacks/cwaves.c b/hacks/cwaves.c
index 94c235574b1daef78240f2e3b5092624937ab30b..20dd80abc0959d83885b49d83079fba3ade93742 100644 (file)
--- a/hacks/cwaves.c
+++ b/hacks/cwaves.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2007-2013 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2007-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
@@ -13,7 +13,7 @@
 
 #include "screenhack.h"
 #include <stdio.h>
-#include "xpm-pixmap.h"
+#include "ximage-loader.h"
 
 #define BELLRAND(n) ((frand((n)) + frand((n)) + frand((n))) / 3)
 
@@ -168,7 +168,7 @@ static Bool
 cwaves_event (Display *dpy, Window window, void *closure, XEvent *event)
 {
   state *st = (state *) closure;
-  if (event->type == ButtonPress)
+  if (screenhack_event_helper (dpy, window, event))
     {
       make_smooth_colormap (st->xgwa.screen, st->xgwa.visual,
                             st->xgwa.colormap,
@@ -193,7 +193,7 @@ static const char *cwaves_defaults [] = {
   "*scale:                2",
   "*debug:                False",
   "*delay:                20000",
-#ifdef USE_IPHONE
+#ifdef HAVE_MOBILE
   "*ignoreRotation:        True",
 #endif
   0