X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fboxfit.c;h=1b1d0d717491a52eb8494ba77f27f4b3dc6ec39b;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=3c811ca00b75b3b11c1b9216a476d1e1e94e0a86;hpb=4ade52359b6eba3621566dac79793a33aa4c915f;p=xscreensaver diff --git a/hacks/boxfit.c b/hacks/boxfit.c index 3c811ca0..1b1d0d71 100644 --- a/hacks/boxfit.c +++ b/hacks/boxfit.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 2005-2013 Jamie Zawinski +/* xscreensaver, Copyright (c) 2005-2014 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -17,7 +17,7 @@ #include "screenhack.h" #include -#include "xpm-pixmap.h" +#include "ximage-loader.h" #define ALIVE 1 #define CHANGED 2 @@ -503,10 +503,11 @@ static Bool boxfit_event (Display *dpy, Window window, void *closure, XEvent *event) { state *st = (state *) closure; - if (event->xany.type == ButtonPress) { - st->growing_p = !st->growing_p; - return True; - } + if (screenhack_event_helper (dpy, window, event)) + { + st->growing_p = !st->growing_p; + return True; + } return False; } @@ -529,10 +530,11 @@ static const char *boxfit_defaults [] = { "*borderSize: 1", "*grab: False", "*peek: False", - "*grabDesktopImages: False", /* HAVE_COCOA */ - "*chooseRandomImages: True", /* HAVE_COCOA */ -#ifdef USE_IPHONE + "*grabDesktopImages: False", /* HAVE_JWXYZ */ + "*chooseRandomImages: True", /* HAVE_JWXYZ */ +#ifdef HAVE_MOBILE "*ignoreRotation: True", + "*rotateImages: True", #endif 0 };