X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fatlantis.c;h=00853dc6a09b81b86192bb1b9a39493795b58630;hp=590d3f2172b4933b8999cf4ba0d119c8598fb0c1;hb=3d9140a05b5272fed0883a0af0a71e30ef44d47f;hpb=ebc241816cc8e3eec7270a594bb1a607df32bcd6 diff --git a/hacks/glx/atlantis.c b/hacks/glx/atlantis.c index 590d3f21..00853dc6 100644 --- a/hacks/glx/atlantis.c +++ b/hacks/glx/atlantis.c @@ -102,9 +102,11 @@ static const char sccsid[] = "@(#)atlantis.c 1.3 98/06/18 xlockmore"; # define PROGCLASS "Atlantis" # define HACK_INIT init_atlantis # define HACK_DRAW draw_atlantis +# define HACK_RESHAPE reshape_atlantis # define atlantis_opts xlockmore_opts # define DEFAULTS "*delay: 40000 \n" \ "*count: 4 \n" \ + "*showFPS: False \n" \ "*cycles: 100 \n" \ "*size: 6000 \n" \ "*whalespeed: 250 \n" @@ -238,8 +240,8 @@ Init(atlantisstruct * ap) glClearColor(0.0, fgreen, fblue, 0.0); } -static void -Reshape(ModeInfo * mi, int width, int height) +void +reshape_atlantis(ModeInfo * mi, int width, int height) { atlantisstruct *ap = &atlantis[MI_SCREEN(mi)]; @@ -357,7 +359,7 @@ init_atlantis(ModeInfo * mi) } if ((ap->glx_context = init_GL(mi)) != NULL) { - Reshape(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); + reshape_atlantis(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); glDrawBuffer(GL_BACK); Init(ap); AllDisplay(ap); @@ -397,6 +399,7 @@ draw_atlantis(ModeInfo * mi) glPopMatrix(); + if (mi->fps_p) do_fps (mi); glXSwapBuffers(display, window); }