-/* 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
#include "screenhack.h"
#include <stdio.h>
-#include "xpm-pixmap.h"
+#include "ximage-loader.h"
#define BELLRAND(n) ((frand((n)) + frand((n)) + frand((n))) / 3)
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,
"*scale: 2",
"*debug: False",
"*delay: 20000",
-#ifdef USE_IPHONE
+#ifdef HAVE_MOBILE
"*ignoreRotation: True",
#endif
0