Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver

diff --git a/xscreensaver/debian/xscreensaver.files b/xscreensaver/debian/xscreensaver.files
index 5564b19..165d211 100644 (file)
--- a/xscreensaver/debian/xscreensaver.files
+++ b/xscreensaver/debian/xscreensaver.files
@@ -39,7 +39,6 @@ usr/lib/xscreensaver/apple2
 usr/lib/xscreensaver/attraction
 usr/lib/xscreensaver/barcode
 usr/lib/xscreensaver/blaster
-usr/lib/xscreensaver/blitspin
 usr/lib/xscreensaver/boxfit
 usr/lib/xscreensaver/braid
 usr/lib/xscreensaver/bsod
@@ -64,7 +63,6 @@ usr/lib/xscreensaver/fireworkx
 usr/lib/xscreensaver/flame
 usr/lib/xscreensaver/flow
 usr/lib/xscreensaver/fluidballs
-usr/lib/xscreensaver/fontglide
 usr/lib/xscreensaver/goop
 usr/lib/xscreensaver/grav
 usr/lib/xscreensaver/greynetic
@@ -89,7 +87,6 @@ usr/lib/xscreensaver/moire2
 usr/lib/xscreensaver/mountain
 usr/lib/xscreensaver/munch
 usr/lib/xscreensaver/nerverot
-usr/lib/xscreensaver/noseguy
 usr/lib/xscreensaver/pacman
 usr/lib/xscreensaver/pedal
 usr/lib/xscreensaver/penetrate
@@ -117,15 +114,11 @@ usr/lib/xscreensaver/triangle
 usr/lib/xscreensaver/truchet
 usr/lib/xscreensaver/twang
 usr/lib/xscreensaver/vermiculate
-usr/lib/xscreensaver/vidwhacker
 usr/lib/xscreensaver/wander
-usr/lib/xscreensaver/webcollage
-usr/lib/xscreensaver/webcollage-helper
 usr/lib/xscreensaver/whirlwindwarp
 usr/lib/xscreensaver/wormhole
 usr/lib/xscreensaver/xanalogtv
 usr/lib/xscreensaver/xflame
-usr/lib/xscreensaver/xjack
 usr/lib/xscreensaver/xmatrix
 usr/lib/xscreensaver/xrayswarm
 usr/lib/xscreensaver/xspirograph
@@ -138,7 +131,6 @@ usr/share/xscreensaver/config/apple2.xml
 usr/share/xscreensaver/config/attraction.xml
 usr/share/xscreensaver/config/barcode.xml
 usr/share/xscreensaver/config/blaster.xml
-usr/share/xscreensaver/config/blitspin.xml
 usr/share/xscreensaver/config/boxfit.xml
 usr/share/xscreensaver/config/braid.xml
 usr/share/xscreensaver/config/bsod.xml
@@ -150,8 +142,8 @@ usr/share/xscreensaver/config/compass.xml
 usr/share/xscreensaver/config/coral.xml
 usr/share/xscreensaver/config/crystal.xml
 usr/share/xscreensaver/config/cynosure.xml
-usr/share/xscreensaver/config/decayscreen.xml
 usr/share/xscreensaver/config/deluxe.xml
+usr/share/xscreensaver/config/decayscreen.xml
 usr/share/xscreensaver/config/demon.xml
 usr/share/xscreensaver/config/discrete.xml
 usr/share/xscreensaver/config/drift.xml
@@ -163,7 +155,6 @@ usr/share/xscreensaver/config/fireworkx.xml
 usr/share/xscreensaver/config/flame.xml
 usr/share/xscreensaver/config/flow.xml
 usr/share/xscreensaver/config/fluidballs.xml
-usr/share/xscreensaver/config/fontglide.xml
 usr/share/xscreensaver/config/goop.xml
 usr/share/xscreensaver/config/grav.xml
 usr/share/xscreensaver/config/greynetic.xml
@@ -187,7 +178,6 @@ usr/share/xscreensaver/config/moire2.xml
 usr/share/xscreensaver/config/mountain.xml
 usr/share/xscreensaver/config/munch.xml
 usr/share/xscreensaver/config/nerverot.xml
-usr/share/xscreensaver/config/noseguy.xml
 usr/share/xscreensaver/config/pacman.xml
 usr/share/xscreensaver/config/pedal.xml
 usr/share/xscreensaver/config/penetrate.xml
