X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Flament.c;h=777a5c648722f1c75c59b469efa5fca6df3d330f;hb=39809ded547bdbb08207d3e514950425215b4410;hp=2a4b6395bb74f982c9dcfa77d01a5c17073552e9;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213;p=xscreensaver diff --git a/hacks/glx/lament.c b/hacks/glx/lament.c index 2a4b6395..777a5c64 100644 --- a/hacks/glx/lament.c +++ b/hacks/glx/lament.c @@ -32,7 +32,7 @@ "*wireframe: False \n" \ "*suppressRotationAnimation: True\n" \ -# define refresh_lament 0 +# define free_lament 0 # define release_lament 0 #include "xlockmore.h" @@ -325,6 +325,9 @@ scale_for_window (ModeInfo *mi) if (MI_WIDTH(mi) > MI_HEIGHT(mi)) scale /= MI_WIDTH(mi) / (GLfloat) MI_HEIGHT(mi); + /* If the window is super wide, make it bigger. */ + if (scale < 8) scale = 8; + /* Constrain it to roughly life-sized on the screen, not huge. */ # ifdef HAVE_MOBILE @@ -1705,16 +1708,7 @@ init_lament (ModeInfo *mi) { lament_configuration *lc; int i; - if (!lcs) - { - lcs = (lament_configuration *) - calloc(MI_NUM_SCREENS(mi), sizeof (lament_configuration)); - if (!lcs) - { - fprintf(stderr, "%s: out of memory\n", progname); - exit(1); - } - } + MI_INIT (mi, lcs); lc = &lcs[MI_SCREEN(mi)];