X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=hacks%2Fglx%2Fraverhoop.c;h=5cf35f7fccf6f0f91eebb4b254ecf3cbf863cfe7;hb=39809ded547bdbb08207d3e514950425215b4410;hp=99310676120630f47f48afe7177c083bdd22be01;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213;p=xscreensaver diff --git a/hacks/glx/raverhoop.c b/hacks/glx/raverhoop.c index 99310676..5cf35f7f 100644 --- a/hacks/glx/raverhoop.c +++ b/hacks/glx/raverhoop.c @@ -16,7 +16,7 @@ "*showFPS: False \n" \ "*wireframe: False \n" \ -# define refresh_hoop 0 +# define free_hoop 0 # define release_hoop 0 #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -591,8 +591,15 @@ ENTRYPOINT void reshape_hoop (ModeInfo *mi, int width, int height) { GLfloat h = (GLfloat) height / (GLfloat) width; + int y = 0; - glViewport (0, 0, (GLint) width, (GLint) height); + if (width > height * 5) { /* tiny window: show middle */ + height = width * 9/16; + y = -height/2; + h = height / (GLfloat) width; + } + + glViewport (0, y, (GLint) width, (GLint) height); glMatrixMode(GL_PROJECTION); glLoadIdentity(); @@ -649,14 +656,7 @@ init_hoop (ModeInfo *mi) hoop_configuration *bp; int wire = MI_IS_WIREFRAME(mi); - if (!bps) { - bps = (hoop_configuration *) - calloc (MI_NUM_SCREENS(mi), sizeof (hoop_configuration)); - if (!bps) { - fprintf(stderr, "%s: out of memory\n", progname); - exit(1); - } - } + MI_INIT (mi, bps); bp = &bps[MI_SCREEN(mi)];