Changeset 777Tweet

Timestamp:

Apr 16, 2006, 8:28:47 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Replaced "struct cucul_*" and "struct caca_*" types with opaque typedefs such as cucul_dither_t instead of struct cucul_dither.
• Made cucul_buffer_t an opaque structure and implemented the two getters cucul_get_buffer_data() and cucul_get_buffer_size().
• Documented all missing functions and function parameters.

Location:

libcaca/trunk

Files:

• caca/caca.h (modified) (4 diffs)
• caca/caca_internals.h (modified) (6 diffs)
• caca/driver_conio.c (modified) (1 diff)
• caca/driver_gl.c (modified) (1 diff)
• caca/driver_ncurses.c (modified) (1 diff)
• caca/driver_raw.c (modified) (1 diff)
• caca/driver_slang.c (modified) (1 diff)
• caca/driver_vga.c (modified) (1 diff)
• caca/driver_win32.c (modified) (1 diff)
• caca/driver_x11.c (modified) (1 diff)
• caca/event.c (modified) (6 diffs)
• caca/time.c (modified) (1 diff)
• cucul/cucul.c (modified) (3 diffs)
• cucul/cucul.h (modified) (7 diffs)
• cucul/cucul_internals.h (modified) (3 diffs)
• cucul/dither.c (modified) (20 diffs)
• cucul/export_ansi.c (modified) (1 diff)
• cucul/export_html.c (modified) (2 diffs)
• cucul/export_irc.c (modified) (1 diff)
• cucul/export_ps.c (modified) (1 diff)
• cucul/export_svg.c (modified) (1 diff)
• cucul/font.c (modified) (6 diffs)
• cucul/sprite.c (modified) (9 diffs)
• src/aafire.c (modified) (2 diffs)
• src/cacaball.c (modified) (2 diffs)
• src/cacamoir.c (modified) (2 diffs)
• src/cacaplas.c (modified) (2 diffs)
• src/cacaplay.c (modified) (1 diff)
• src/cacaserver.c (modified) (13 diffs)
• src/cacaview.c (modified) (1 diff)
• src/img2irc.c (modified) (2 diffs)
• test/colors.c (modified) (1 diff)
• test/demo.c (modified) (4 diffs)
• test/dithering.c (modified) (1 diff)
• test/event.c (modified) (4 diffs)
• test/export.c (modified) (2 diffs)
• test/font.c (modified) (1 diff)
• test/gamma.c (modified) (1 diff)
• test/hsv.c (modified) (1 diff)
• test/spritedit.c (modified) (2 diffs)
• test/transform.c (modified) (1 diff)
• test/unicode.c (modified) (1 diff)

libcaca/trunk/caca/caca.h

@@ -88 +88 @@
 #endif
 
-/** \brief User event types.
- *
- *  Event types returned by caca_get_event().
- */
-enum caca_event_type
-{
-    CACA_EVENT_NONE =          0x0000, /**< No event. */
-
-    CACA_EVENT_KEY_PRESS =     0x0001, /**< A key was pressed. */
-    CACA_EVENT_KEY_RELEASE =   0x0002, /**< A key was released. */
-    CACA_EVENT_MOUSE_PRESS =   0x0004, /**< A mouse button was pressed. */
-    CACA_EVENT_MOUSE_RELEASE = 0x0008, /**< A mouse button was released. */
-    CACA_EVENT_MOUSE_MOTION =  0x0010, /**< The mouse was moved. */
-    CACA_EVENT_RESIZE =        0x0020, /**< The window was resized. */
-
-    CACA_EVENT_ANY =           0xffff  /**< Bitmask for any event. */
-};
+/** \e libcaca context */
+typedef struct caca caca_t;
+/** event structure */
+typedef struct caca_event caca_event_t;
 
 /** \brief User events.
@@ -139 +126 @@
 struct caca_event
 {
-    enum caca_event_type type;
+    enum caca_event_type
+    {
+        CACA_EVENT_NONE =          0x0000, /**< No event. */
+
+        CACA_EVENT_KEY_PRESS =     0x0001, /**< A key was pressed. */
+        CACA_EVENT_KEY_RELEASE =   0x0002, /**< A key was released. */
+        CACA_EVENT_MOUSE_PRESS =   0x0004, /**< A mouse button was pressed. */
+        CACA_EVENT_MOUSE_RELEASE = 0x0008, /**< A mouse button was released. */
+        CACA_EVENT_MOUSE_MOTION =  0x0010, /**< The mouse was moved. */
+        CACA_EVENT_RESIZE =        0x0020, /**< The window was resized. */
+
+        CACA_EVENT_ANY =           0xffff  /**< Bitmask for any event. */
+    } type;
+
     union
     {
@@ -195 +195 @@
 };
 
-typedef struct caca_context caca_t;
-
-/** \defgroup basic Basic functions
+/** \defgroup caca Basic libcaca functions
  *
  *  These functions provide the basic \e libcaca routines for driver
@@ -219 +217 @@
  *
  *  @{ */
-int caca_get_event(caca_t *kk, unsigned int, struct caca_event *, int);
+int caca_get_event(caca_t *kk, unsigned int, caca_event_t *, int);
 unsigned int caca_get_mouse_x(caca_t *kk);
 unsigned int caca_get_mouse_y(caca_t *kk);

libcaca/trunk/caca/caca_internals.h

@@ -25 +25 @@
 typedef long unsigned int uintptr_t;
 #endif
+
+typedef struct caca_timer caca_timer_t;
 
 #if !defined(_DOXYGEN_SKIP_ME)
@@ -89 +91 @@
 
 /* Internal caca context */
-struct caca_context
+struct caca
 {
     /* A link to our cucul canvas */
@@ -107 +109 @@
         void (* display) (caca_t *);
         void (* handle_resize) (caca_t *);
-        int (* get_event) (caca_t *, struct caca_event *);
+        int (* get_event) (caca_t *, caca_event_t *);
         void (* set_mouse) (caca_t *, int);
     } drv;
