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/hypertorus.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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

diff --git a/hacks/glx/hypertorus.c b/hacks/glx/hypertorus.c
index 3ae6aad..df64923 100644
--- a/hacks/glx/hypertorus.c
+++ b/hacks/glx/hypertorus.c
@@ -89,7 +89,6 @@ static const char sccsid[] = "@(#)hypertorus.c  1.2 05/09/28 xlockmore";
                             "*showFPS:    False \n" \
 			    "*suppressRotationAnimation: True\n" \
 
-# define free_hypertorus 0
 # define release_hypertorus 0
 # include "xlockmore.h"         /* from the xscreensaver distribution */
 #else  /* !STANDALONE */
@@ -982,7 +981,7 @@ ENTRYPOINT void draw_hypertorus(ModeInfo *mi)
   if (!hp->glx_context)
     return;
 
-  glXMakeCurrent(display,window,*(hp->glx_context));
+  glXMakeCurrent(display, window, *hp->glx_context);
 
   glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
   glLoadIdentity();
@@ -1006,11 +1005,20 @@ ENTRYPOINT void change_hypertorus(ModeInfo *mi)
   if (!hp->glx_context)
     return;
 
-  glXMakeCurrent(MI_DISPLAY(mi),MI_WINDOW(mi),*(hp->glx_context));
+  glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *hp->glx_context);
   init(mi);
 }
 #endif /* !STANDALONE */
 
+ENTRYPOINT void free_hypertorus(ModeInfo *mi)
+{
+  hypertorusstruct *hp = &hyper[MI_SCREEN(mi)];
+  if (!hp->glx_context) return;
+  glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *hp->glx_context);
+  gltrackball_free (hp->trackballs[0]);
+  gltrackball_free (hp->trackballs[1]);
+}
+
 XSCREENSAVER_MODULE ("Hypertorus", hypertorus)
 
 #endif /* USE_GL */
-- 
cgit v1.2.3-55-g7522