X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fglknots.c;h=730cadb19ec9274708b49f8402879ca38b8504df;hb=39809ded547bdbb08207d3e514950425215b4410;hp=8dd63728e8ee8650fb568ddef501e76b4a302314;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213;p=xscreensaver diff --git a/hacks/glx/glknots.c b/hacks/glx/glknots.c index 8dd63728..730cadb1 100644 --- a/hacks/glx/glknots.c +++ b/hacks/glx/glknots.c @@ -18,7 +18,7 @@ "*wireframe: False \n" \ "*suppressRotationAnimation: True\n" \ -# define refresh_knot 0 +# define free_knot 0 # define release_knot 0 #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -178,8 +178,15 @@ ENTRYPOINT void reshape_knot (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(); @@ -257,14 +264,7 @@ init_knot (ModeInfo *mi) knot_configuration *bp; int wire = MI_IS_WIREFRAME(mi); - if (!bps) { - bps = (knot_configuration *) - calloc (MI_NUM_SCREENS(mi), sizeof (knot_configuration)); - if (!bps) { - fprintf(stderr, "%s: out of memory\n", progname); - exit(1); - } - } + MI_INIT (mi, bps); bp = &bps[MI_SCREEN(mi)];