@@ -126 +128 @@
     /* Framerate handling */
     unsigned int delay, rendertime;
-    struct caca_timer timer;
+    caca_timer_t timer;
     int lastticks;
 
@@ -132 +134 @@
     {
 #if defined(USE_SLANG) || defined(USE_NCURSES) || defined(USE_CONIO) || defined(USE_GL)
-        struct caca_event buf[EVENTBUF_LEN];
+        caca_event_t buf[EVENTBUF_LEN];
         int queue;
 #endif
 #if defined(USE_SLANG) || defined(USE_NCURSES)
-        struct caca_timer key_timer;
+        caca_timer_t key_timer;
         unsigned int last_key_ticks;
         unsigned int autorepeat_ticks;
-        struct caca_event last_key_event;
+        caca_event_t last_key_event;
 #endif
 #if defined(USE_WIN32)
@@ -149 +151 @@
 /* Internal timer functions */
 extern void _caca_sleep(unsigned int);
-extern unsigned int _caca_getticks(struct caca_timer *);
+extern unsigned int _caca_getticks(caca_timer_t *);
 
 /* Internal event functions */
 extern void _caca_handle_resize(caca_t *);
 #if defined(USE_SLANG) || defined(USE_NCURSES) || defined(USE_CONIO) || defined(USE_GL)
-extern void _push_event(caca_t *, struct caca_event *);
-extern int _pop_event(caca_t *, struct caca_event *);
+extern void _push_event(caca_t *, caca_event_t *);
+extern int _pop_event(caca_t *, caca_event_t *);
 #endif
 

libcaca/trunk/caca/driver_conio.c

@@ -120 +120 @@
 }
 
-static int conio_get_event(caca_t *kk, struct caca_event *ev)
+static int conio_get_event(caca_t *kk, caca_event_t *ev)
 {
     unsigned char ch;
-    struct caca_event release;
+    caca_event_t release;
 
     if(!_conio_kbhit())

libcaca/trunk/caca/driver_gl.c

@@ -324 +324 @@
 }
 
-static int gl_get_event(caca_t *kk, struct caca_event *ev)
+static int gl_get_event(caca_t *kk, caca_event_t *ev)
 {
 #ifdef HAVE_GLUTCHECKLOOP

libcaca/trunk/caca/driver_ncurses.c

@@ -225 +225 @@
 }
 
-static int ncurses_get_event(caca_t *kk, struct caca_event *ev)
+static int ncurses_get_event(caca_t *kk, caca_event_t *ev)
 {
     int intkey;

libcaca/trunk/caca/driver_raw.c

@@ -85 +85 @@
 }
 
-static int raw_get_event(caca_t *kk, struct caca_event *ev)
+static int raw_get_event(caca_t *kk, caca_event_t *ev)
 {
     ev->type = CACA_EVENT_NONE;

libcaca/trunk/caca/driver_slang.c

@@ -253 +253 @@
 }
 
-static int slang_get_event(caca_t *kk, struct caca_event *ev)
+static int slang_get_event(caca_t *kk, caca_event_t *ev)
 {
     int intkey;

libcaca/trunk/caca/driver_vga.c

@@ -133 +133 @@
 }
 
-static int vga_get_event(caca_t *kk, struct caca_event *ev)
+static int vga_get_event(caca_t *kk, caca_event-t *ev)
 {
     /* FIXME */

libcaca/trunk/caca/driver_win32.c

@@ -234 +234 @@
 }
 
-static int win32_get_event(caca_t *kk, struct caca_event *ev)
+static int win32_get_event(caca_t *kk, caca_event_t *ev)
 {
     INPUT_RECORD rec;

libcaca/trunk/caca/driver_x11.c

@@ -405 +405 @@
 }
 
