Changeset 540Tweet

Timestamp:

Mar 7, 2006, 10:17:35 AM (15 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.

Location:

libcaca/trunk

Files:

• caca/caca.c (modified) (6 diffs)
• caca/caca_internals.h (modified) (5 diffs)
• caca/driver_conio.c (modified) (7 diffs)
• caca/driver_gl.c (modified) (6 diffs)
• caca/driver_ncurses.c (modified) (8 diffs)
• caca/driver_slang.c (modified) (10 diffs)
• caca/driver_win32.c (modified) (11 diffs)
• caca/driver_x11.c (modified) (7 diffs)
• caca/event.c (modified) (2 diffs)
• caca/graphics.c (modified) (3 diffs)
• cucul/bitmap.c (modified) (1 diff)
• cucul/box.c (modified) (1 diff)
• cucul/char.c (modified) (3 diffs)
• cucul/conic.c (modified) (1 diff)
• cucul/cucul.c (modified) (1 diff)
• cucul/cucul_internals.h (modified) (2 diffs)
• cucul/export.c (modified) (1 diff)
• cucul/line.c (modified) (1 diff)
• cucul/math.c (modified) (1 diff)
• cucul/sprite.c (modified) (1 diff)
• cucul/triangle.c (modified) (1 diff)
• src/cacaview.c (modified) (2 diffs)

libcaca/trunk/caca/caca.c

@@ -22 +22 @@
 #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
-
 #include <stdlib.h>
 #include <string.h>
@@ -38 +31 @@
 
 static int caca_init_driver(caca_t *kk);
-static void caca_init_terminal(caca_t *kk);
-
+static void caca_check_terminal(caca_t *kk);
+
+/** \brief Attach a caca graphical context to a cucul backend context.
+ *
+ *  Create a graphical context using device-dependent features (ncurses for
+ *  terminals, an X11 window, a DOS command window...) that attaches to a
+ *  libcucul canvas. Everything that gets drawn in the libcucul canvas can
+ *  then be displayed by the libcaca driver.
+ *
+ *  \param qq The cucul backend context.
+ *  \return The caca graphical context or NULL if an error occurred.
+ */
 caca_t * caca_attach(cucul_t * qq)
 {
-    int ret;
     caca_t *kk = malloc(sizeof(caca_t));
 
-    ret = caca_init_driver(kk);
-
-    if(ret)
+    kk->qq = qq;
+
+    if(caca_init_driver(kk))
     {
         free(kk);
@@ -53 +55 @@
     }
 
-    qq->refcount++;
-    kk->qq = qq;
-
-    /* Only for slang and ncurses */
-    caca_init_terminal(kk);
-
-    if(_caca_init_graphics(kk))
-    {
-        qq->refcount--;
+    /* Only needed for slang and ncurses */
+    caca_check_terminal(kk);
+
+    if(kk->driver.init_graphics(kk))
+    {
         free(kk);
         return NULL;
     }
 
-    /* Initialise events stuff */
+    /* Attached! */
+    kk->qq->refcount++;
+
+    /* Graphics stuff */
+    kk->delay = 0;
+    kk->rendertime = 0;
+
+    /* Events stuff */
+#if defined(USE_SLANG) || defined(USE_NCURSES)
     kk->events.key_timer.last_sec = 0;
     kk->events.key_timer.last_usec = 0;
@@ -72 +78 @@
     kk->events.autorepeat_ticks = 0;
     kk->events.last_key = 0;
+#endif
 
     kk->timer.last_sec = 0;
@@ -83 +90 @@
 }
 
+/** \brief Detach a caca graphical context from a cucul backend context.
+ *
+ *  Detach a graphical context from its cucul backend and destroy it. The
+ *  libcucul canvas continues to exist and other graphical contexts can be
+ *  attached to it afterwards.
+ *
+ *  \param qq The caca graphical context.
+ */
 void caca_detach(caca_t *kk)
 {
@@ -176 +191 @@
 }
 
-static void caca_init_terminal(caca_t *kk)
+static void caca_check_terminal(caca_t *kk)
 {
 #if defined(HAVE_GETENV) && defined(HAVE_PUTENV) && \

libcaca/trunk/caca/caca_internals.h

@@ -21 +21 @@
 #define __CACA_INTERNALS_H__
 
+#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
+#   include <inttypes.h>
+#else
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+#endif
+
 #if defined(USE_GL)
 #   include <GL/glut.h>
@@ -103 +111 @@
         unsigned int (* get_window_height) (caca_t *);
         void (* display) (caca_t *);
-        void (* handle_resize) (caca_t *);
+        void (* handle_resize) (caca_t *, unsigned int *, unsigned int *);
     } driver;
 
@@ -125 +133 @@
     } events;
 
+    /* FIXME: maybe this should go away */
 #if defined(USE_X11) && !defined(_DOXYGEN_SKIP_ME)
     struct x11
@@ -164 +173 @@
         HANDLE front, back;
         CHAR_INFO *buffer;
+        CONSOLE_CURSOR_INFO cci;
     } win32;
 #endif