@@ -215,14 +205,11 @@ usr/share/xscreensaver/config/triangle.xml
 usr/share/xscreensaver/config/truchet.xml
 usr/share/xscreensaver/config/twang.xml
 usr/share/xscreensaver/config/vermiculate.xml
-usr/share/xscreensaver/config/vidwhacker.xml
 usr/share/xscreensaver/config/wander.xml
-usr/share/xscreensaver/config/webcollage.xml
 usr/share/xscreensaver/config/whirlwindwarp.xml
 usr/share/xscreensaver/config/wormhole.xml
 usr/share/xscreensaver/config/xanalogtv.xml
 usr/share/xscreensaver/config/xflame.xml
-usr/share/xscreensaver/config/xjack.xml
 usr/share/xscreensaver/config/xmatrix.xml
 usr/share/xscreensaver/config/xrayswarm.xml
 usr/share/xscreensaver/config/xspirograph.xml
@@ -274,7 +261,6 @@ usr/share/livewp/external_themes/apple2.xml
 usr/share/livewp/external_themes/attraction.xml
 usr/share/livewp/external_themes/barcode.xml
 usr/share/livewp/external_themes/blaster.xml
-usr/share/livewp/external_themes/blitspin.xml
 usr/share/livewp/external_themes/boxfit.xml
 usr/share/livewp/external_themes/braid.xml
 usr/share/livewp/external_themes/bsod.xml
@@ -284,33 +270,27 @@ usr/share/livewp/external_themes/celtic.xml
 usr/share/livewp/external_themes/cloudlife.xml
 usr/share/livewp/external_themes/compass.xml
 usr/share/livewp/external_themes/coral.xml
-usr/share/livewp/external_themes/cosmos.xml
 usr/share/livewp/external_themes/crystal.xml
 usr/share/livewp/external_themes/cwaves.xml
 usr/share/livewp/external_themes/cynosure.xml
-usr/share/livewp/external_themes/decayscreen.xml
 usr/share/livewp/external_themes/deco.xml
 usr/share/livewp/external_themes/deluxe.xml
 usr/share/livewp/external_themes/demon.xml
+usr/share/livewp/external_themes/decayscreen.xml
 usr/share/livewp/external_themes/discrete.xml
 usr/share/livewp/external_themes/distort.xml
 usr/share/livewp/external_themes/drift.xml
-usr/share/livewp/external_themes/electricsheep.xml
 usr/share/livewp/external_themes/epicycle.xml
 usr/share/livewp/external_themes/eruption.xml
 usr/share/livewp/external_themes/euler2d.xml
-usr/share/livewp/external_themes/extrusion.xml
 usr/share/livewp/external_themes/fadeplot.xml
 usr/share/livewp/external_themes/fiberlamp.xml
-usr/share/livewp/external_themes/fireflies.xml
 usr/share/livewp/external_themes/fireworkx.xml
 usr/share/livewp/external_themes/flame.xml
 usr/share/livewp/external_themes/flow.xml
 usr/share/livewp/external_themes/fluidballs.xml
-usr/share/livewp/external_themes/fontglide.xml
 usr/share/livewp/external_themes/fuzzyflakes.xml
 usr/share/livewp/external_themes/galaxy.xml
-usr/share/livewp/external_themes/goban.xml
 usr/share/livewp/external_themes/goop.xml
 usr/share/livewp/external_themes/grav.xml
 usr/share/livewp/external_themes/greynetic.xml
@@ -337,7 +317,6 @@ usr/share/livewp/external_themes/moire.xml
 usr/share/livewp/external_themes/mountain.xml
 usr/share/livewp/external_themes/munch.xml
 usr/share/livewp/external_themes/nerverot.xml
-usr/share/livewp/external_themes/noseguy.xml
 usr/share/livewp/external_themes/pacman.xml
 usr/share/livewp/external_themes/pedal.xml
 usr/share/livewp/external_themes/penetrate.xml
@@ -360,7 +339,6 @@ usr/share/livewp/external_themes/sierpinski.xml
 usr/share/livewp/external_themes/slidescreen.xml
 usr/share/livewp/external_themes/slip.xml
 usr/share/livewp/external_themes/speedmine.xml
-usr/share/livewp/external_themes/sphereeversion.xml
 usr/share/livewp/external_themes/spotlight.xml
 usr/share/livewp/external_themes/squiral.xml
 usr/share/livewp/external_themes/starfish.xml
