Changeset 2141 for libcacaTweet

Timestamp:

Dec 16, 2007, 12:54:43 PM (12 years ago)

Author:

Sam Hocevar

Message:

• Only call glutInit() once through the program's lifetime.
• Free the internal font when closing the GL driver.
• Hide the window when closing the GL driver, because freeglut's glutDestroyWindow() does not really closes the window.

File:

• libcaca/trunk/caca/driver_gl.c (modified) (3 diffs)

libcaca/trunk/caca/driver_gl.c

@@ -45 +45 @@
  */
 
+static int glut_init;
 static caca_display_t *gl_d; /* FIXME: we ought to get rid of this */
 
@@ -140 +141 @@
     dp->drv.p->sh = ((float)dp->drv.p->font_height) / 16.0f;
 
-    glutInit(&argc, argv);
+    if(!glut_init)
+    {
+        glut_init = 1;
+        glutInit(&argc, argv);
+    }
 
     glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE);
@@ -187 +192 @@
 static int gl_end_graphics(caca_display_t *dp)
 {
+    glutHideWindow();
     glutDestroyWindow(dp->drv.p->window);
+    cucul_free_font(dp->drv.p->f);
     free(dp->drv.p->txid);
     free(dp->drv.p);