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

[xscreensaver] / hacks / glx / glmatrix.c

diff --git a/hacks/glx/glmatrix.c b/hacks/glx/glmatrix.c
index 85f33050914a2487c1186537ed352059ebb339a9..4d45e2e2b45b26e389820e9289663d33b4973000 100644 (file)
--- a/hacks/glx/glmatrix.c
+++ b/hacks/glx/glmatrix.c
@@ -41,15 +41,6 @@ extern XtAppContext app;
 #define DEFAULTS       "*delay:        30000         \n" \
                        "*showFPS:      False         \n" \
                        "*wireframe:    False         \n" \
-                       "*mode:       " DEF_MODE    " \n" \
-                       "*speed:      " DEF_SPEED   " \n" \
-                       "*clock:      " DEF_CLOCK   " \n" \
-                       "*timefmt:    " DEF_TIMEFMT " \n" \
-                       "*density:    " DEF_DENSITY " \n" \
-                       "*fog:        " DEF_FOG     " \n" \
-                       "*waves:      " DEF_WAVES   " \n" \
-                       "*texture:    " DEF_TEXTURE " \n" \
-                       "*rotate:     " DEF_ROTATE  " \n" \
 
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -626,13 +617,13 @@ matrix_handle_event (ModeInfo *mi, XEvent *event)
   matrix_configuration *mp = &mps[MI_SCREEN(mi)];
 
   if (event->xany.type == ButtonPress &&
-      event->xbutton.button & Button1)
+      event->xbutton.button == Button1)
     {
       mp->button_down_p = True;
       return True;
     }
   else if (event->xany.type == ButtonRelease &&
-           event->xbutton.button & Button1)
+           event->xbutton.button == Button1)
     {
       mp->button_down_p = False;
       return True;
@@ -831,7 +822,6 @@ load_textures (ModeInfo *mi, Bool flip_p)
   glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
   check_gl_error ("texture param");
 
-  xi->data = 0;  /* don't free the texture data */
   XDestroyImage (xi);
 }