@@ -372,22 +350,14 @@ usr/share/livewp/external_themes/triangle.xml
 usr/share/livewp/external_themes/truchet.xml
 usr/share/livewp/external_themes/twang.xml
 usr/share/livewp/external_themes/vermiculate.xml
-usr/share/livewp/external_themes/vidwhacker.xml
 usr/share/livewp/external_themes/wander.xml
-usr/share/livewp/external_themes/webcollage.xml
 usr/share/livewp/external_themes/whirlwindwarp.xml
 usr/share/livewp/external_themes/wormhole.xml
 usr/share/livewp/external_themes/xanalogtv.xml
-usr/share/livewp/external_themes/xaos.xml
-usr/share/livewp/external_themes/xdaliclock.xml
 usr/share/livewp/external_themes/xflame.xml
-usr/share/livewp/external_themes/xjack.xml
 usr/share/livewp/external_themes/xlyap.xml
 usr/share/livewp/external_themes/xmatrix.xml
-usr/share/livewp/external_themes/xmountains.xml
-usr/share/livewp/external_themes/xplanet.xml
 usr/share/livewp/external_themes/xrayswarm.xml
-usr/share/livewp/external_themes/xsnow.xml
 usr/share/livewp/external_themes/xspirograph.xml
 usr/share/livewp/external_themes/zoom.xml
 usr/share/livewp/external_icons/xscreensaver.png

diff --git a/xscreensaver/hacks/distort.c b/xscreensaver/hacks/distort.c
index 4e4c809..28110e9 100644 (file)
--- a/xscreensaver/hacks/distort.c
+++ b/xscreensaver/hacks/distort.c
@@ -105,6 +105,7 @@ static void generic_draw(struct state *st, XImage *, XImage *, int, int, int *);
 
 static void distort_finish_loading (struct state *);
 
+
 static void *
 distort_init (Display *dpy, Window window)
 {
@@ -116,7 +117,6 @@ distort_init (Display *dpy, Window window)
 
     st->dpy = dpy;
     st->window = window;
-
        st->delay = get_integer_resource(st->dpy, "delay", "Integer");
     st->duration = get_integer_resource (st->dpy, "duration", "Seconds");
        st->radius = get_integer_resource(st->dpy, "radius", "Integer");
@@ -278,12 +278,13 @@ distort_init (Display *dpy, Window window)
        gcv.function = GXcopy;
        gcv.subwindow_mode = IncludeInferiors;
        gcflags = GCFunction;
+
        if (use_subwindow_mode_p(st->xgwa.screen, st->window)) /* see grabscreen.c */
                gcflags |= GCSubwindowMode;
-       st->gc = XCreateGC (st->dpy, st->window, gcflags, &gcv);
+       st->gc = XCreateGC (st->dpy, st->window, gcflags, &gcv);
 
     st->img_loader = load_image_async_simple (0, st->xgwa.screen, st->window,
-                                              st->window, 0, 0);
+                                              st->window, 0, 0); 
     st->start_time = time ((time_t) 0);
     return st;
 }

diff --git a/xscreensaver/utils/grabclient.c b/xscreensaver/utils/grabclient.c
index 54396c7..e70474d 100644 (file)
--- a/xscreensaver/utils/grabclient.c
+++ b/xscreensaver/utils/grabclient.c
@@ -450,9 +450,11 @@ load_random_image_1 (Screen *screen, Window window, Drawable drawable,
 {
   Display *dpy = DisplayOfScreen (screen);
   char *grabber = get_string_resource(dpy, "desktopGrabber", "DesktopGrabber");
+  int  view = 1;
   char *cmd;
-  char id[200];
+  char id[400];
 
+  view = get_integer_resource(dpy, "view", "view");
   if (!grabber || !*grabber)
     {
       fprintf (stderr,
@@ -461,7 +463,7 @@ load_random_image_1 (Screen *screen, Window window, Drawable drawable,
       exit (1);
     }
 
-  sprintf (id, "0x%lx 0x%lx",
+  sprintf (id, "-file /home/user/.backgrounds/background-%i.png 0x%lx 0x%lx", view,
            (unsigned long) window,
            (unsigned long) drawable);
   cmd = (char *) malloc (strlen(grabber) + strlen(id) + 1);