projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://packetstormsecurity.org/UNIX/admin/xscreensaver-4.02.tar.gz
[xscreensaver]
/
hacks
/
slidescreen.c
diff --git
a/hacks/slidescreen.c
b/hacks/slidescreen.c
index 366cdfb9ab5072257a3d763c3b361c68ae75e601..e31bcf0dda9e60ba20d340c02f1c576e9ba83d5b 100644
(file)
--- a/
hacks/slidescreen.c
+++ b/
hacks/slidescreen.c
@@
-1,5
+1,5
@@
-/* xscreensaver, Copyright (c) 1992, 1993, 1994, 1996, 1997
- * Jamie Zawinski <jwz@
netscape.com
>
+/* xscreensaver, Copyright (c) 1992, 1993, 1994, 1996, 1997
, 1998, 2001
+ * 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
@@
-37,8
+37,6
@@
init_slide (Display *dpy, Window window)
XGetWindowAttributes (dpy, window, &xgwa);
grab_screen_image (xgwa.screen, window);
XGetWindowAttributes (dpy, window, &xgwa);
grab_screen_image (xgwa.screen, window);
-
- XGetWindowAttributes (dpy, window, &xgwa); /* re-retrieve colormap */
cmap = xgwa.colormap;
visual = xgwa.visual;
max_width = xgwa.width;
cmap = xgwa.colormap;
visual = xgwa.visual;
max_width = xgwa.width;
@@
-50,6
+48,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");
@@
-142,7
+146,7
@@
init_slide (Display *dpy, Window window)
if (delay < 0) delay = 0;
if (delay2 < 0) delay2 = 0;
if (pix_inc < 1) pix_inc = 1;
if (delay < 0) delay = 0;
if (delay2 < 0) delay2 = 0;
if (pix_inc < 1) pix_inc = 1;
- if (grid_size < 1
) grid_size = 1
;
+ if (grid_size < 1
0) grid_size = 10
;
gcv.foreground = fg;
gcv.function = GXcopy;
gcv.foreground = fg;
gcv.function = GXcopy;
@@
-197,7
+201,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
+232,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
+313,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
+361,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);
}
}