X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fpipes.c;h=6a001d1831ba8088aaef127e411cf483294bb59e;hb=3d9140a05b5272fed0883a0af0a71e30ef44d47f;hp=be4ae600b27a0b7e55d360783195feee0ceb1e8d;hpb=df053bcb240bd8d82e3bebf48a9766a8728bca4b;p=xscreensaver

diff --git a/hacks/glx/pipes.c b/hacks/glx/pipes.c
index be4ae600..6a001d18 100644
--- 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.
  *
- * 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)
  *
@@ -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 HACK_RESHAPE				reshape_pipes
 # 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"			\
-					"*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 */
@@ -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)];
 
@@ -639,8 +636,11 @@ init_pipes(ModeInfo * mi)
 	pp->window = MI_WINDOW(mi);
 	if ((pp->glx_context = init_GL(mi)) != NULL) {
 
-		reshape(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
-		pp->initial_rotation = -10.0;
+		reshape_pipes(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+		if (rotatepipes)
+		  pp->initial_rotation = NRAND(180); /* jwz */
+		else
+		  pp->initial_rotation = -10.0;
 		pinit(mi, 1);
 
 		if (factory > 0) {