-/* xscreensaver, Copyright (c) 2002-2006 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2002-2008 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
#define DEFAULTS "*delay: 30000 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
- "*labelfont: -*-times-bold-r-normal-*-180-*\n"
+ "*labelfont: -*-helvetica-medium-r-normal-*-180-*\n"
# define refresh_spheremonics 0
# define release_spheremonics 0
static void
draw_bounding_box (ModeInfo *mi)
{
- spheremonics_configuration *cc = &ccs[MI_SCREEN(mi)];
+ /* spheremonics_configuration *cc = &ccs[MI_SCREEN(mi)]; */
static const GLfloat c1[4] = { 0.2, 0.2, 0.6, 1.0 };
static const GLfloat c2[4] = { 1.0, 0.0, 0.0, 1.0 };
int wire = MI_IS_WIREFRAME(mi);
- GLfloat x1 = cc->bbox[0].x;
- GLfloat y1 = cc->bbox[0].y;
- GLfloat z1 = cc->bbox[0].z;
- GLfloat x2 = cc->bbox[1].x;
- GLfloat y2 = cc->bbox[1].y;
- GLfloat z2 = cc->bbox[1].z;
+ GLfloat x1,y1,z1,x2,y2,z2;
-#if 1
+# if 0
+ x1 = cc->bbox[0].x;
+ y1 = cc->bbox[0].y;
+ z1 = cc->bbox[0].z;
+ x2 = cc->bbox[1].x;
+ y2 = cc->bbox[1].y;
+ z2 = cc->bbox[1].z;
+# else
x1 = y1 = z1 = -0.5;
x2 = y2 = z2 = 0.5;
-#endif
+# endif
if (do_bbox && !wire)
{
fprintf(stderr, "%s: out of memory\n", progname);
exit(1);
}
-
- cc = &ccs[MI_SCREEN(mi)];
}
cc = &ccs[MI_SCREEN(mi)];
}
else if (event->xany.type == ButtonPress &&
(event->xbutton.button == Button4 ||
- event->xbutton.button == Button5))
+ event->xbutton.button == Button5 ||
+ event->xbutton.button == Button6 ||
+ event->xbutton.button == Button7))
{
gltrackball_mousewheel (cc->trackball, event->xbutton.button, 10,
!!event->xbutton.state);
print_gl_string (mi->dpy, cc->font, cc->font_list,
mi->xgwa.width, mi->xgwa.height,
10, mi->xgwa.height - 10,
- buf);
+ buf, False);
}
if (!static_parms)