X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fjigsaw.c;h=5e2ddc58e007884adcf68bcc640659c9b6e32f4c;hb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;hp=dce647bcc4e21307b67c7133b13dfd6efe42cd5e;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/jigsaw.c b/hacks/jigsaw.c
index dce647bc..5e2ddc58 100644
--- a/hacks/jigsaw.c
+++ b/hacks/jigsaw.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1997-2006 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1997-2008 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
@@ -225,7 +225,7 @@ make_puzzle_pixmap_pair (Display *dpy, Drawable d, int size, int bw,
                          int *x_ret, int *y_ret,
                          Pixmap *mask_ret, Pixmap *outline_ret)
 {
-  int w = size * 3;
+  int w = (size ? size * 3 : 2);
   int h = w;
   int x = size;
   int y = size;
@@ -404,8 +404,8 @@ jigsaw_init_1 (struct state *st)
   make_puzzle_pixmaps (st);
 
   cmap = xgwa.colormap;
-  st->width  = xgwa.width  / st->piece_width;
-  st->height = xgwa.height / st->piece_height;
+  st->width  = (st->piece_width ? xgwa.width  / st->piece_width : 0);
+  st->height = (st->piece_height ? xgwa.height / st->piece_height : 0);
   st->x_border = (xgwa.width  - (st->width  * st->piece_width)) / 2;
   st->y_border = (xgwa.height - (st->height * st->piece_width)) / 2;
 
@@ -872,6 +872,7 @@ jigsaw_free (Display *dpy, Window window, void *closure)
 static const char *jigsaw_defaults [] = {
   ".background:		Black",
   ".foreground:		#AAAAAA",
+  "*fpsSolid:		true",
   "*delay:		70000",
   "*delay2:		5",
   "*pieceBorderWidth:   -1",