From ae69a754244c4e475c8d2591772ca8e005071d83 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 18 Feb 2019 11:55:41 +0100
Subject: Update to 5.42

---
 hacks/glx/dangerball.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'hacks/glx/dangerball.c')

diff --git a/hacks/glx/dangerball.c b/hacks/glx/dangerball.c
index e40ccc5..7cb38e0 100644
--- a/hacks/glx/dangerball.c
+++ b/hacks/glx/dangerball.c
@@ -15,7 +15,6 @@
 			"*wireframe:    False       \n" \
 			"*suppressRotationAnimation: True\n" \
 
-# define free_ball 0
 # define release_ball 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -294,7 +293,7 @@ draw_ball (ModeInfo *mi)
   if (!bp->glx_context)
     return;
 
-  glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+  glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
 
   glShadeModel(GL_SMOOTH);
 
@@ -359,6 +358,21 @@ draw_ball (ModeInfo *mi)
   glXSwapBuffers(dpy, window);
 }
 
+
+ENTRYPOINT void
+free_ball (ModeInfo *mi)
+{
+  ball_configuration *bp = &bps[MI_SCREEN(mi)];
+  if (!bp->glx_context) return;
+  glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+  if (bp->colors) free (bp->colors);
+  if (bp->spikes) free (bp->spikes);
+  if (bp->rot) free_rotator (bp->rot);
+  if (bp->trackball) gltrackball_free (bp->trackball);
+  if (glIsList(bp->ball_list)) glDeleteLists(bp->ball_list, 1);
+  if (glIsList(bp->spike_list)) glDeleteLists(bp->spike_list, 1);
+}
+
 XSCREENSAVER_MODULE_2 ("DangerBall", dangerball, ball)
 
 #endif /* USE_GL */
-- 
cgit v1.2.3-55-g7522