projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://ftp.ksu.edu.tw/FTP/FreeBSD/distfiles/xscreensaver-4.20.tar.gz
[xscreensaver]
/
hacks
/
slidescreen.c
diff --git
a/hacks/slidescreen.c
b/hacks/slidescreen.c
index 366cdfb9ab5072257a3d763c3b361c68ae75e601..ff5a29603097fec4669fe722d9888c7d9afb5a8d 100644
(file)
--- a/
hacks/slidescreen.c
+++ b/
hacks/slidescreen.c
@@
-1,5
+1,4
@@
-/* xscreensaver, Copyright (c) 1992, 1993, 1994, 1996, 1997
- * Jamie Zawinski <jwz@netscape.com>
+/* xscreensaver, Copyright (c) 1992-2005 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
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-36,9
+35,7
@@
init_slide (Display *dpy, Window window)
Visual *visual;
XGetWindowAttributes (dpy, window, &xgwa);
Visual *visual;
XGetWindowAttributes (dpy, window, &xgwa);
- grab_screen_image (xgwa.screen, window);
-
- XGetWindowAttributes (dpy, window, &xgwa); /* re-retrieve colormap */
+ load_random_image (xgwa.screen, window, window, NULL, NULL);
cmap = xgwa.colormap;
visual = xgwa.visual;
max_width = xgwa.width;
cmap = xgwa.colormap;
visual = xgwa.visual;
max_width = xgwa.width;
@@
-50,6
+47,12
@@
init_slide (Display *dpy, Window window)
pix_inc = get_integer_resource ("pixelIncrement", "Integer");
border = get_integer_resource ("internalBorderWidth", "InternalBorderWidth");
pix_inc = get_integer_resource ("pixelIncrement", "Integer");
border = get_integer_resource ("internalBorderWidth", "InternalBorderWidth");
+ /* Don't let the grid be smaller than 3x3 */
+ if (grid_size > xgwa.width / 3)
+ grid_size = xgwa.width / 3;
+ if (grid_size > xgwa.height / 3)
+ grid_size = xgwa.height / 3;
+
{
XColor fgc, bgc;
char *fgs = get_string_resource("background", "Background");
{
XColor fgc, bgc;
char *fgs = get_string_resource("background", "Background");
@@
-94,7
+97,7
@@
init_slide (Display *dpy, Window window)
for(i = 0; i < max; i++)
{
long rd, gd, bd;
for(i = 0; i < max; i++)
{
long rd, gd, bd;
- unsigned long d;
+ unsigned long d
d
;
if (!fg_ok)
{
rd = (all[i].red >> 8) - (fgc.red >> 8);
if (!fg_ok)
{
rd = (all[i].red >> 8) - (fgc.red >> 8);
@@
-103,12
+106,12
@@
init_slide (Display *dpy, Window window)
if (rd < 0) rd = -rd;
if (gd < 0) gd = -gd;
if (bd < 0) bd = -bd;
if (rd < 0) rd = -rd;
if (gd < 0) gd = -gd;
if (bd < 0) bd = -bd;
- d = (rd << 1) + (gd << 2) + bd;
- if (d < fgd)
+ d
d
= (rd << 1) + (gd << 2) + bd;
+ if (d
d
< fgd)
{
{
- fgd = d;
+ fgd = d
d
;
fg = all[i].pixel;
fg = all[i].pixel;
- if (d == 0)
+ if (d
d
== 0)
fg_ok = True;
}
}
fg_ok = True;
}
}
@@
-121,12
+124,12
@@
init_slide (Display *dpy, Window window)
if (rd < 0) rd = -rd;
if (gd < 0) gd = -gd;
if (bd < 0) bd = -bd;
if (rd < 0) rd = -rd;
if (gd < 0) gd = -gd;
if (bd < 0) bd = -bd;
- d = (rd << 1) + (gd << 2) + bd;
- if (d < bgd)
+ d
d
= (rd << 1) + (gd << 2) + bd;
+ if (d
d
< bgd)
{
{
- bgd = d;
+ bgd = d
d
;
bg = all[i].pixel;
bg = all[i].pixel;
- if (d == 0)
+ if (d
d
== 0)
bg_ok = True;
}
}
bg_ok = True;
}
}
@@
-197,7
+200,7
@@
init_slide (Display *dpy, Window window)
XFillRectangle (dpy, d, gc, 0, bitmap_h - yoff, bitmap_w, yoff);
}
XFillRectangle (dpy, d, gc, 0, bitmap_h - yoff, bitmap_w, yoff);
}
- XSync (dpy,
Tru
e);
+ XSync (dpy,
Fals
e);
if (delay2) usleep (delay2 * 2);
for (i = 0; i < grid_size; i += pix_inc)
{
if (delay2) usleep (delay2 * 2);
for (i = 0; i < grid_size; i += pix_inc)
{
@@
-228,7
+231,7
@@
init_slide (Display *dpy, Window window)
points[2].y = points[1].y;
XFillPolygon (dpy, window, gc, points, 3, Convex, CoordModeOrigin);
points[2].y = points[1].y;
XFillPolygon (dpy, window, gc, points, 3, Convex, CoordModeOrigin);
- XSync (dpy,
Tru
e);
+ XSync (dpy,
Fals
e);
if (delay) usleep (delay);
}
if (delay) usleep (delay);
}
@@
-309,7
+312,7
@@
slide1 (Display *dpy, Window window)
break;
}
break;
}
- XSync (dpy,
Tru
e);
+ XSync (dpy,
Fals
e);
if (delay) usleep (delay);
}
switch (dir)
if (delay) usleep (delay);
}
switch (dir)
@@
-357,6
+360,7
@@
screenhack (Display *dpy, Window window)
while (1)
{
slide1 (dpy, window);
while (1)
{
slide1 (dpy, window);
+ screenhack_handle_events (dpy);
if (delay2) usleep (delay2);
}
}
if (delay2) usleep (delay2);
}
}