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/pinion.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

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

diff --git a/hacks/glx/pinion.c b/hacks/glx/pinion.c
index f6793eb..956a444 100644
--- a/hacks/glx/pinion.c
+++ b/hacks/glx/pinion.c
@@ -16,7 +16,6 @@
            "*titleFont2: -*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*\n" \
            "*titleFont3: -*-helvetica-medium-r-normal-*-*-80-*-*-*-*-*-*\n"  \
 
-# define free_pinion 0
 # define release_pinion 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -1355,7 +1354,7 @@ draw_pinion (ModeInfo *mi)
   if (!pp->glx_context)
     return;
 
-  glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(pp->glx_context));
+  glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *pp->glx_context);
 
   glPushMatrix();
   glRotatef(current_device_rotation(), 0, 0, 1);
@@ -1465,6 +1464,25 @@ draw_pinion (ModeInfo *mi)
   glXSwapBuffers(dpy, window);
 }
 
+
+ENTRYPOINT void
+free_pinion (ModeInfo *mi)
+{
+  pinion_configuration *pp = &pps[MI_SCREEN(mi)];
+  int i;
+
+  if (!pp->glx_context) return;
+  glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *pp->glx_context);
+
+  for (i = 0; i < pp->ngears; i++)
+    if (pp->gears[i]) free_gear (pp->gears[i]);
+  if (pp->gears) free (pp->gears);
+  if (pp->trackball) gltrackball_free (pp->trackball);
+  if (pp->font1) free_texture_font (pp->font1);
+  if (pp->font2) free_texture_font (pp->font2);
+  if (pp->font3) free_texture_font (pp->font3);
+}
+
 XSCREENSAVER_MODULE ("Pinion", pinion)
 
 #endif /* USE_GL */
-- 
cgit v1.2.3-55-g7522