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/queens.c | |
parent | Forgot one DPMS killing instance (diff) | |
parent | Update to 5.42 (diff) | |
download | xscreensaver-23.tar.gz xscreensaver-23.tar.xz xscreensaver-23.zip |
Merge branch 'master' into openslxv23
Diffstat (limited to 'hacks/glx/queens.c')
-rw-r--r-- | hacks/glx/queens.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/hacks/glx/queens.c b/hacks/glx/queens.c index bc9b202..fce9d37 100644 --- a/hacks/glx/queens.c +++ b/hacks/glx/queens.c @@ -22,7 +22,6 @@ "*showFPS: False \n" \ "*wireframe: False \n" \ -# define free_queens 0 # define release_queens 0 # include "xlockmore.h" @@ -576,7 +575,7 @@ ENTRYPOINT void draw_queens(ModeInfo *mi) if(!qs->glx_context) return; - glXMakeCurrent(disp, w, *(qs->glx_context)); + glXMakeCurrent(disp, w, *qs->glx_context); if(flat) glShadeModel(GL_FLAT); @@ -605,6 +604,20 @@ ENTRYPOINT void draw_queens(ModeInfo *mi) glXSwapBuffers(disp, w); } + +ENTRYPOINT void free_queens(ModeInfo *mi) +{ + Queenscreen *qs = &qss[MI_SCREEN(mi)]; + int i; + if (!qs->glx_context) return; + glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *qs->glx_context); + gltrackball_free (qs->trackball); + + /* this is horrible! List numbers are hardcoded! */ + for (i = 1; i <= 20; i++) + if (glIsList(i)) glDeleteLists(i, 1); +} + XSCREENSAVER_MODULE ("Queens", queens) #endif |