diff options
author | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
commit | aa7530630e595b80d5db54655fd827b61edc0fd7 (patch) | |
tree | 048cb74072450c7592f254c3537ac8f252d09d73 /hacks/glx/cage.c | |
parent | Forgot one DPMS killing instance (diff) | |
parent | Update to 5.42 (diff) | |
download | xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.gz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.xz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.zip |
Merge branch 'master' into openslxv23
Diffstat (limited to 'hacks/glx/cage.c')
-rw-r--r-- | hacks/glx/cage.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/hacks/glx/cage.c b/hacks/glx/cage.c index 66f48aa..32384a7 100644 --- a/hacks/glx/cage.c +++ b/hacks/glx/cage.c @@ -82,7 +82,6 @@ static const char sccsid[] = "@(#)cage.c 5.01 2001/03/01 xlockmore"; "*wireframe: False \n" \ "*suppressRotationAnimation: True\n" \ -# define free_cage 0 # define release_cage 0 # define cage_handle_event xlockmore_no_events # include "xlockmore.h" /* from the xscreensaver distribution */ @@ -418,7 +417,7 @@ draw_cage (ModeInfo * mi) return; mi->polygon_count = 0; - glXMakeCurrent(display, window, *(cp->glx_context)); + glXMakeCurrent(display, window, *cp->glx_context); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -470,11 +469,17 @@ change_cage (ModeInfo * mi) if (!cp->glx_context) return; - glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(cp->glx_context)); + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *cp->glx_context); pinit(mi); } #endif /* !STANDALONE */ +ENTRYPOINT void +free_cage (ModeInfo * mi) +{ + /* nothing to do */ +} + XSCREENSAVER_MODULE ("Cage", cage) #endif |