-static int x11_get_event(caca_t *kk, struct caca_event *ev)
+static int x11_get_event(caca_t *kk, caca_event_t *ev)
 {
     XEvent xevent;

libcaca/trunk/caca/event.c

@@ -27 +27 @@
 #include "caca_internals.h"
 
-static int _get_next_event(caca_t *, struct caca_event *);
-static int _lowlevel_event(caca_t *, struct caca_event *);
+static int _get_next_event(caca_t *, caca_event_t *);
+static int _lowlevel_event(caca_t *, caca_event_t *);
 
 #if !defined(_DOXYGEN_SKIP_ME)
@@ -58 +58 @@
  */
 int caca_get_event(caca_t *kk, unsigned int event_mask,
-                   struct caca_event *ev, int timeout)
-{
-    struct caca_timer timer;
+                   caca_event_t *ev, int timeout)
+{
+    caca_timer_t timer;
     int usec = 0;
 
@@ -142 +142 @@
  */
 
-static int _get_next_event(caca_t *kk, struct caca_event *ev)
+static int _get_next_event(caca_t *kk, caca_event_t *ev)
 {
 #if defined(USE_SLANG) || defined(USE_NCURSES)
@@ -224 +224 @@
 }
 
-static int _lowlevel_event(caca_t *kk, struct caca_event *ev)
+static int _lowlevel_event(caca_t *kk, caca_event_t *ev)
 {
 #if defined(USE_SLANG) || defined(USE_NCURSES) || defined(USE_CONIO)
@@ -237 +237 @@
 
 #if defined(USE_SLANG) || defined(USE_NCURSES) || defined(USE_CONIO) || defined(USE_GL)
-void _push_event(caca_t *kk, struct caca_event *ev)
+void _push_event(caca_t *kk, caca_event_t *ev)
 {
     if(!ev->type || kk->events.queue == EVENTBUF_LEN)
@@ -245 +245 @@
 }
 
-int _pop_event(caca_t *kk, struct caca_event *ev)
+int _pop_event(caca_t *kk, caca_event_t *ev)
 {
     int i;

libcaca/trunk/caca/time.c

@@ -46 +46 @@
 }
 
-unsigned int _caca_getticks(struct caca_timer *timer)
+unsigned int _caca_getticks(caca_timer_t *timer)
 {
 #if defined(HAVE_GETTIMEOFDAY)

libcaca/trunk/cucul/cucul.c

@@ -73 +73 @@
 }
 
+/** \brief Load a memory area into a canvas.
+ *
+ *  This function loads a memory area containing an exported canvas into
+ *  a new \e libcucul canvas.
+ *
+ *  \param data The memory area to be loaded into a canvas.
+ *  \param size The length of the memory area.
+ *  \return A libcucul canvas, or NULL in case of error.
+ */
 cucul_t *cucul_load(void *data, unsigned int size)
 {
@@ -228 +237 @@
 }
 
-struct cucul_buffer * cucul_create_export(cucul_t *qq, char const *format)
-{
-    struct cucul_buffer *ex;
-
-    ex = malloc(sizeof(struct cucul_buffer));
+/** \brief Export a canvas into a foreign format.
+ *
+ *  This function exports a libcucul canvas into various foreign formats such
+ *  as ANSI art, HTML, IRC colours, etc. One should use cucul_get_buffer_data()
+ *  and cucul_get_buffer_size() to access the buffer contents. The allocated
+ *  data is valid until cucul_free_buffer() is called.
+ *
+ *  Valid values for \e format are:
+ *
+ *  \li \e "ansi": export ANSI art (CP437 charset with ANSI colour codes).
+ *
+ *  \li \e "html": export an HTML page with CSS information.
+ *
+ *  \li \e "html3": export an HTML table that should be compatible with
+ *      most navigators, including textmode ones.
+ *
+ *  \li \e "irc": export UTF-8 text with mIRC colour codes.
+ *
+ *  \li \e "ps": export a PostScript document.
+ *
+ *  \li \e "svg": export an SVG document.
+ *
+ *  \param qq A libcucul canvas
+ *  \param format A string describing the requested output format.
+ */
+cucul_buffer_t * cucul_create_export(cucul_t *qq, char const *format)
+{
+    cucul_buffer_t *ex;
+
+    ex = malloc(sizeof(cucul_buffer_t));
 
     if(!strcasecmp("ansi", format))
@@ -280 +314 @@
 }
 
-void cucul_free_export(struct cucul_buffer *ex)
-{
-    free(ex->data);
-    free(ex);
+/** \brief Get the buffer size.
+ *
+ *  This function returns the length (in bytes) of the memory area stored
+ *  in the given \e libcucul buffer.
+ *
+ *  \param buf A \e libcucul buffer
+ *  \return The buffer data length.
+ */
+unsigned long int cucul_get_buffer_size(cucul_buffer_t *buf)
+{
+    return buf->size;
+}
+
+/** \brief Get the buffer data.
+ *
+ *  This function returns a pointer to the memory area stored in the given
+ *  \e libcucul buffer.
+ *
+ *  \param buf A \e libcucul buffer
+ *  \return A pointer to the buffer memory area.
+ */
+void * cucul_get_buffer_data(cucul_buffer_t *buf)
+{
+    return buf->data;
+}
+
+/** \brief Free a buffer.
+ *
+ *  This function frees the structures associated with the given
+ *  \e libcucul buffer.
+ *
+ *  \param buf A \e libcucul buffer
+ */
+void cucul_free_buffer(cucul_buffer_t *buf)
+{
+    free(buf->data);
+    free(buf);
 }
 

libcaca/trunk/cucul/cucul.h

@@ -32 +32 @@
 #endif
 
-typedef struct cucul_context cucul_t;
-
-struct cucul_buffer
-{
-    unsigned int size;
-    char *data;
-};
+/** \e libcucul context */
+typedef struct cucul cucul_t;
+/** sprite structure */
+typedef struct cucul_sprite cucul_sprite_t;
+/** dither structure */
+typedef struct cucul_dither cucul_dither_t;
+/** data buffer structure */
+typedef struct cucul_buffer cucul_buffer_t;
+/** font structure */
+typedef struct cucul_font cucul_font_t;
 
 /** \defgroup colour Colour definitions
@@ -65 +68 @@
 /*  @} */
 
-/** \defgroup basic Basic functions
+/** \defgroup cucul Basic libcucul functions
  *
  *  These functions provide the basic \e libcaca routines for library
@@ -77 +80 @@
 unsigned int cucul_get_height(cucul_t *);
 void cucul_free(cucul_t *);
+/*  @} */
+
+/** \defgroup buffer Buffer handling
+ *
+ *  These functions provide methods to handle libcucul buffers.
+ *
+ *  @{ */
+unsigned long int cucul_get_buffer_size(cucul_buffer_t *);
+void * cucul_get_buffer_data(cucul_buffer_t *);
+void cucul_free_buffer(cucul_buffer_t *);
 /*  @} */
 
@@ -145 +158 @@
  *
  *  @{ */
-struct cucul_sprite;
-struct cucul_sprite * cucul_load_sprite(char const *);
-int cucul_get_sprite_frames(struct cucul_sprite const *);
-int cucul_get_sprite_width(struct cucul_sprite const *, int);
-int cucul_get_sprite_height(struct cucul_sprite const *, int);
-int cucul_get_sprite_dx(struct cucul_sprite const *, int);
-int cucul_get_sprite_dy(struct cucul_sprite const *, int);
-void cucul_draw_sprite(cucul_t *, int, int, struct cucul_sprite const *, int);
-void cucul_free_sprite(struct cucul_sprite *);
+cucul_sprite_t * cucul_load_sprite(char const *);
+int cucul_get_sprite_frames(cucul_sprite_t const *);
+int cucul_get_sprite_width(cucul_sprite_t const *, int);
+int cucul_get_sprite_height(cucul_sprite_t const *, int);
+int cucul_get_sprite_dx(cucul_sprite_t const *, int);
+int cucul_get_sprite_dy(cucul_sprite_t const *, int);
+void cucul_draw_sprite(cucul_t *, int, int, cucul_sprite_t const *, int);
+void cucul_free_sprite(cucul_sprite_t *);
 /*  @} */
 
@@ -162 +174 @@
  *
  *  @{ */
-struct cucul_dither;
-struct cucul_dither *cucul_create_dither(unsigned int, unsigned int,
+cucul_dither_t *cucul_create_dither(unsigned int, unsigned int,
                                          unsigned int, unsigned int,
                                          unsigned int, unsigned int,
                                          unsigned int, unsigned int);
-void cucul_set_dither_palette(struct cucul_dither *,
+void cucul_set_dither_palette(cucul_dither_t *,
                               unsigned int r[], unsigned int g[],
                               unsigned int b[], unsigned int a[]);
-void cucul_set_dither_brightness(struct cucul_dither *, float);
-void cucul_set_dither_gamma(struct cucul_dither *, float);
-void cucul_set_dither_contrast(struct cucul_dither *, float);
-void cucul_set_dither_invert(struct cucul_dither *, int);
-void cucul_set_dither_antialias(struct cucul_dither *, char const *);
-char const * const * cucul_get_dither_antialias_list(struct cucul_dither const *);
-void cucul_set_dither_color(struct cucul_dither *, char const *);
-char const * const * cucul_get_dither_color_list(struct cucul_dither const *);
-void cucul_set_dither_charset(struct cucul_dither *, char const *);
-char const * const * cucul_get_dither_charset_list(struct cucul_dither const *);
-void cucul_set_dither_mode(struct cucul_dither *, char const *);
-char const * const * cucul_get_dither_mode_list(struct cucul_dither const *);
+void cucul_set_dither_brightness(cucul_dither_t *, float);
+void cucul_set_dither_gamma(cucul_dither_t *, float);
+void cucul_set_dither_contrast(cucul_dither_t *, float);
+void cucul_set_dither_invert(cucul_dither_t *, int);
+void cucul_set_dither_antialias(cucul_dither_t *, char const *);
+char const * const * cucul_get_dither_antialias_list(cucul_dither_t const *);
+void cucul_set_dither_color(cucul_dither_t *, char const *);
+char const * const * cucul_get_dither_color_list(cucul_dither_t const *);
+void cucul_set_dither_charset(cucul_dither_t *, char const *);
+char const * const * cucul_get_dither_charset_list(cucul_dither_t const *);
+void cucul_set_dither_mode(cucul_dither_t *, char const *);
+char const * const * cucul_get_dither_mode_list(cucul_dither_t const *);
 void cucul_dither_bitmap(cucul_t *, int, int, int, int,
-                         struct cucul_dither const *, void *);
-void cucul_free_dither(struct cucul_dither *);
+                         cucul_dither_t const *, void *);
+void cucul_free_dither(cucul_dither_t *);
 /*  @} */
 
@@ -193 +204 @@
  *
  *  @{ */
-struct cucul_font;
-struct cucul_font *cucul_load_font(void const *, unsigned int);
+cucul_font_t *cucul_load_font(void const *, unsigned int);
 char const * const * cucul_get_font_list(void);
-unsigned int cucul_get_font_width(struct cucul_font *);
-unsigned int cucul_get_font_height(struct cucul_font *);
-void cucul_render_canvas(cucul_t *, struct cucul_font *, unsigned char *,
+unsigned int cucul_get_font_width(cucul_font_t *);
+unsigned int cucul_get_font_height(cucul_font_t *);
+void cucul_render_canvas(cucul_t *, cucul_font_t *, unsigned char *,
                          unsigned int, unsigned int, unsigned int);
-void cucul_free_font(struct cucul_font *);
+void cucul_free_font(cucul_font_t *);
 /*  @} */
 
@@ -206 +216 @@
  *
  *  These functions export the current canvas to various text formats. It
- *  is necessary to call cucul_free_export() to dispose of the data.
- *
- *  @{ */
-struct cucul_buffer * cucul_create_export(cucul_t *, char const *);
+ *  is necessary to call cucul_free_buffer() to dispose of the data.
+ *
+ *  @{ */
+cucul_buffer_t * cucul_create_export(cucul_t *, char const *);
 char const * const * cucul_get_export_list(void);
-void cucul_free_export(struct cucul_buffer *);
 /*  @} */
 

libcaca/trunk/cucul/cucul_internals.h

@@ -26 +26 @@
 #endif
 
-struct cucul_context
+struct cucul
 {
     /* Context size */
@@ -39 +39 @@
 
     unsigned int refcount;
+};
+
+struct cucul_buffer
+{
+    unsigned long int size;
+    char *data;
 };
 
@@ -63 +69 @@
 
 /* Export functions */
-extern void _cucul_get_ansi(cucul_t *, struct cucul_buffer *);
-extern void _cucul_get_html(cucul_t *, struct cucul_buffer *);
-extern void _cucul_get_html3(cucul_t *, struct cucul_buffer *);
-extern void _cucul_get_irc(cucul_t *, struct cucul_buffer *);
-extern void _cucul_get_ps(cucul_t *, struct cucul_buffer *);
-extern void _cucul_get_svg(cucul_t *, struct cucul_buffer *);
+extern void _cucul_get_ansi(cucul_t *, cucul_buffer_t *);
+extern void _cucul_get_html(cucul_t *, cucul_buffer_t *);
+extern void _cucul_get_html3(cucul_t *, cucul_buffer_t *);
+extern void _cucul_get_irc(cucul_t *, cucul_buffer_t *);
+extern void _cucul_get_ps(cucul_t *, cucul_buffer_t *);
+extern void _cucul_get_svg(cucul_t *, cucul_buffer_t *);
 
 #endif /* __CUCUL_INTERNALS_H__ */

libcaca/trunk/cucul/dither.c

@@ -119 +119 @@
     int rright, gright, bright, aright;
     int rleft, gleft, bleft, aleft;
-    void (*get_hsv)(struct cucul_dither *, char *, int, int);
+    void (*get_hsv)(cucul_dither_t *, char *, int, int);
     int red[256], green[256], blue[256], alpha[256];
     float gamma;
@@ -164 +164 @@
 static float gammapow(float x, float y);
 
-static void get_rgba_default(struct cucul_dither const *, uint8_t *, int, int,
+static void get_rgba_default(cucul_dither_t const *, uint8_t *, int, int,
                              unsigned int *);
 
@@ -246 +246 @@
  *  \return Dither object, or NULL upon error.
  */
-struct cucul_dither *cucul_create_dither(unsigned int bpp, unsigned int w,
-                                         unsigned int h, unsigned int pitch,
-                                         unsigned int rmask, unsigned int gmask,
-                                         unsigned int bmask, unsigned int amask)
-{
-    struct cucul_dither *d;
+cucul_dither_t *cucul_create_dither(unsigned int bpp, unsigned int w,
+                                    unsigned int h, unsigned int pitch,
+                                    unsigned int rmask, unsigned int gmask,
+                                    unsigned int bmask, unsigned int amask)
+{
+    cucul_dither_t *d;
     int i;
 
@@ -258 +258 @@
         return NULL;
 
-    d = malloc(sizeof(struct cucul_dither));
+    d = malloc(sizeof(cucul_dither_t));
     if(!d)
         return NULL;
@@ -331 +331 @@
  *  \param alpha Array of 256 alpha values.
  */
-void cucul_set_dither_palette(struct cucul_dither *d,
+void cucul_set_dither_palette(cucul_dither_t *d,
                               unsigned int red[], unsigned int green[],
                               unsigned int blue[], unsigned int alpha[])
@@ -368 +368 @@
  *  \param brightness brightness value.
  */
-void cucul_set_dither_brightness(struct cucul_dither *d, float brightness)
+void cucul_set_dither_brightness(cucul_dither_t *d, float brightness)
 {
     /* FIXME */
@@ -380 +380 @@
  *  \param gamma Gamma value.
  */
-void cucul_set_dither_gamma(struct cucul_dither *d, float gamma)
+void cucul_set_dither_gamma(cucul_dither_t *d, float gamma)
 {
     /* FIXME: we don't need 4096 calls to gammapow(), we can just compute
@@ -403 +403 @@
  *  \param value 0 for normal behaviour, 1 for invert
  */
-void cucul_set_dither_invert(struct cucul_dither *d, int value)
+void cucul_set_dither_invert(cucul_dither_t *d, int value)
 {
     d->invert = value ? 1 : 0;
@@ -415 +415 @@
  *  \param contrast contrast value.
  */
-void cucul_set_dither_contrast(struct cucul_dither *d, float contrast)
+void cucul_set_dither_contrast(cucul_dither_t *d, float contrast)
 {
     /* FIXME */
@@ -434 +434 @@
  *         for the dithering.
  */
-void cucul_set_dither_antialias(struct cucul_dither *d, char const *str)
+void cucul_set_dither_antialias(cucul_dither_t *d, char const *str)
 {
     if(!strcasecmp(str, "none"))
@@ -454 +454 @@
  */
 char const * const *
-    cucul_get_dither_antialias_list(struct cucul_dither const *d)
+    cucul_get_dither_antialias_list(cucul_dither_t const *d)
 {
     static char const * const list[] =
@@ -492 +492 @@
  *         for the dithering.
  */
-void cucul_set_dither_color(struct cucul_dither *d, char const *str)
+void cucul_set_dither_color(cucul_dither_t *d, char const *str)
 {
     if(!strcasecmp(str, "mono"))
@@ -522 +522 @@
  */
 char const * const *
-    cucul_get_dither_color_list(struct cucul_dither const *d)
+    cucul_get_dither_color_list(cucul_dither_t const *d)
 {
     static char const * const list[] =
@@ -557 +557 @@
  *         for the dithering.
  */
-void cucul_set_dither_charset(struct cucul_dither *d, char const *str)
+void cucul_set_dither_charset(cucul_dither_t *d, char const *str)
 {
     if(!strcasecmp(str, "shades"))
@@ -587 +587 @@
  *  \return An array of strings.
  */
-char const * const *
-    cucul_get_dither_charset_list(struct cucul_dither const *d)
+char const * const * cucul_get_dither_charset_list(cucul_dither_t const *d)
 {
     static char const * const list[] =
@@ -623 +622 @@
  *         for the dithering.
  */
-void cucul_set_dither_mode(struct cucul_dither *d, char const *str)
+void cucul_set_dither_mode(cucul_dither_t *d, char const *str)
 {
     if(!strcasecmp(str, "none"))
@@ -674 +673 @@
  *  \return An array of strings.
  */
-char const * const *
-    cucul_get_dither_mode_list(struct cucul_dither const *d)
+char const * const * cucul_get_dither_mode_list(cucul_dither_t const *d)
 {
     static char const * const list[] =
@@ -705 +703 @@
  */
 void cucul_dither_bitmap(cucul_t *qq, int x1, int y1, int x2, int y2,
-                         struct cucul_dither const *d, void *pixels)
+                         cucul_dither_t const *d, void *pixels)
 {
     int *floyd_steinberg, *fs_r, *fs_g, *fs_b;
@@ -956 +954 @@
  *  \param d Dither object.
  */
-void cucul_free_dither(struct cucul_dither *d)
+void cucul_free_dither(cucul_dither_t *d)
 {
     if(!d)
@@ -1057 +1055 @@
 }
 
-static void get_rgba_default(struct cucul_dither const *d, uint8_t *pixels,
+static void get_rgba_default(cucul_dither_t const *d, uint8_t *pixels,
                              int x, int y, unsigned int *rgba)
 {

libcaca/trunk/cucul/export_ansi.c

@@ -36 +36 @@
  *  \return buffer containing generated ANSI codes as a big string
  */
-void _cucul_get_ansi(cucul_t *qq, struct cucul_buffer *ex)
+void _cucul_get_ansi(cucul_t *qq, cucul_buffer_t *ex)
 {
     static int const palette[] =

libcaca/trunk/cucul/export_html.c

@@ -33 +33 @@
  *  the current image.
  */
-void _cucul_get_html(cucul_t *qq, struct cucul_buffer *ex)
+void _cucul_get_html(cucul_t *qq, cucul_buffer_t *ex)
 {
     static int const palette[] =
@@ -112 +112 @@
  *  a correct header.
  */
-void _cucul_get_html3(cucul_t *qq, struct cucul_buffer *ex)
+void _cucul_get_html3(cucul_t *qq, cucul_buffer_t *ex)
 {
     static int const palette[] =

libcaca/trunk/cucul/export_irc.c

@@ -33 +33 @@
  *  the current image.
  */
-void _cucul_get_irc(cucul_t *qq, struct cucul_buffer *ex)
+void _cucul_get_irc(cucul_t *qq, cucul_buffer_t *ex)
 {
     static int const palette[] =

libcaca/trunk/cucul/export_ps.c

@@ -58 +58 @@
  *  the current image.
  */
-void _cucul_get_ps(cucul_t *qq, struct cucul_buffer *ex)
+void _cucul_get_ps(cucul_t *qq, cucul_buffer_t *ex)
 {
     static char const * const palette[] =

libcaca/trunk/cucul/export_svg.c

@@ -43 +43 @@
  *  the current image.
  */
-void _cucul_get_svg(cucul_t *qq, struct cucul_buffer *ex)
+void _cucul_get_svg(cucul_t *qq, cucul_buffer_t *ex)
 {
     static int const palette[] =

libcaca/trunk/cucul/font.c

@@ -107 +107 @@
  *  \return A font handle or NULL in case of error.
  */
-struct cucul_font *cucul_load_font(void const *data, unsigned int size)
-{
-    struct cucul_font *f;
+cucul_font_t *cucul_load_font(void const *data, unsigned int size)
+{
+    cucul_font_t *f;
     unsigned int i;
 
@@ -125 +125 @@
         return NULL;
 
-    f = malloc(sizeof(struct cucul_font));
+    f = malloc(sizeof(cucul_font_t));
     f->private = (void *)(uintptr_t)data;
 
@@ -222 +222 @@
  *  \return The maximum glyph width.
  */
-unsigned int cucul_get_font_width(struct cucul_font *f)
+unsigned int cucul_get_font_width(cucul_font_t *f)
 {
     return f->header.width;
@@ -234 +234 @@
  *  \return The maximum glyph height.
  */
-unsigned int cucul_get_font_height(struct cucul_font *f)
+unsigned int cucul_get_font_height(cucul_font_t *f)
 {
     return f->header.height;
@@ -248 +248 @@
  *  \param f The font, as returned by \e cucul_load_font()
  */
-void cucul_free_font(struct cucul_font *f)
+void cucul_free_font(cucul_font_t *f)
 {
     free(f->glyph_list);
@@ -274 +274 @@
  *  \param pitch The pitch (in bytes) of an image buffer line.
  */
-void cucul_render_canvas(cucul_t *qq, struct cucul_font *f,
+void cucul_render_canvas(cucul_t *qq, cucul_font_t *f,
                          unsigned char *buf, unsigned int width,
                          unsigned int height, unsigned int pitch)

libcaca/trunk/cucul/sprite.c

@@ -48 +48 @@
  *  \return The sprite, or NULL if an error occured.
  */
-struct cucul_sprite *cucul_load_sprite(char const *file)
+cucul_sprite_t *cucul_load_sprite(char const *file)
 {
     char buf[BUFSIZ];
-    struct cucul_sprite *sprite;
+    cucul_sprite_t *sprite;
     FILE *fd;
 
@@ -58 +58 @@
         return NULL;
 
-    sprite = malloc(sizeof(struct cucul_sprite));
+    sprite = malloc(sizeof(cucul_sprite_t));
     if(sprite == NULL)
         goto sprite_alloc_failed;
@@ -168 +168 @@
  *  \return The number of frames.
  */
-int cucul_get_sprite_frames(struct cucul_sprite const *sprite)
+int cucul_get_sprite_frames(cucul_sprite_t const *sprite)
 {
     if(sprite == NULL)
@@ -182 +182 @@
  *  \return The width of the given frame of the sprite.
  */
-int cucul_get_sprite_width(struct cucul_sprite const *sprite, int f)
+int cucul_get_sprite_width(cucul_sprite_t const *sprite, int f)
 {
     if(sprite == NULL)
@@ -199 +199 @@
  *  \return The height of the given frame of the sprite.
  */
-int cucul_get_sprite_height(struct cucul_sprite const *sprite, int f)
+int cucul_get_sprite_height(cucul_sprite_t const *sprite, int f)
 {
     if(sprite == NULL)
@@ -216 +216 @@
  *  \return The X coordinate of the given frame's handle.
  */
-int cucul_get_sprite_dx(struct cucul_sprite const *sprite, int f)
+int cucul_get_sprite_dx(cucul_sprite_t const *sprite, int f)
 {
     if(sprite == NULL)
@@ -233 +233 @@
  *  \return The Y coordinate of the given frame's handle.
  */
-int cucul_get_sprite_dy(struct cucul_sprite const *sprite, int f)
+int cucul_get_sprite_dy(cucul_sprite_t const *sprite, int f)
 {
     if(sprite == NULL)
@@ -254 +254 @@
  *  \return void
  */
-void cucul_draw_sprite(cucul_t *qq, int x, int y, struct cucul_sprite const *sprite, int f)
+void cucul_draw_sprite(cucul_t *qq, int x, int y, cucul_sprite_t const *sprite, int f)
 {
     int i, j;
@@ -293 +293 @@
  *  \return void
  */
-void cucul_free_sprite(struct cucul_sprite *sprite)
+void cucul_free_sprite(cucul_sprite_t *sprite)
 {
     int i;

libcaca/trunk/src/aafire.c

@@ -43 +43 @@
 static caca_t *kk;
 static int XSIZ, YSIZ;
-static struct cucul_dither *cucul_dither;
+static cucul_dither_t *cucul_dither;
 static char *bitmap;
 static int pause = 0;
@@ -266 +266 @@
     {
 #ifdef LIBCACA
-      struct caca_event ev;
+      caca_event_t ev;
       if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0))
         {

libcaca/trunk/src/cacaball.c

@@ -47 +47 @@
     float d[METABALLS], di[METABALLS], dj[METABALLS], dk[METABALLS];
     unsigned int x[METABALLS], y[METABALLS];
-    struct cucul_dither *cucul_dither;
+    cucul_dither_t *cucul_dither;
     float i = 10.0, j = 17.0, k = 11.0;
     int p, frame = 0, pause = 0;
@@ -93 +93 @@
     for(;;)
     {
-        struct caca_event ev;
+        caca_event_t ev;
         if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0))
         {

libcaca/trunk/src/cacamoir.c

@@ -40 +40 @@
     cucul_t *qq; caca_t *kk;
     unsigned int red[256], green[256], blue[256], alpha[256];
-    struct cucul_dither *dither;
+    cucul_dither_t *dither;
     int i, x, y, frame = 0, pause = 0;
 
@@ -69 +69 @@
     for(;;)
     {
-        struct caca_event ev;
+        caca_event_t ev;
         if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0))
         {

libcaca/trunk/src/cacaplas.c

@@ -44 +44 @@
     unsigned int red[256], green[256], blue[256], alpha[256];
     double r[3], R[6];
-    struct cucul_dither *dither;
+    cucul_dither_t *dither;
     int i, x, y, frame = 0, pause = 0;
 
@@ -85 +85 @@
     for(;;) 
     {
-        struct caca_event ev;
+        caca_event_t ev;
         if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0))
         {

libcaca/trunk/src/cacaplay.c

@@ -27 +27 @@
 {
     struct stat statbuf;
-    struct caca_event ev;
+    caca_event_t ev;
     cucul_t *qq;
     caca_t *kk;

libcaca/trunk/src/cacaserver.c

@@ -106 +106 @@
 
     cucul_t *qq;
-    struct cucul_buffer *ex;
+    cucul_buffer_t *buffer;
+    unsigned long int buflen;
+    void *bufdata;
 
     int client_count;
@@ -184 +186 @@
 
     server->qq = NULL;
-    server->ex = NULL;
+    server->buffer = NULL;
 
     /* Ignore SIGPIPE */
@@ -231 +233 @@
 
         /* Free the previous export buffer, if any */
-        if(server->ex)
-        {
-            cucul_free_export(server->ex);
-            server->ex = NULL;
+        if(server->buffer)
+        {
+            cucul_free_buffer(server->buffer);
+            server->buffer = NULL;
         }
 
         /* Get ANSI representation of the image and skip the end-of buffer
          * linefeed ("\r\n\0", 3 bytes) */
-        server->ex = cucul_create_export(server->qq, "ansi");
-        server->ex->size -= 3;
+        server->buffer = cucul_create_export(server->qq, "ansi");
+        server->buflen -= 3;
 
         for(i = 0; i < server->client_count; i++)
@@ -267 +269 @@
     }
 
-    if(server->ex)
-        cucul_free_export(server->ex);
+    if(server->buffer)
+        cucul_free_buffer(server->buffer);
 
     /* Restore SIGPIPE handler */
@@ -396 +398 @@
 
     /* No error, there's just nothing to send yet */
-    if(!server->ex)
+    if(!server->buffer)
         return 0;
 
@@ -421 +423 @@
             c->start += ret;
 
-            if(c->stop - c->start + strlen(ANSI_PREFIX) + server->ex->size
+            if(c->stop - c->start + strlen(ANSI_PREFIX) + server->buflen
                 > OUTBUFFER)
             {
@@ -432 +434 @@
 
             /* Need to move? */
-            if(c->stop + strlen(ANSI_PREFIX) + server->ex->size > OUTBUFFER)
+            if(c->stop + strlen(ANSI_PREFIX) + server->buflen > OUTBUFFER)
             {
                 memmove(c->outbuf, c->outbuf + c->start, c->stop - c->start);
@@ -441 +443 @@
             memcpy(c->outbuf + c->stop, ANSI_PREFIX, strlen(ANSI_PREFIX));
             c->stop += strlen(ANSI_PREFIX);
-            memcpy(c->outbuf + c->stop, server->ex->data, server->ex->size);
-            c->stop += server->ex->size;
+            memcpy(c->outbuf + c->stop, server->bufdata, server->buflen);
+            c->stop += server->buflen;
 
             return 0;
@@ -462 +464 @@
     if(ret < (ssize_t)strlen(ANSI_PREFIX))
     {
-        if(strlen(ANSI_PREFIX) + server->ex->size > OUTBUFFER)
+        if(strlen(ANSI_PREFIX) + server->buflen > OUTBUFFER)
         {
             /* Overflow! Empty buffer and start again */
@@ -473 +475 @@
         memcpy(c->outbuf, ANSI_PREFIX, strlen(ANSI_PREFIX) - ret);
         c->stop = strlen(ANSI_PREFIX) - ret;
-        memcpy(c->outbuf + c->stop, server->ex->data, server->ex->size);
-        c->stop += server->ex->size;
+        memcpy(c->outbuf + c->stop, server->bufdata, server->buflen);
+        c->stop += server->buflen;
 
         return 0;
@@ -480 +482 @@
 
     /* Send actual data */
-    ret = nonblock_write(c->fd, server->ex->data, server->ex->size);
+    ret = nonblock_write(c->fd, server->bufdata, server->buflen);
     if(ret == -1)
     {
@@ -489 +491 @@
     }
 
-    if(ret < (int)server->ex->size)
-    {
-        if(server->ex->size > OUTBUFFER)
+    if(ret < (int)server->buflen)
+    {
+        if(server->buflen > OUTBUFFER)
         {
             /* Overflow! Empty buffer and start again */
@@ -500 +502 @@
         }
 
-        memcpy(c->outbuf, server->ex->data, server->ex->size - ret);
-        c->stop = server->ex->size - ret;
+        memcpy(c->outbuf, server->bufdata, server->buflen - ret);
+        c->stop = server->buflen - ret;
 
         return 0;

libcaca/trunk/src/cacaview.c

@@ -124 +124 @@
     while(!quit)
     {
-        struct caca_event ev;
+        caca_event_t ev;
         unsigned int const event_mask = CACA_EVENT_KEY_PRESS
                                       | CACA_EVENT_RESIZE

libcaca/trunk/src/img2irc.c

@@ -25 +25 @@
     /* libcucul context */
     cucul_t *qq;
-    struct cucul_buffer *export;
+    cucul_buffer_t *export;
     struct image *i;
     int cols = 56, lines;
@@ -60 +60 @@
 
     export = cucul_create_export(qq, "irc");
-    fwrite(export->data, export->size, 1, stdout);
-    cucul_free_export(export);
+    fwrite(cucul_get_buffer_data(export),
+           cucul_get_buffer_size(export), 1, stdout);
+    cucul_free_buffer(export);
 
     cucul_free(qq);

libcaca/trunk/test/colors.c

@@ -25 +25 @@
     cucul_t *qq;
     caca_t *kk;
-    struct caca_event ev;
+    caca_event_t ev;
     int i, j;
 

libcaca/trunk/test/demo.c

@@ -36 +36 @@
 int outline = 0;
 int dithering = 0;
-struct cucul_sprite *sprite = NULL;
+cucul_sprite_t *sprite = NULL;
 
 cucul_t *qq;
@@ -72 +72 @@
     while(!quit)
     {
-        struct caca_event ev;
+        caca_event_t ev;
         int menu = 0, mouse = 0, xmouse = 0, ymouse = 0;
 
@@ -484 +484 @@
 static void demo_render(void)
 {
-    struct cucul_dither *dither;
+    cucul_dither_t *dither;
     //short buffer[256*256];
     //short *dest = buffer;
@@ -514 +514 @@
 static void demo_render(void)
 {
-    struct cucul_dither *dither;
+    cucul_dither_t *dither;
     int buffer[256*256];
     int *dest;

libcaca/trunk/test/dithering.c

@@ -35 +35 @@
 int main(void)
 {
-    struct caca_event ev;
+    caca_event_t ev;
     cucul_t *qq;
     caca_t *kk;

libcaca/trunk/test/event.c

@@ -24 +24 @@
 static caca_t *kk;
 
-static void print_event(int, int, struct caca_event *);
+static void print_event(int, int, caca_event_t *);
 
 int main(int argc, char **argv)
 {
-    struct caca_event *events;
+    caca_event_t *events;
     int i, h, quit;
 
@@ -48 +48 @@
     caca_display(kk);
 
-    events = malloc(h * sizeof(struct caca_event));
-    memset(events, 0, h * sizeof(struct caca_event));
+    events = malloc(h * sizeof(caca_event_t));
+    memset(events, 0, h * sizeof(caca_event_t));
 
     for(quit = 0; quit < 4; )
     {
-        struct caca_event ev;
+        caca_event_t ev;
         static char const * quit_string[] = { "", "q", "qu", "qui", "quit" };
         int ret = caca_get_event(kk, CACA_EVENT_ANY, &ev, -1);
@@ -75 +75 @@
             }
 
-            memmove(events + 1, events, (h - 1) * sizeof(struct caca_event));
+            memmove(events + 1, events, (h - 1) * sizeof(caca_event_t));
             events[0] = ev;
 
@@ -107 +107 @@
 }
 
-static void print_event(int x, int y, struct caca_event *ev)
+static void print_event(int x, int y, caca_event_t *ev)
 {
     int character;

libcaca/trunk/test/export.c

@@ -36 +36 @@
 {
     cucul_t *qq;
-    struct cucul_dither *dither;
-    struct cucul_buffer *buffer;
+    cucul_dither_t *dither;
+    cucul_buffer_t *buffer;
     int x, y;
 
@@ -91 +91 @@
 
     buffer = cucul_create_export(qq, argv[1]);
-    fwrite(buffer->data, buffer->size, 1, stdout);
-    cucul_free_export(buffer);
+    fwrite(cucul_get_buffer_data(buffer),
+           cucul_get_buffer_size(buffer), 1, stdout);
+    cucul_free_buffer(buffer);
 
     cucul_free(qq);

libcaca/trunk/test/font.c

@@ -37 +37 @@
     cucul_t *qq;
     caca_t *kk;
-    struct cucul_font *f;
-    struct cucul_dither *d;
-    struct caca_event ev;
+    cucul_font_t *f;
+    cucul_dither_t *d;
+    caca_event_t ev;
     unsigned char *buf;
     unsigned int w, h;

libcaca/trunk/test/gamma.c

@@ -34 +34 @@
 int main(void)
 {
-    struct caca_event ev;
+    caca_event_t ev;
     cucul_t *qq, *gg, *mask;
     caca_t *kk;
-    struct cucul_dither *left, *right;
+    cucul_dither_t *left, *right;
     float gam = 1.0;
     int x;

libcaca/trunk/test/hsv.c

@@ -29 +29 @@
 int main(void)
 {
-    struct caca_event ev;
+    caca_event_t ev;
     cucul_t *qq;
     caca_t *kk;
 
-    struct cucul_dither *dither;
+    cucul_dither_t *dither;
     int x, y;
 

libcaca/trunk/test/spritedit.c

@@ -27 +27 @@
 
     int quit = 0;
-    struct cucul_sprite *sprite;
+    cucul_sprite_t *sprite;
     int frame = 0;
     unsigned char play = 0;
@@ -58 +58 @@
     while(!quit)
     {
-        struct caca_event ev;
+        caca_event_t ev;
         int xa, ya, xb, yb;
         char buf[BUFSIZ];

libcaca/trunk/test/transform.c

@@ -50 +50 @@
 int main(void)
 {
-    struct caca_event ev;
+    caca_event_t ev;
     cucul_t *qq, *normal, *flip, *flop, *rotate;
     caca_t *kk;

libcaca/trunk/test/unicode.c

@@ -27 +27 @@
 int main(void)
 {
-    struct caca_event ev;
+    caca_event_t ev;
     cucul_t *qq;
     caca_t *kk;