ftp://ftp.krokus.ru/pub/OpenBSD/distfiles/xscreensaver-4.21.tar.gz

[xscreensaver] / hacks / glx / lavalite.c

diff --git a/hacks/glx/lavalite.c b/hacks/glx/lavalite.c
index 583e40964e35cbde0fac024bdf6291ba4c51c2c5..d5d913276cf0bb84fd5e93480aedc2404211386a 100644 (file)
--- a/hacks/glx/lavalite.c
+++ b/hacks/glx/lavalite.c
@@ -1,6 +1,6 @@
 /* lavalite --- 3D Simulation a Lava Lite, written by jwz.
  *
- * This software Copyright (c) 2002 Jamie Zawinski <jwz@jwz.org>
+ * This software Copyright (c) 2002-2004 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
@@ -93,27 +93,11 @@ extern XtAppContext app;
 #define DEF_BTEX       "(none)"
 #define DEF_TTEX       "(none)"
 
-#define DEFAULTS       "*delay:        10000       \n" \
+#define DEFAULTS       "*delay:        30000       \n" \
                        "*showFPS:      False       \n" \
                        "*wireframe:    False       \n" \
-                       "*geometry:     640x640     \n" \
+                       "*geometry:     600x900\n"      \
                        "*count:      " DEF_COUNT " \n" \
-                       "*style:      " DEF_STYLE " \n" \
-                       "*speed:      " DEF_SPEED " \n" \
-                       "*spin:       " DEF_SPIN   "\n" \
-                       "*wander:     " DEF_WANDER "\n" \
-                       "*resolution: " DEF_RESOLUTION "\n" \
-                       "*smooth: "     DEF_SMOOTH "\n" \
-                       "*impatient:  " DEF_IMPATIENT " \n" \
-                       "*geometry:     600x900\n" \
-                       "*lavaColor:  " DEF_LCOLOR "\n" \
-                       "*fluidColor: " DEF_FCOLOR "\n" \
-                       "*baseColor:  " DEF_BCOLOR "\n" \
-                       "*tableColor: " DEF_TCOLOR "\n" \
-                       "*fluidTexture: "       DEF_FTEX "\n" \
-                       "*baseTexture:  "       DEF_BTEX "\n" \
-                       "*tableTexture: "       DEF_TTEX "\n" \
-
 
 #define BLOBS_PER_GROUP 4
 
@@ -1268,7 +1252,7 @@ lavalite_handle_event (ModeInfo *mi, XEvent *event)
   lavalite_configuration *bp = &bps[MI_SCREEN(mi)];
 
   if (event->xany.type == ButtonPress &&
-      event->xbutton.button & Button1)
+      event->xbutton.button == Button1)
     {
       bp->button_down_p = True;
       gltrackball_start (bp->trackball,
@@ -1277,11 +1261,19 @@ lavalite_handle_event (ModeInfo *mi, XEvent *event)
       return True;
     }
   else if (event->xany.type == ButtonRelease &&
-           event->xbutton.button & Button1)
+           event->xbutton.button == Button1)
     {
       bp->button_down_p = False;
       return True;
     }
+  else if (event->xany.type == ButtonPress &&
+           (event->xbutton.button == Button4 ||
+            event->xbutton.button == Button5))
+    {
+      gltrackball_mousewheel (bp->trackball, event->xbutton.button, 5,
+                              !!event->xbutton.state);
+      return True;
+    }
   else if (event->xany.type == MotionNotify &&
            bp->button_down_p)
     {
@@ -1299,7 +1291,7 @@ static void
 parse_color (ModeInfo *mi, const char *name, const char *s, GLfloat *a)
 {
   XColor c;
-  a[4] = 1.0;  /* alpha */
+  a[3] = 1.0;  /* alpha */
 
   if (! XParseColor (MI_DISPLAY(mi), MI_COLORMAP(mi), s, &c))
     {