X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fmoebius.c;h=ecf052c247d427ced44ae454268466a4e58a0969;hb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;hp=f99d9651aebf20320aa17b02f9cd328e8ca78fd9;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver diff --git a/hacks/glx/moebius.c b/hacks/glx/moebius.c index f99d9651..ecf052c2 100644 --- a/hacks/glx/moebius.c +++ b/hacks/glx/moebius.c @@ -82,6 +82,7 @@ static const char sccsid[] = "@(#)moebius.c 5.01 2001/03/01 xlockmore"; # define refresh_moebius 0 # define DEFAULTS "*delay: 20000 \n" \ "*showFPS: False \n" + # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ @@ -543,8 +544,6 @@ pinit(void) { int status; glClearDepth(1.0); - glClearColor(0.0, 0.0, 0.0, 1.0); - glLightfv(GL_LIGHT0, GL_AMBIENT, ambient); glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse); glLightfv(GL_LIGHT0, GL_POSITION, position0); @@ -626,7 +625,9 @@ moebius_handle_event (ModeInfo *mi, XEvent *event) } 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 (mp->trackball, event->xbutton.button, 10, !!event->xbutton.state);