@@ -189 +199 @@
 };
 
-/* Initialisation functions */
-extern int _caca_init_graphics(caca_t *kk);
-extern int _caca_end_graphics(caca_t *kk);
-
 /* Timer functions */
 extern void _caca_sleep(unsigned int);
 extern unsigned int _caca_getticks(struct caca_timer *);
 
-/* Cached screen size */
-extern unsigned int _caca_width;
-extern unsigned int _caca_height;
-extern int _caca_resize;
-extern int _caca_resize_event;
-
 #endif /* __CACA_INTERNALS_H__ */

libcaca/trunk/caca/driver_conio.c

@@ -10 +10 @@
  */
 
-/** \file graphics.c
+/** \file driver_conio.c
  *  \version \$Id$
  *  \author Sam Hocevar <sam@zoy.org>
- *  \brief Character drawing
+ *  \brief DOS/conio.h driver
  *
- *  This file contains character and string drawing functions.
+ *  This file contains the libcaca DOS/conio.h 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_CONIO)
@@ -51 +44 @@
 #include "cucul_internals.h"
 
-#if !defined(_DOXYGEN_SKIP_ME)
-int conio_init_graphics(caca_t *kk)
+static int conio_init_graphics(caca_t *kk)
 {
     _wscroll = 0;
@@ -73 +65 @@
 }
 
-int conio_end_graphics(caca_t *kk)
+static int conio_end_graphics(caca_t *kk)
 {
     _wscroll = 1;
@@ -86 +78 @@
     return 0;
 }
-#endif /* _DOXYGEN_SKIP_ME */
 
-int conio_set_window_title(caca_t *kk, char const *title)
+static int conio_set_window_title(caca_t *kk, char const *title)
 {
     return 0;
 }
 
-unsigned int conio_get_window_width(caca_t *kk)
+static unsigned int conio_get_window_width(caca_t *kk)
 {
     /* Fallback to a 6x10 font */
@@ -99 +90 @@
 }
 
-unsigned int conio_get_window_height(caca_t *kk)
+static unsigned int conio_get_window_height(caca_t *kk)
 {
     /* Fallback to a 6x10 font */
@@ -105 +96 @@
 }
 
-void conio_display(caca_t *kk)
+static void conio_display(caca_t *kk)
 {
     int n;
@@ -123 +114 @@
 }
 
-void conio_handle_resize(caca_t *kk)
+static void conio_handle_resize(caca_t *kk, unsigned int *new_width,
+                                            unsigned int *new_height)
 {
-    return;
+    *new_width = kk->qq->width;
+    *new_height = kk->qq->height;
 }
 

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);

libcaca/trunk/caca/driver_ncurses.c

@@ -10 +10 @@
  */
 
