Changeset 540 for libcaca/trunk/caca/driver_gl.cTweet

Timestamp:

Mar 7, 2006, 10:17:35 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Polished the driver split a bit (still no events, except resize events), properly credited authors and documented a few things.

File:

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

libcaca/trunk/caca/driver_gl.c

@@ -10 +10 @@
  */
 
-/** \file graphics.c
+/** \file driver_gl.c
  *  \version \$Id$
- *  \author Sam Hocevar <sam@zoy.org>
- *  \brief Character drawing
+ *  \author Jean-Yves Lamoureux <jylam@lnxscene.org>
+ *  \brief OpenGL driver
  *
- *  This file contains character and string drawing functions.
+ *  This file contains the libcaca OpenGL input and output driver
  */
 
 #include "config.h"
-
-#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
-#   include <inttypes.h>
-#else
-typedef unsigned int uint32_t;
-typedef unsigned char uint8_t;
-#endif
 
 #if defined(USE_GL)
@@ -83 +76 @@
 static void gl_handle_mouse_motion(int, int);
 
-int gl_init_graphics(caca_t *kk)
+static int gl_init_graphics(caca_t *kk)
 {
     char *empty_texture;
@@ -187 +180 @@
 }
 
-int gl_end_graphics(caca_t *kk)
+static int gl_end_graphics(caca_t *kk)
 {
     glutDestroyWindow(kk->gl.window);
@@ -193 +186 @@
 }
 
-int gl_set_window_title(caca_t *kk, char const *title)
+static int gl_set_window_title(caca_t *kk, char const *title)
 {
     glutSetWindowTitle(title);
@@ -199 +192 @@
 }
 
-unsigned int gl_get_window_width(caca_t *kk)
+static unsigned int gl_get_window_width(caca_t *kk)
 {
     return kk->gl.width;
 }
 
-unsigned int gl_get_window_height(caca_t *kk)
+static unsigned int gl_get_window_height(caca_t *kk)
 {
     return kk->gl.height;
 }
 
-void gl_display(caca_t *kk)
+static void gl_display(caca_t *kk)
 {
     unsigned int x, y, line;
@@ -282 +275 @@
 }
 
-void gl_handle_resize(caca_t *kk)
-{
-    unsigned int new_width, new_height;
-
-    new_width = kk->qq->width;
-    new_height = kk->qq->height;
-
+static void gl_handle_resize(caca_t *kk, unsigned int *new_width,
+                                         unsigned int *new_height)
+{
     kk->gl.width = kk->gl.new_width;
     kk->gl.height = kk->gl.new_height;
 
-    new_width = kk->gl.width / kk->gl.font_width;
-    new_height = (kk->gl.height / kk->gl.font_height) + 1;
+    *new_width = kk->gl.width / kk->gl.font_width;
+    *new_height = (kk->gl.height / kk->gl.font_height) + 1;
 
     glMatrixMode(GL_PROJECTION);