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-3.29.tar.gz
[xscreensaver]
/
hacks
/
glx
/
pipes.c
diff --git
a/hacks/glx/pipes.c
b/hacks/glx/pipes.c
index c165a748b63e5232830519c2b8120a5d66272486..6a001d1831ba8088aaef127e411cf483294bb59e 100644
(file)
--- a/
hacks/glx/pipes.c
+++ b/
hacks/glx/pipes.c
@@
-33,10
+33,7
@@
static const char sccsid[] = "@(#)pipes.c 4.07 97/11/24 xlockmore";
* Since I'm not a native English speaker, my apologies for any grammatical
* mistake.
*
* Since I'm not a native English speaker, my apologies for any grammatical
* mistake.
*
- * My e-mail addresses are
- *
- * vianna@cat.cbpf.br
- * and
+ * My e-mail address is
* m-vianna@usa.net
* Marcelo F. Vianna (Apr-09-1997)
*
* m-vianna@usa.net
* Marcelo F. Vianna (Apr-09-1997)
*
@@
-57,6
+54,7
@@
static const char sccsid[] = "@(#)pipes.c 4.07 97/11/24 xlockmore";
# define PROGCLASS "Pipes"
# define HACK_INIT init_pipes
# define HACK_DRAW draw_pipes
# define PROGCLASS "Pipes"
# define HACK_INIT init_pipes
# define HACK_DRAW draw_pipes
+# define HACK_RESHAPE reshape_pipes
# define pipes_opts xlockmore_opts
# define DEFAULTS "*delay: 100 \n" \
"*count: 2 \n" \
# define pipes_opts xlockmore_opts
# define DEFAULTS "*delay: 100 \n" \
"*count: 2 \n" \
@@
-64,8
+62,7
@@
static const char sccsid[] = "@(#)pipes.c 4.07 97/11/24 xlockmore";
"*size: 500 \n" \
"*fisheye: True \n" \
"*tightturns: False \n" \
"*size: 500 \n" \
"*fisheye: True \n" \
"*tightturns: False \n" \
- "*rotatepipes: True \n" \
- "*noBuffer: True \n"
+ "*rotatepipes: True \n"
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
# include "xlock.h" /* from the xlockmore distribution */
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
# include "xlock.h" /* from the xlockmore distribution */
@@
-494,8
+491,8
@@
MakeShape(ModeInfo * mi, int newdir)
}
}
}
}
-
static
void
-reshape(ModeInfo * mi, int width, int height)
+void
+reshape
_pipes
(ModeInfo * mi, int width, int height)
{
pipesstruct *pp = &pipes[MI_SCREEN(mi)];
{
pipesstruct *pp = &pipes[MI_SCREEN(mi)];
@@
-639,7
+636,7
@@
init_pipes(ModeInfo * mi)
pp->window = MI_WINDOW(mi);
if ((pp->glx_context = init_GL(mi)) != NULL) {
pp->window = MI_WINDOW(mi);
if ((pp->glx_context = init_GL(mi)) != NULL) {
- reshape(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+ reshape
_pipes
(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
if (rotatepipes)
pp->initial_rotation = NRAND(180); /* jwz */
else
if (rotatepipes)
pp->initial_rotation = NRAND(180); /* jwz */
else