-/** \file graphics.c
+/** \file driver_ncurses.c
  *  \version \$Id$
  *  \author Sam Hocevar <sam@zoy.org>
- *  \brief Character drawing
+ *  \brief Ncurses driver
  *
- *  This file contains character and string drawing functions.
+ *  This file contains the libcaca Ncurses 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_NCURSES)
@@ -55 +48 @@
 #include "cucul_internals.h"
 
-int ncurses_init_graphics(caca_t *);
-int ncurses_end_graphics(caca_t *);
-int ncurses_set_window_title(caca_t *, char const *);
-unsigned int ncurses_get_window_width(caca_t *);
-unsigned int ncurses_get_window_height(caca_t *);
-void ncurses_display(caca_t *);
-void ncurses_handle_resize(caca_t *);
-
 /*
  * Local functions
  */
+
 #if defined(HAVE_SIGNAL)
 static RETSIGTYPE sigwinch_handler(int);
@@ -71 +57 @@
 #endif
 
-int ncurses_init_graphics(caca_t *kk)
+static int ncurses_init_graphics(caca_t *kk)
 {
     static int curses_colors[] =
@@ -158 +144 @@
 }
 
-int ncurses_end_graphics(caca_t *kk)
+static int ncurses_end_graphics(caca_t *kk)
 {
     mousemask(kk->ncurses.oldmask, NULL);
@@ -168 +154 @@
 }
 
-int ncurses_set_window_title(caca_t *kk, char const *title)
+static int ncurses_set_window_title(caca_t *kk, char const *title)
 {
     return 0;
 }
 
-unsigned int ncurses_get_window_width(caca_t *kk)
+static unsigned int ncurses_get_window_width(caca_t *kk)
 {
     /* Fallback to a 6x10 font */
@@ -179 +165 @@
 }
 
-unsigned int ncurses_get_window_height(caca_t *kk)
+static unsigned int ncurses_get_window_height(caca_t *kk)
 {
     /* Fallback to a 6x10 font */
@@ -185 +171 @@
 }
 
-void ncurses_display(caca_t *kk)
+static void ncurses_display(caca_t *kk)
 {
     int x, y;
@@ -202 +188 @@
 }
 
