summaryrefslogtreecommitdiffstats
path: root/hacks/glx/hypnowheel.c
diff options
context:
space:
mode:
authorSimon Rettberg2019-02-18 11:55:41 +0100
committerSimon Rettberg2019-02-18 11:55:41 +0100
commitae69a754244c4e475c8d2591772ca8e005071d83 (patch)
tree58b3fa7abc2dcfe3c23e1c0ce108950c720826ab /hacks/glx/hypnowheel.c
parentUpdate gitignore (diff)
downloadxscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.gz
xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.xz
xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.zip
Update to 5.42
Diffstat (limited to 'hacks/glx/hypnowheel.c')
-rw-r--r--hacks/glx/hypnowheel.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/hacks/glx/hypnowheel.c b/hacks/glx/hypnowheel.c
index 0602e6e..76896da 100644
--- a/hacks/glx/hypnowheel.c
+++ b/hacks/glx/hypnowheel.c
@@ -24,7 +24,6 @@
"*wireframe: False \n" \
"*suppressRotationAnimation: True\n" \
-# define free_hypnowheel 0
# define release_hypnowheel 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -243,7 +242,7 @@ draw_hypnowheel (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);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -317,6 +316,22 @@ hypnowheel_handle_event (ModeInfo *mi, XEvent *event)
}
+ENTRYPOINT void
+free_hypnowheel (ModeInfo *mi)
+{
+ hypnowheel_configuration *bp = &bps[MI_SCREEN(mi)];
+ int i;
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (bp->colors) free (bp->colors);
+ if (bp->rot) free_rotator (bp->rot);
+ if (bp->discs) {
+ for (i = 0; i < nlayers; i++)
+ if (bp->discs[i].rot) free_rotator (bp->discs[i].rot);
+ free (bp->discs);
+ }
+}
+
XSCREENSAVER_MODULE ("Hypnowheel", hypnowheel)
#endif /* USE_GL */