X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=hacks%2Fmountain.c;h=dcabbe54db3d9a412af2c9f20ddf2d1deed8e51e;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=6b2378891cac7b2951f60623bba66019b45c86f3;hpb=a94197e76a5dea5cb60542840809d6c20d0abbf3;p=xscreensaver

diff --git a/hacks/mountain.c b/hacks/mountain.c
index 6b237889..dcabbe54 100644
--- a/hacks/mountain.c
+++ b/hacks/mountain.c
@@ -1,9 +1,8 @@
 /* -*- Mode: C; tab-width: 4 -*- */
 /* mountain -- square grid mountains */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)mountain.c	5.00 2000/11/01 xlockmore";
-
 #endif
 
 /*-
@@ -28,29 +27,28 @@ static const char sccsid[] = "@(#)mountain.c	5.00 2000/11/01 xlockmore";
  */
 
 #ifdef STANDALONE
-#define MODE_mountain
-#define PROGCLASS "Mountain"
-#define HACK_INIT init_mountain
-#define HACK_DRAW draw_mountain
-#define mountain_opts xlockmore_opts
-#define DEFAULTS "*delay: 1000 \n" \
- "*count: 30 \n" \
- "*cycles: 4000 \n" \
- "*ncolors: 64 \n"
-#define SMOOTH_COLORS
-#include "xlockmore.h"		/* in xscreensaver distribution */
+# define MODE_mountain
+#define DEFAULTS	"*delay: 20000 \n" \
+					"*count: 30 \n" \
+					"*cycles: 4000 \n" \
+					"*ncolors: 64 \n" \
+					"*fpsSolid: true \n" \
+
+# define SMOOTH_COLORS
+# define release_mountain 0
+# include "xlockmore.h"		/* in xscreensaver distribution */
 #else /* STANDALONE */
-#include "xlock.h"		/* in xlockmore distribution */
+# include "xlock.h"		/* in xlockmore distribution */
 #endif /* STANDALONE */
 
 #ifdef MODE_mountain
 
-ModeSpecOpt mountain_opts =
+ENTRYPOINT ModeSpecOpt mountain_opts =
 {0, (XrmOptionDescRec *) NULL, 0, (argtype *) NULL, (OptionStruct *) NULL};
 
 #ifdef USE_MODULES
 ModStruct   mountain_description =
-{"mountain", "init_mountain", "draw_mountain", "release_mountain",
+{"mountain", "init_mountain", "draw_mountain", (char *) NULL,
  "refresh_mountain", "init_mountain", (char *) NULL, &mountain_opts,
  1000, 30, 4000, 1, 64, 1.0, "",
  "Shows Papo's mountain range", 0, NULL};
@@ -164,18 +162,16 @@ drawamountain(ModeInfo * mi)
 		mp->stage++;
 }
 
-void
-init_mountain(ModeInfo * mi)
+static void free_mountain (ModeInfo * mi);
+
+ENTRYPOINT void
+init_mountain (ModeInfo * mi)
 {
 	int         i, j, x, y;
 	XGCValues   gcv;
 	mountainstruct *mp;
 
-	if (mountains == NULL) {
-		if ((mountains = (mountainstruct *) calloc(MI_NUM_SCREENS(mi),
-					   sizeof (mountainstruct))) == NULL)
-			return;
-	}
+	MI_INIT (mi, mountains, free_mountain);
 	mp = &mountains[MI_SCREEN(mi)];
 
 	mp->width = MI_WIDTH(mi);
@@ -229,8 +225,8 @@ init_mountain(ModeInfo * mi)
 		mp->offset = 0;
 }
 
-void
-draw_mountain(ModeInfo * mi)
+ENTRYPOINT void
+draw_mountain (ModeInfo * mi)
 {
 	mountainstruct *mp;
 
@@ -256,24 +252,24 @@ draw_mountain(ModeInfo * mi)
 	}
 }
 
-void
-release_mountain(ModeInfo * mi)
+ENTRYPOINT void
+reshape_mountain(ModeInfo * mi, int width, int height)
 {
-	if (mountains != NULL) {
-		int         screen;
+  XClearWindow (MI_DISPLAY (mi), MI_WINDOW(mi));
+  init_mountain (mi);
+}
 
-		for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
-			mountainstruct *mp = &mountains[screen];
 
-			if (mp->stippledGC)
-				XFreeGC(MI_DISPLAY(mi), mp->stippledGC);
-		}
-		(void) free((void *) mountains);
-		mountains = (mountainstruct *) NULL;
-	}
+static void
+free_mountain (ModeInfo * mi)
+{
+	mountainstruct *mp = &mountains[MI_SCREEN(mi)];
+
+	if (mp->stippledGC)
+		XFreeGC(MI_DISPLAY(mi), mp->stippledGC);
 }
 
-void
+ENTRYPOINT void
 refresh_mountain(ModeInfo * mi)
 {
 	mountainstruct *mp;
@@ -287,4 +283,17 @@ refresh_mountain(ModeInfo * mi)
 	mp->y = 0;
 }
 
+ENTRYPOINT Bool
+mountain_handle_event (ModeInfo *mi, XEvent *event)
+{
+  if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
+    {
+      init_mountain (mi);
+      return True;
+    }
+  return False;
+}
+
+XSCREENSAVER_MODULE ("Mountain", mountain)
+
 #endif /* MODE_mountain */