-void ncurses_handle_resize(caca_t *kk)
-{
-    unsigned int new_width, new_height;
+static void ncurses_handle_resize(caca_t *kk, unsigned int *new_width,
+                                              unsigned int *new_height)
+{
     struct winsize size;
 
-    new_width = kk->qq->width;
-    new_height = kk->qq->height;
+    *new_width = kk->qq->width;
+    *new_height = kk->qq->height;
 
     if(ioctl(fileno(stdout), TIOCGWINSZ, &size) == 0)
     {
-        new_width = size.ws_col;
-        new_height = size.ws_row;
+        *new_width = size.ws_col;
+        *new_height = size.ws_row;
 #if defined(HAVE_RESIZE_TERM)
-        resize_term(new_height, new_width);
+        resize_term(*new_height, *new_width);
 #else
-        resizeterm(new_height, new_width);
+        resizeterm(*new_height, *new_width);
 #endif
         wrefresh(curscr);

libcaca/trunk/caca/driver_slang.c

@@ -10 +10 @@
  */
 
-/** \file graphics.c
+/** \file driver_slang.c
  *  \version \$Id$
  *  \author Sam Hocevar <sam@zoy.org>
- *  \brief Character drawing
+ *  \brief SLang driver
  *
- *  This file contains character and string drawing functions.
+ *  This file contains the libcaca SLang 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_SLANG)
@@ -113 +106 @@
 };
 
-int slang_init_graphics(caca_t *);
-int slang_end_graphics(caca_t *);
-int slang_set_window_title(caca_t *, char const *);
-unsigned int slang_get_window_width(caca_t *);
-unsigned int slang_get_window_height(caca_t *);
-void slang_display(caca_t *);
-void slang_handle_resize(caca_t *);
-
 /*
  * Local functions
@@ -131 +116 @@
 #endif
 
-#if !defined(_DOXYGEN_SKIP_ME)
-int slang_init_graphics(caca_t *kk)
+static int slang_init_graphics(caca_t *kk)
 {
 #if defined(HAVE_SIGNAL)
@@ -146 +130 @@
     {
         SLsig_unblock_signals();
-        return NULL;
+        return -1;
     }
 
@@ -154 +138 @@
     {
         SLsig_unblock_signals();
-        return NULL;
+        return -1;
     }
 
@@ -180 +164 @@
 }
 
-int slang_end_graphics(caca_t *kk)
+static int slang_end_graphics(caca_t *kk)
 {
     SLtt_set_mouse_mode(0, 0);
@@ -189 +173 @@
     return 0;
 }
-#endif /* _DOXYGEN_SKIP_ME */
-
-int slang_set_window_title(caca_t *kk, char const *title)
-{
+
+static int slang_set_window_title(caca_t *kk, char const *title)
+{
+    /* FIXME */
     return 0;
 }
 
-unsigned int slang_get_window_width(caca_t *kk)
+static unsigned int slang_get_window_width(caca_t *kk)
 {
     /* Fallback to a 6x10 font */
@@ -202 +186 @@
 }
 
-unsigned int slang_get_window_height(caca_t *kk)
+static unsigned int slang_get_window_height(caca_t *kk)
 {
     /* Fallback to a 6x10 font */
@@ -208 +192 @@
 }
 
-void slang_display(caca_t *kk)
+static void slang_display(caca_t *kk)
 {
     int x, y;
@@ -251 +235 @@
 }
 
+static void slang_handle_resize(caca_t *kk, unsigned int *new_width,
+                                            unsigned int *new_height)
+{
+    SLtt_get_screen_size();
+    *new_width = SLtt_Screen_Cols;
+    *new_height = SLtt_Screen_Rows;
+
+    if(*new_width != kk->qq->width || *new_height != kk->qq->height)
+        SLsmg_reinit_smg();
+}
+
 /*
  * XXX: following functions are local
  */
-
-void slang_handle_resize(caca_t *kk)
-{
-    unsigned int new_width, new_height;
-
-    new_width = kk->qq->width;
-    new_height = kk->qq->height;
-
-    SLtt_get_screen_size();
-    new_width = SLtt_Screen_Cols;
-    new_height = SLtt_Screen_Rows;
-
-    if(new_width != kk->qq->width || new_height != kk->qq->height)
-        SLsmg_reinit_smg();
-}
 
 static void slang_init_palette(void)

libcaca/trunk/caca/driver_win32.c

@@ -10 +10 @@
  */
 
-/** \file graphics.c
+/** \file driver_win32.c
  *  \version \$Id$
  *  \author Sam Hocevar <sam@zoy.org>
- *  \brief Character drawing
+ *  \brief Win32 driver
  *
- *  This file contains character and string drawing functions.
+ *  This file contains the libcaca Win32 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_WIN32)
@@ -88 +81 @@
 };
 
-int win32_init_graphics(caca_t *);
-int win32_end_graphics(caca_t *);
-int win32_set_window_title(caca_t *, char const *);
-unsigned int win32_get_window_width(caca_t *);
-unsigned int win32_get_window_height(caca_t *);
-void win32_display(caca_t *);
-void win32_handle_resize(caca_t *);
-
-int win32_init_graphics(caca_t *kk)
-{
-    CONSOLE_CURSOR_INFO cci;
+static int win32_init_graphics(caca_t *kk)
+{
     CONSOLE_SCREEN_BUFFER_INFO csbi;
     COORD size;
@@ -112 +96 @@
         return -1;
 
-    GetConsoleCursorInfo(kk->win32.hout, &cci);
-    cci.bVisible = FALSE;
-    SetConsoleCursorInfo(kk->win32.hout, &cci);
+    GetConsoleCursorInfo(kk->win32.hout, &kk->win32.cci);
+    kk->win32.cci.bVisible = FALSE;
+    SetConsoleCursorInfo(kk->win32.hout, &kk->win32.cci);
 
     SetConsoleMode(kk->win32.hout, ENABLE_MOUSE_INPUT);
@@ -145 +129 @@
     SetConsoleMode(kk->win32.back, 0);
 
-    GetConsoleCursorInfo(kk->win32.front, &cci);
-    cci.dwSize = 0;
-    cci.bVisible = FALSE;
-    SetConsoleCursorInfo(kk->win32.front, &cci);
-    SetConsoleCursorInfo(kk->win32.back, &cci);
+    GetConsoleCursorInfo(kk->win32.front, &kk->win32.cci);
+    kk->win32.cci.dwSize = 0;
+    kk->win32.cci.bVisible = FALSE;
+    SetConsoleCursorInfo(kk->win32.front, &kk->win32.cci);
+    SetConsoleCursorInfo(kk->win32.back, &kk->win32.cci);
 
     SetConsoleActiveScreenBuffer(kk->win32.front);
@@ -161 +145 @@
 }
 
-int win32_end_graphics(caca_t *kk)
+static int win32_end_graphics(caca_t *kk)
 {
     SetConsoleActiveScreenBuffer(kk->win32.hout);
@@ -171 +155 @@
                                              | FOREGROUND_GREEN
                                              | FOREGROUND_BLUE);
-    cci.bVisible = TRUE;
-    SetConsoleCursorInfo(kk->win32.hout, &cci);
+    kk->win32.cci.bVisible = TRUE;
+    SetConsoleCursorInfo(kk->win32.hout, &kk->win32.cci);
     CloseHandle(kk->win32.hout);
 
@@ -178 +162 @@
 }
 
-int win32_set_window_title(caca_t *kk, char const *title)
+static int win32_set_window_title(caca_t *kk, char const *title)
 {
     SetConsoleTitle(title);
@@ -184 +168 @@
 }
 
-unsigned int win32_get_window_width(caca_t *kk)
+static unsigned int win32_get_window_width(caca_t *kk)
 {
     /* FIXME */
@@ -192 +176 @@
 }
 
-unsigned int win32_get_window_height(caca_t *kk)
+static unsigned int win32_get_window_height(caca_t *kk)
 {
     /* FIXME */
@@ -200 +184 @@
 }
 
-void win32_display(caca_t *kk)
+static void win32_display(caca_t *kk)
 {
     COORD size, pos;
@@ -225 +209 @@
 }
 
-void win32_handle_resize(caca_t *kk)
-{
-    unsigned int new_width, new_height;
-
-    new_width = kk->qq->width;
-    new_height = kk->qq->height;
-
+static void win32_handle_resize(caca_t *kk, unsigned int *new_width,
+                                            unsigned int *new_height)
+{
     /* Nothing to do here. */
+    *new_width = kk->qq->width;
+    *new_height = kk->qq->height;
 }
 

libcaca/trunk/caca/driver_x11.c

@@ -10 +10 @@
  */
 
-/** \file graphics.c
+/** \file driver_x11.c
  *  \version \$Id$
  *  \author Sam Hocevar <sam@zoy.org>
- *  \brief Character drawing
+ *  \brief X11 driver
  *
- *  This file contains character and string drawing functions.
+ *  This file contains the libcaca X11 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_X11)
@@ -47 +40 @@
 #include "cucul_internals.h"
 
-int x11_init_graphics(caca_t *);
-int x11_end_graphics(caca_t *);
-int x11_set_window_title(caca_t *, char const *);
-unsigned int x11_get_window_width(caca_t *);
-unsigned int x11_get_window_height(caca_t *);
-void x11_display(caca_t *);
-void x11_handle_resize(caca_t *);
-
 /*
  * Local functions
@@ -60 +45 @@
 static int x11_error_handler(Display *, XErrorEvent *);
 
-#if !defined(_DOXYGEN_SKIP_ME)
-int x11_init_graphics(caca_t *kk)
+static int x11_init_graphics(caca_t *kk)
 {
     static int const x11_palette[] =
@@ -211 +195 @@
 }
 
-int x11_end_graphics(caca_t *kk)
+static int x11_end_graphics(caca_t *kk)
 {
     XSync(kk->x11.dpy, False);
@@ -227 +211 @@
     return 0;
 }
-#endif /* _DOXYGEN_SKIP_ME */
-
-int x11_set_window_title(caca_t *kk, char const *title)
+
+static int x11_set_window_title(caca_t *kk, char const *title)
 {
     XStoreName(kk->x11.dpy, kk->x11.window, title);
@@ -235 +218 @@
 }
 
-unsigned int x11_get_window_width(caca_t *kk)
+static unsigned int x11_get_window_width(caca_t *kk)
 {
     return kk->qq->width * kk->x11.font_width;
 }
 
-unsigned int x11_get_window_height(caca_t *kk)
+static unsigned int x11_get_window_height(caca_t *kk)
 {
     return kk->qq->height * kk->x11.font_height;
 }
 
-void x11_display(caca_t *kk)
+static void x11_display(caca_t *kk)
 {
     unsigned int x, y, len;
@@ -309 +292 @@
 }
 
-void x11_handle_resize(caca_t *kk)
-{
-    unsigned int new_width, new_height;
-
+static void x11_handle_resize(caca_t *kk, unsigned int *new_width,
+                                          unsigned int *new_height)
+{
     Pixmap new_pixmap;
 
-    new_width = kk->qq->width;
-    new_height = kk->qq->height;
-
-    new_width = kk->x11.new_width;
-    new_height = kk->x11.new_height;
+    *new_width = kk->x11.new_width;
+    *new_height = kk->x11.new_height;
 
     new_pixmap = XCreatePixmap(kk->x11.dpy, kk->x11.window,

libcaca/trunk/caca/event.c

@@ -19 +19 @@
 
 #include "config.h"
-
-#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
-#   include <inttypes.h>
-#else
-typedef unsigned char uint8_t;
-#endif
 
 #if defined(USE_SLANG)
@@ -659 +653 @@
         for( ; ; )
         {
-            GetNumberOfConsoleInputEvents(win32_hin, &num);
+            GetNumberOfConsoleInputEvents(kk->win32.hin, &num);
             if(num == 0)
                 break;
 
-            ReadConsoleInput(win32_hin, &rec, 1, &num);
+            ReadConsoleInput(kk->win32.hin, &rec, 1, &num);
             if(rec.EventType == KEY_EVENT)
             {

libcaca/trunk/caca/graphics.c

@@ -20 +20 @@
 #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
-
 #include <stdio.h> /* BUFSIZ */
 #include <string.h>
@@ -44 +37 @@
  */
 static void caca_handle_resize(caca_t *kk);
-
-#if !defined(_DOXYGEN_SKIP_ME)
-int _caca_init_graphics(caca_t *kk)
-{
-    int ret = kk->driver.init_graphics(kk);
-
-    if(!ret)
-        return ret;
-
-    kk->delay = 0;
-    kk->rendertime = 0;
-
-    return 0;
-}
-
-int _caca_end_graphics(caca_t *kk)
-{
-    return kk->driver.end_graphics(kk);
-}
-#endif /* _DOXYGEN_SKIP_ME */
 
 /** \brief Set the window title.
@@ -192 +165 @@
     unsigned int new_width, new_height;
 
-    new_width = kk->qq->width;
-    new_height = kk->qq->height;
-
-    kk->driver.handle_resize(kk);
+    kk->driver.handle_resize(kk, &new_width, &new_height);
 
     /* Tell libcucul we changed size */

libcaca/trunk/cucul/bitmap.c

@@ -19 +19 @@
 
 #include "config.h"
-
-#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
-#   include <inttypes.h>
-#else
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-#endif
 
 #if defined(HAVE_ENDIAN_H)

libcaca/trunk/cucul/box.c

@@ -19 +19 @@
 
 #include "config.h"
-
-#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
-#   include <inttypes.h>
-#else
-typedef unsigned char uint8_t;
-#endif
 
 #include <stdlib.h>

libcaca/trunk/cucul/char.c

@@ -19 +19 @@
 
 #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
 
 #include <stdio.h> /* BUFSIZ */
@@ -103 +96 @@
         return;
 
-    qq->chars[x + y * qq->width] = c & 0x7f; /* FIXME: ASCII-only */
+    qq->chars[x + y * qq->width] = c & 0x0000007f; /* FIXME: ASCII-only */
     qq->attr[x + y * qq->width] = (qq->bgcolor << 4) | qq->fgcolor;
 }
@@ -152 +145 @@
     while(*t)
     {
-        *chars++ = *t++ & 0x7f; /* FIXME: ASCII-only */
+        *chars++ = *t++ & 0x0000007f; /* FIXME: ASCII-only */
         *attr++ = (qq->bgcolor << 4) | qq->fgcolor;
     }

libcaca/trunk/cucul/conic.c

@@ -20 +20 @@
 
 #include "config.h"
-
-#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
-#   include <inttypes.h>
-#else
-typedef unsigned char uint8_t;
-#endif
 
 #include <stdlib.h>

libcaca/trunk/cucul/cucul.c

@@ -20 +20 @@
 
 #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
 
 #include <stdlib.h>

libcaca/trunk/cucul/cucul_internals.h

@@ -21 +21 @@
 #define __CUCUL_INTERNALS_H__
 
+#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
+#   include <inttypes.h>
+#else
+typedef unsigned char uint8_t;
+typedef unsigned char uint16_t;
+typedef unsigned int uint32_t;
+#endif
+
 struct cucul_context
 {
@@ -28 +36 @@
     uint32_t *chars;
     uint8_t *attr;
-    uint8_t *empty_line, *scratch_line;
+    char *empty_line, *scratch_line;
 
     enum cucul_color fgcolor;

libcaca/trunk/cucul/export.c

@@ -10 +10 @@
  */
 
-/** \file char.c
+/** \file export.c
  *  \version \$Id$
  *  \author Sam Hocevar <sam@zoy.org>
- *  \brief Character drawing
- *
- *  This file contains character and string drawing functions.
+ *  \author Jean-Yves Lamoureux <jylam@lnxscene.org>
+ *  \brief Export function
+ *
+ *  This file contains export functions for various file formats such
+ *  as HTML or IRC.
  */
 
 #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
 
 #include <stdlib.h>

libcaca/trunk/cucul/line.c

@@ -20 +20 @@
 
 #include "config.h"
-
-#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
-#   include <inttypes.h>
-#else
-typedef unsigned char uint8_t;
-#endif
 
 #include <stdlib.h>

libcaca/trunk/cucul/math.c

@@ -19 +19 @@
 
 #include "config.h"
-
-#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
-#   include <inttypes.h>
-#else
-typedef unsigned char uint8_t;
-#endif
 
 #include <stdlib.h>

libcaca/trunk/cucul/sprite.c

@@ -19 +19 @@
 
 #include "config.h"
-
-#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
-#   include <inttypes.h>
-#else
-typedef unsigned char uint8_t;
-#endif
 
 #include <stdio.h>

libcaca/trunk/cucul/triangle.c

@@ -19 +19 @@
 
 #include "config.h"
-
-#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
-#   include <inttypes.h>
-#else
-typedef unsigned char uint8_t;
-#endif
 
 #include <stdlib.h>

libcaca/trunk/src/cacaview.c

@@ -681 +681 @@
 
     /* Create the libcaca bitmap */
-    bitmap = caca_create_bitmap(bpp, w, h, depth * w,
-                                rmask, gmask, bmask, amask);
+    bitmap = cucul_create_bitmap(qq, bpp, w, h, depth * w,
+                                 rmask, gmask, bmask, amask);
     if(!bitmap)
     {
@@ -691 +691 @@
 
     if(bpp == 8)
-        caca_set_bitmap_palette(bitmap, red, green, blue, alpha);
+        cucul_set_bitmap_palette(qq, bitmap, red, green, blue, alpha);
 #endif
 }