Changeset 2305 for libcacaTweet

Timestamp:

Apr 19, 2008, 9:25:52 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Remove all unsigned ints from exported functions. Signed arithmetic is far better for error checking.

Location:

libcaca/trunk

Files:

• caca/caca.h (modified) (5 diffs)
• caca/caca_internals.h (modified) (6 diffs)
• caca/driver_cocoa.m (modified) (11 diffs)
• caca/driver_conio.c (modified) (3 diffs)
• caca/driver_gl.c (modified) (5 diffs)
• caca/driver_ncurses.c (modified) (5 diffs)
• caca/driver_raw.c (modified) (3 diffs)
• caca/driver_slang.c (modified) (5 diffs)
• caca/driver_vga.c (modified) (3 diffs)
• caca/driver_win32.c (modified) (5 diffs)
• caca/driver_x11.c (modified) (9 diffs)
• caca/event.c (modified) (10 diffs)
• caca/graphics.c (modified) (4 diffs)
• caca/time.c (modified) (3 diffs)
• cucul/canvas.c (modified) (7 diffs)
• cucul/cucul.c (modified) (10 diffs)
• cucul/cucul.h (modified) (7 diffs)
• cucul/cucul_internals.h (modified) (3 diffs)
• cucul/dither.c (modified) (17 diffs)
• cucul/export.c (modified) (12 diffs)
• cucul/figfont.c (modified) (5 diffs)
• cucul/font.c (modified) (8 diffs)
• cucul/frame.c (modified) (5 diffs)
• cucul/transform.c (modified) (8 diffs)
• examples/text.c (modified) (1 diff)

libcaca/trunk/caca/caca.h

@@ -28 +28 @@
 
 #undef __extern
-#if defined(_WIN32) && defined(__LIBCACA__)
+#if defined(_DOXYGEN_SKIP_ME)
+#elif defined(_WIN32) && defined(__LIBCACA__)
 #   define __extern extern __declspec(dllexport)
 #else
@@ -80 +81 @@
     union
     {
-        struct { unsigned int x, y, button; } mouse;
-        struct { unsigned int w, h; } resize;
-        struct { unsigned int ch; uint32_t utf32; char utf8[8]; } key;
+        struct { int x, y, button; } mouse;
+        struct { int w, h; } resize;
+        struct { int ch; uint32_t utf32; char utf8[8]; } key;
     } data;
     uint8_t padding[16];
@@ -171 +172 @@
 __extern cucul_canvas_t * caca_get_canvas(caca_display_t *);
 __extern int caca_refresh_display(caca_display_t *);
-__extern int caca_set_display_time(caca_display_t *, unsigned int);
-__extern unsigned int caca_get_display_time(caca_display_t const *);
-__extern unsigned int caca_get_display_width(caca_display_t const *);
-__extern unsigned int caca_get_display_height(caca_display_t const *);
+__extern int caca_set_display_time(caca_display_t *, int);
+__extern int caca_get_display_time(caca_display_t const *);
+__extern int caca_get_display_width(caca_display_t const *);
+__extern int caca_get_display_height(caca_display_t const *);
 __extern int caca_set_display_title(caca_display_t *, char const *);
 __extern int caca_set_mouse(caca_display_t *, int);
@@ -187 +188 @@
  *
  *  @{ */
-__extern int caca_get_event(caca_display_t *, unsigned int,
-                            caca_event_t *, int);
-__extern unsigned int caca_get_mouse_x(caca_display_t const *);
-__extern unsigned int caca_get_mouse_y(caca_display_t const *);
+__extern int caca_get_event(caca_display_t *, int, caca_event_t *, int);
+__extern int caca_get_mouse_x(caca_display_t const *);
+__extern int caca_get_mouse_y(caca_display_t const *);
 __extern enum caca_event_type caca_get_event_type(caca_event_t const *);
-__extern unsigned int caca_get_event_key_ch(caca_event_t const *);
+__extern int caca_get_event_key_ch(caca_event_t const *);
 __extern uint32_t caca_get_event_key_utf32(caca_event_t const *);
 __extern int caca_get_event_key_utf8(caca_event_t const *, char *);
-__extern unsigned int caca_get_event_mouse_button(caca_event_t const *);
-__extern unsigned int caca_get_event_mouse_x(caca_event_t const *);
-__extern unsigned int caca_get_event_mouse_y(caca_event_t const *);
-__extern unsigned int caca_get_event_resize_width(caca_event_t const *);
-__extern unsigned int caca_get_event_resize_height(caca_event_t const *);
+__extern int caca_get_event_mouse_button(caca_event_t const *);
+__extern int caca_get_event_mouse_x(caca_event_t const *);
+__extern int caca_get_event_mouse_y(caca_event_t const *);
+__extern int caca_get_event_resize_width(caca_event_t const *);
+__extern int caca_get_event_resize_height(caca_event_t const *);
 /*  @} */
 
@@ -206 +206 @@
 #endif
 
-#if !defined(_DOXYGEN_SKIP_ME)
-#   undef __extern
-#endif
+#undef __extern
 
 #endif /* __CACA_H__ */

libcaca/trunk/caca/caca_internals.h

@@ -96 +96 @@
     union
     {
-        struct { unsigned int x, y, button; } mouse;
-        struct { unsigned int w, h; } resize;
-        struct { unsigned int ch; unsigned long int utf32; char utf8[8]; } key;
+        struct { int x, y, button; } mouse;
+        struct { int w, h; } resize;
+        struct { int ch; uint32_t utf32; char utf8[8]; } key;
     } data;
 };
@@ -123 +123 @@
         int (* end_graphics) (caca_display_t *);
         int (* set_display_title) (caca_display_t *, char const *);
-        unsigned int (* get_display_width) (caca_display_t const *);
-        unsigned int (* get_display_height) (caca_display_t const *);
+        int (* get_display_width) (caca_display_t const *);
+        int (* get_display_height) (caca_display_t const *);
         void (* display) (caca_display_t *);
         void (* handle_resize) (caca_display_t *);
@@ -135 +135 @@
     struct mouse
     {
-        unsigned int x, y;
+        int x, y;
     } mouse;
 
@@ -143 +143 @@
         int resized;   /* A resize event was requested */
         int allow;     /* The display driver allows resizing */
-        unsigned w, h; /* Requested width and height */
+        int w, h; /* Requested width and height */
     } resize;
 
     /* Framerate handling */
-    unsigned int delay, rendertime;
+    int delay, rendertime;
     caca_timer_t timer;
     int lastticks;
@@ -159 +159 @@
 #if defined(USE_SLANG) || defined(USE_NCURSES)
         caca_timer_t key_timer;
-        unsigned int last_key_ticks;
-        unsigned int autorepeat_ticks;
+        int last_key_ticks;
+        int autorepeat_ticks;
         caca_privevent_t last_key_event;
 #endif
 #if defined(USE_WIN32)
-        unsigned char not_empty_struct;
+        uint8_t not_empty_struct;
 #endif
     } events;
@@ -170 +170 @@
 
 /* Internal timer functions */
-extern void _caca_sleep(unsigned int);
-extern unsigned int _caca_getticks(caca_timer_t *);
+extern void _caca_sleep(int);
+extern int _caca_getticks(caca_timer_t *);
 
 /* Internal event functions */

libcaca/trunk/caca/driver_cocoa.m

@@ -63 +63 @@
     //NSFont* _font;
     NSRect _font_rect;
-    unsigned int _h, _w;
+    int _h, _w;
     uint32_t* _attrs;
     uint32_t* _chars;
@@ -100 +100 @@
 
 #ifdef PRECACHE_WHOLE_COLOR_TABLE
-    unsigned int i;
+    int i;
     for(i = 0; i < NCOLORS; i++)
         _colorCache[i] = [[NSColor colorFromRgb12:i] retain];
@@ -126 +126 @@
     //[_font release];
 #ifdef PRECACHE_WHOLE_COLOR_TABLE
-    unsigned short i;
+    short i;
     for(i = 0; i < NCOLORS; i++)
         [_colorCache[i] release];
@@ -249 +249 @@
     }
 
-    unsigned int x, y;
+    int x, y;
     float fw = _font_rect.size.width;
     float fh = _font_rect.size.height;
@@ -259 +259 @@
     NSRectFill(rect);
 
-    unsigned int arrayLength = 0;
+    int arrayLength = 0;
     for(y = 0; y < _h; y++)
     {
-        unsigned int yoff = y * fh;
+        int yoff = y * fh;
         for(x = 0; x < _w; x++)
         {
@@ -308 +308 @@
     for(y = 0; y < _h; y++)
     {
-        unsigned int yoff = y * fh;
+        int yoff = y * fh;
         for(x = 0; x < _w; x++, chars++)
         {
@@ -598 +598 @@
 }
 
-static unsigned int get_caca_keycode(NSEvent* event)
-{
-    unsigned int caca_keycode = 0;
+static int get_caca_keycode(NSEvent* event)
+{
+    int caca_keycode = 0;
     /*
     unsigned short mac_keycode = [event keyCode];
@@ -748 +748 @@
     }
 
-    unsigned int caca_keycode = get_caca_keycode(event);
+    int caca_keycode = get_caca_keycode(event);
     if(caca_keycode)
     {
@@ -801 +801 @@
         {
             NSPoint mouseLoc = [NSEvent mouseLocation];
-            unsigned int mouse_x = round(mouseLoc.x);
-            unsigned int mouse_y = round(mouseLoc.y);
+            int mouse_x = round(mouseLoc.x);
+            int mouse_y = round(mouseLoc.y);
             if(dp->mouse.x == mouse_x && dp->mouse.y == mouse_y)
                 break;
@@ -827 +827 @@
 static int cocoa_init_graphics(caca_display_t *dp)
 {
-    unsigned int width = cucul_get_canvas_width(dp->cv);
-    unsigned int height = cucul_get_canvas_height(dp->cv);
+    int width = cucul_get_canvas_width(dp->cv);
+    int height = cucul_get_canvas_height(dp->cv);
 
     debug_log(@"%s dp->cv: %ux%u", __PRETTY_FUNCTION__, width, height);
@@ -971 +971 @@
 }
 
-static unsigned int cocoa_get_display_width(caca_display_t const *dp)
+static int cocoa_get_display_width(caca_display_t const *dp)
 {
     return [dp->drv.p->window frame].size.width;
 }
 
-static unsigned int cocoa_get_display_height(caca_display_t const *dp)
+static int cocoa_get_display_height(caca_display_t const *dp)
 {
     return [dp->drv.p->window frame].size.height;

libcaca/trunk/caca/driver_conio.c

@@ -85 +85 @@
 }
 
-static unsigned int conio_get_display_width(caca_display_t const *dp)
+static int conio_get_display_width(caca_display_t const *dp)
 {
     /* Fallback to a 6x10 font */
@@ -91 +91 @@
 }
 
-static unsigned int conio_get_display_height(caca_display_t const *dp)
+static int conio_get_display_height(caca_display_t const *dp)
 {
     /* Fallback to a 6x10 font */
@@ -102 +102 @@
     uint32_t const *chars = (uint32_t const *)cucul_get_canvas_chars(dp->cv);
     uint32_t const *attrs = (uint32_t const *)cucul_get_canvas_attrs(dp->cv);
-    unsigned int width = cucul_get_canvas_width(dp->cv);
-    unsigned int height = cucul_get_canvas_height(dp->cv);
-    unsigned int n;
+    int width = cucul_get_canvas_width(dp->cv);
+    int height = cucul_get_canvas_height(dp->cv);
+    int n;
 
     for(n = height * width; n--; )

libcaca/trunk/caca/driver_gl.c

@@ -64 +64 @@
 {
     int window;
-    unsigned int width, height;
-    unsigned int new_width, new_height;
+    int width, height;
+    int new_width, new_height;
     cucul_font_t *f;
     float font_width, font_height;
@@ -74 +74 @@
     uint8_t bit;
     uint8_t mouse_changed, mouse_clicked;
-    unsigned int mouse_x, mouse_y;
-    unsigned int mouse_button, mouse_state;
+    int mouse_x, mouse_y;
+    int mouse_button, mouse_state;
 
     uint8_t key;
@@ -88 +88 @@
     char *argv[2] = { "", NULL };
     char const * const * fonts;
-    unsigned int width = cucul_get_canvas_width(dp->cv);
-    unsigned int height = cucul_get_canvas_height(dp->cv);
+    int width = cucul_get_canvas_width(dp->cv);
+    int height = cucul_get_canvas_height(dp->cv);
     int argc = 1;
 
@@ -205 +205 @@
 }
 
-static unsigned int gl_get_display_width(caca_display_t const *dp)
+static int gl_get_display_width(caca_display_t const *dp)
 {
     return dp->drv.p->width;
 }
 
-static unsigned int gl_get_display_height(caca_display_t const *dp)
+static int gl_get_display_height(caca_display_t const *dp)
 {
     return dp->drv.p->height;
@@ -219 +219 @@
     uint32_t const *cvchars = (uint32_t const *)cucul_get_canvas_chars(dp->cv);
     uint32_t const *cvattrs = (uint32_t const *)cucul_get_canvas_attrs(dp->cv);
-    unsigned int width = cucul_get_canvas_width(dp->cv);
-    unsigned int x, y, line;
+    int width = cucul_get_canvas_width(dp->cv);
+    int x, y, line;
 
     glClear(GL_COLOR_BUFFER_BIT);

libcaca/trunk/caca/driver_ncurses.c

@@ -333 +333 @@
 }
 
-static unsigned int ncurses_get_display_width(caca_display_t const *dp)
+static int ncurses_get_display_width(caca_display_t const *dp)
 {
     /* Fallback to a 6x10 font */
@@ -339 +339 @@
 }
 
-static unsigned int ncurses_get_display_height(caca_display_t const *dp)
+static int ncurses_get_display_height(caca_display_t const *dp)
 {
     /* Fallback to a 6x10 font */
@@ -349 +349 @@
     uint32_t const *cvchars = (uint32_t const *)cucul_get_canvas_chars(dp->cv);
     uint32_t const *cvattrs = (uint32_t const *)cucul_get_canvas_attrs(dp->cv);
-    unsigned int width = cucul_get_canvas_width(dp->cv);
-    unsigned int height = cucul_get_canvas_height(dp->cv);
+    int width = cucul_get_canvas_width(dp->cv);
+    int height = cucul_get_canvas_height(dp->cv);
     int x, y;
 
@@ -421 +421 @@
         char utf8[7];
         uint32_t utf32;
-        unsigned int i;
-        size_t bytes = 0;
+        size_t i, bytes = 0;
 
         keys[0] = intkey;
@@ -496 +495 @@
         }
 
-        if(dp->mouse.x == (unsigned int)mevent.x &&
-           dp->mouse.y == (unsigned int)mevent.y)
+        if(dp->mouse.x == mevent.x && dp->mouse.y == mevent.y)
             return _pop_event(dp, ev);
 

libcaca/trunk/caca/driver_raw.c

@@ -30 +30 @@
 static int raw_init_graphics(caca_display_t *dp)
 {
-    unsigned int width = cucul_get_canvas_width(dp->cv);
-    unsigned int height = cucul_get_canvas_height(dp->cv);
+    int width = cucul_get_canvas_width(dp->cv);
+    int height = cucul_get_canvas_height(dp->cv);
     char const *geometry;
 
@@ -57 +57 @@
 }
 
-static unsigned int raw_get_display_width(caca_display_t const *dp)
+static int raw_get_display_width(caca_display_t const *dp)
 {
     return 0;
 }
 
-static unsigned int raw_get_display_height(caca_display_t const *dp)
+static int raw_get_display_height(caca_display_t const *dp)
 {
     return 0;
@@ -70 +70 @@
 {
     void *buffer;
-    unsigned long int len;
+    size_t len;
 
     buffer = cucul_export_memory(dp->cv, "caca", &len);

libcaca/trunk/caca/driver_slang.c

@@ -208 +208 @@
 }
 
-static unsigned int slang_get_display_width(caca_display_t const *dp)
+static int slang_get_display_width(caca_display_t const *dp)
 {
     /* Fallback to a 6x10 font */
@@ -214 +214 @@
 }
 
-static unsigned int slang_get_display_height(caca_display_t const *dp)
+static int slang_get_display_height(caca_display_t const *dp)
 {
     /* Fallback to a 6x10 font */
@@ -224 +224 @@
     uint32_t const *cvchars = (uint32_t const *)cucul_get_canvas_chars(dp->cv);
     uint32_t const *cvattrs = (uint32_t const *)cucul_get_canvas_attrs(dp->cv);
-    unsigned int width = cucul_get_canvas_width(dp->cv);
-    unsigned int height = cucul_get_canvas_height(dp->cv);
+    int width = cucul_get_canvas_width(dp->cv);
+    int height = cucul_get_canvas_height(dp->cv);
     int x, y;
 
@@ -329 +329 @@
         char utf8[7];
         uint32_t utf32;
-        unsigned int i;
-        size_t bytes = 0;
+        size_t i, bytes = 0;
 
         keys[0] = intkey;
@@ -362 +361 @@
     {
         int button = (SLang_getkey() - ' ' + 1) & 0xf;
-        unsigned int x = SLang_getkey() - '!';
-        unsigned int y = SLang_getkey() - '!';
+        int x = SLang_getkey() - '!';
+        int y = SLang_getkey() - '!';
 
         ev->data.mouse.button = button;

libcaca/trunk/caca/driver_vga.c

@@ -102 +102 @@
 }
 
-static unsigned int vga_get_display_width(caca_display_t const *dp)
+static int vga_get_display_width(caca_display_t const *dp)
 {
     /* Fallback to a 320x200 screen */
@@ -108 +108 @@
 }
 
-static unsigned int vga_get_display_height(caca_display_t const *dp)
+static int vga_get_display_height(caca_display_t const *dp)
 {
     /* Fallback to a 320x200 screen */
@@ -119 +119 @@
     uint32_t const *cvchars = (uint32_t const *)cucul_get_canvas_chars(dp->cv);
     uint32_t const *cvattrs = (uint32_t const *)cucul_get_canvas_attrs(dp->cv);
-    unsigned int width = cucul_get_canvas_width(dp->cv);
-    unsigned int height = cucul_get_canvas_height(dp->cv);
+    int width = cucul_get_canvas_width(dp->cv);
+    int height = cucul_get_canvas_height(dp->cv);
     int n;
 

libcaca/trunk/caca/driver_win32.c

@@ -83 +83 @@
 static int win32_init_graphics(caca_display_t *dp)
 {
-    unsigned int width = cucul_get_canvas_width(dp->cv);
-    unsigned int height = cucul_get_canvas_height(dp->cv);
+    int width = cucul_get_canvas_width(dp->cv);
+    int height = cucul_get_canvas_height(dp->cv);
     CONSOLE_SCREEN_BUFFER_INFO csbi;
     SMALL_RECT rect;
@@ -176 +176 @@
 }
 
-static unsigned int win32_get_display_width(caca_display_t const *dp)
+static int win32_get_display_width(caca_display_t const *dp)
 {
     /* FIXME */
@@ -184 +184 @@
 }
 
-static unsigned int win32_get_display_height(caca_display_t const *dp)
+static int win32_get_display_height(caca_display_t const *dp)
 {
     /* FIXME */
@@ -199 +199 @@
     uint32_t const *cvchars = (uint32_t const *)cucul_get_canvas_chars(dp->cv);
     uint32_t const *cvattrs = (uint32_t const *)cucul_get_canvas_attrs(dp->cv);
-    unsigned int width = cucul_get_canvas_width(dp->cv);
-    unsigned int height = cucul_get_canvas_height(dp->cv);
-    unsigned int n;
+    int width = cucul_get_canvas_width(dp->cv);
+    int height = cucul_get_canvas_height(dp->cv);
+    int n;
 
     /* Render everything to our screen buffer */
@@ -303 +303 @@
                 COORD pos = rec.Event.MouseEvent.dwMousePosition;
 
-                if(dp->mouse.x == (unsigned int)pos.X &&
-                   dp->mouse.y == (unsigned int)pos.Y)
+                if(dp->mouse.x == pos.X && dp->mouse.y == pos.Y)
                     continue;
 

libcaca/trunk/caca/driver_x11.c

@@ -76 +76 @@
     char const *fonts[] = { NULL, "8x13bold", "fixed" }, **parser;
     char const *geometry;
-    unsigned int width = cucul_get_canvas_width(dp->cv);
-    unsigned int height = cucul_get_canvas_height(dp->cv);
+    int width = cucul_get_canvas_width(dp->cv);
+    int height = cucul_get_canvas_height(dp->cv);
     int i;
 
@@ -112 +112 @@
     for( ; ; parser++)
     {
-        unsigned int font_max_char;
+        uint32_t font_max_char;
 
         if(!*parser)
@@ -144 +144 @@
 
         font_max_char = 
-            (((unsigned int)dp->drv.p->font_struct->max_byte1) << 8)
+            (dp->drv.p->font_struct->max_byte1 << 8)
              | dp->drv.p->font_struct->max_char_or_byte2;
         if(font_max_char && (font_max_char < dp->drv.p->max_char))
@@ -278 +278 @@
 }
 
-static unsigned int x11_get_display_width(caca_display_t const *dp)
+static int x11_get_display_width(caca_display_t const *dp)
 {
     return cucul_get_canvas_width(dp->cv) * dp->drv.p->font_width;
 }
 
-static unsigned int x11_get_display_height(caca_display_t const *dp)
+static int x11_get_display_height(caca_display_t const *dp)
 {
     return cucul_get_canvas_height(dp->cv) * dp->drv.p->font_height;
@@ -292 +292 @@
     uint32_t const *cvchars = (uint32_t const *)cucul_get_canvas_chars(dp->cv);
     uint32_t const *cvattrs = (uint32_t const *)cucul_get_canvas_attrs(dp->cv);
-    unsigned int width = cucul_get_canvas_width(dp->cv);
-    unsigned int height = cucul_get_canvas_height(dp->cv);
-    unsigned int x, y, len;
+    int width = cucul_get_canvas_width(dp->cv);
+    int height = cucul_get_canvas_height(dp->cv);
+    int x, y, len;
 
     /* First draw the background colours. Splitting the process in two
@@ -323 +323 @@
     for(y = 0; y < height; y++)
     {
-        unsigned int yoff = (y + 1) * dp->drv.p->font_height
+        int yoff = (y + 1) * dp->drv.p->font_height
                                     - dp->drv.p->font_offset;
         uint32_t const *chars = cvchars + y * width;
@@ -379 +379 @@
 static int x11_get_event(caca_display_t *dp, caca_privevent_t *ev)
 {
-    unsigned int width = cucul_get_canvas_width(dp->cv);
-    unsigned int height = cucul_get_canvas_height(dp->cv);
+    int width = cucul_get_canvas_width(dp->cv);
+    int height = cucul_get_canvas_height(dp->cv);
     XEvent xevent;
     char key;
@@ -402 +402 @@
         if(xevent.type == ConfigureNotify)
         {
-            unsigned int w, h;
+            int w, h;
 
             w = (xevent.xconfigure.width + dp->drv.p->font_width / 3)
@@ -422 +422 @@
         if(xevent.type == MotionNotify)
         {
-            unsigned int newx = xevent.xmotion.x / dp->drv.p->font_width;
-            unsigned int newy = xevent.xmotion.y / dp->drv.p->font_height;
+            int newx = xevent.xmotion.x / dp->drv.p->font_width;
+            int newy = xevent.xmotion.y / dp->drv.p->font_height;
 
             if(newx >= width)

libcaca/trunk/caca/event.c

@@ -64 +64 @@
  *  \return 1 if a matching event was received, or 0 if the wait timeouted.
  */
-int caca_get_event(caca_display_t *dp, unsigned int event_mask,
+int caca_get_event(caca_display_t *dp, int event_mask,
                    caca_event_t *ev, int timeout)
 {
@@ -128 +128 @@
  *  \return The X mouse coordinate.
  */
-unsigned int caca_get_mouse_x(caca_display_t const *dp)
-{
-    unsigned int width = cucul_get_canvas_width(dp->cv);
+int caca_get_mouse_x(caca_display_t const *dp)
+{
+    int width = cucul_get_canvas_width(dp->cv);
 
     if(dp->mouse.x >= width)
@@ -150 +150 @@
  *  \return The Y mouse coordinate.
  */
-unsigned int caca_get_mouse_y(caca_display_t const *dp)
-{
-    unsigned int height = cucul_get_canvas_height(dp->cv);
+int caca_get_mouse_y(caca_display_t const *dp)
+{
+    int height = cucul_get_canvas_height(dp->cv);
 
     if(dp->mouse.y >= height)
@@ -199 +199 @@
  *  \return The key value.
  */
-unsigned int caca_get_event_key_ch(caca_event_t const *ev)
+int caca_get_event_key_ch(caca_event_t const *ev)
 {
     return ((caca_privevent_t const *)ev)->data.key.ch;
@@ -250 +250 @@
  *  \return The event's mouse button.
  */
-unsigned int caca_get_event_mouse_button(caca_event_t const *ev)
+int caca_get_event_mouse_button(caca_event_t const *ev)
 {
     return ((caca_privevent_t const *)ev)->data.mouse.button;
@@ -266 +266 @@
  *  \return The event's X mouse coordinate.
  */
-unsigned int caca_get_event_mouse_x(caca_event_t const *ev)
+int caca_get_event_mouse_x(caca_event_t const *ev)
 {
     return ((caca_privevent_t const *)ev)->data.mouse.x;
@@ -282 +282 @@
  *  \return The event's Y mouse coordinate.
  */
-unsigned int caca_get_event_mouse_y(caca_event_t const *ev)
+int caca_get_event_mouse_y(caca_event_t const *ev)
 {
     return ((caca_privevent_t const *)ev)->data.mouse.y;
@@ -298 +298 @@
  *  \return The event's new display width value.
  */
-unsigned int caca_get_event_resize_width(caca_event_t const *ev)
+int caca_get_event_resize_width(caca_event_t const *ev)
 {
     return ((caca_privevent_t const *)ev)->data.resize.w;
@@ -314 +314 @@
  *  \return The event's new display height value.
  */
-unsigned int caca_get_event_resize_height(caca_event_t const *ev)
+int caca_get_event_resize_height(caca_event_t const *ev)
 {
     return ((caca_privevent_t const *)ev)->data.resize.h;
@@ -326 +326 @@
 {
 #if defined(USE_SLANG) || defined(USE_NCURSES)
-    unsigned int ticks;
+    int ticks;
 #endif
     int ret;

libcaca/trunk/caca/graphics.c

@@ -63 +63 @@
  *  \return The display width.
  */
-unsigned int caca_get_display_width(caca_display_t const *dp)
+int caca_get_display_width(caca_display_t const *dp)
 {
     return dp->drv.get_display_width(dp);
@@ -80 +80 @@
  *  \return The display height.
  */
-unsigned int caca_get_display_height(caca_display_t const *dp)
+int caca_get_display_height(caca_display_t const *dp)
 {
     return dp->drv.get_display_height(dp);
@@ -94 +94 @@
  *  default behaviour.
  *
- *  This function never fails.
+ *  If an error occurs, -1 is returned and \b errno is set accordingly:
+ *  - \c EINVAL Refresh delay value is invalid.
  *
  *  \param dp The libcaca display context.
  *  \param usec The refresh delay in microseconds.
- *  \return This function always returns 0.
- */
-int caca_set_display_time(caca_display_t *dp, unsigned int usec)
-{
+ *  \return 0 upon success, -1 if an error occurred.
+ */
+int caca_set_display_time(caca_display_t *dp, int usec)
+{
+    if(usec < 0)
+    {
+        seterrno(EINVAL);
+        return -1;
+    }
+
     dp->delay = usec;
     return 0;
@@ -119 +126 @@
  *  \return The render time in microseconds.
  */
-unsigned int caca_get_display_time(caca_display_t const *dp)
+int caca_get_display_time(caca_display_t const *dp)
 {
     return dp->rendertime;

libcaca/trunk/caca/time.c

@@ -36 +36 @@
 #include "caca_internals.h"
 
-void _caca_sleep(unsigned int usec)
+void _caca_sleep(int usec)
 {
 #if defined(HAVE_USLEEP)
@@ -47 +47 @@
 }
 
-unsigned int _caca_getticks(caca_timer_t *timer)
+int _caca_getticks(caca_timer_t *timer)
 {
 #if defined(HAVE_GETTIMEOFDAY)
@@ -53 +53 @@
 #elif defined(USE_WIN32)
     static __int64 freq = -1; /* FIXME: can this move to caca_context? */
-    unsigned __int64 usec;
+    __int64 usec;
 #endif
-    unsigned int ticks = 0;
+    int ticks = 0;
     int new_sec, new_usec;
 

libcaca/trunk/cucul/canvas.c

@@ -300 +300 @@
 {
     uint32_t attr = cv->curattr;
-    unsigned int n;
+    int n;
 
     for(n = cv->width * cv->height; n--; )
@@ -394 +394 @@
     endj = (y + src->height >= dst->height) ? dst->height - y : src->height;
 
-    if((unsigned int)starti > src->width || (unsigned int)startj > src->height
+    if(starti > src->width || startj > src->height
         || starti >= endi || startj >= endj)
         return 0;
@@ -400 +400 @@
     for(j = startj; j < endj; j++)
     {
-        unsigned int dstix = (j + y) * dst->width + starti + x;
-        unsigned int srcix = j * src->width + starti;
+        int dstix = (j + y) * dst->width + starti + x;
+        int srcix = j * src->width + starti;
         int stride = endi - starti;
 
@@ -408 +408 @@
             dst->chars[dstix - 1] = ' ';
 
-        if((unsigned int)(endi + x) < dst->width
+        if(endi + x < dst->width
                 && dst->chars[dstix + stride] == CUCUL_MAGIC_FULLWIDTH)
             dst->chars[dstix + stride] = ' ';
@@ -433 +433 @@
             dst->chars[dstix] = ' ';
 
-        if((unsigned int)endi < src->width
-                && src->chars[endi] == CUCUL_MAGIC_FULLWIDTH)
+        if(endi < src->width && src->chars[endi] == CUCUL_MAGIC_FULLWIDTH)
             dst->chars[dstix + stride - 1] = ' ';
     }
@@ -448 +447 @@
  *
  *  If an error occurs, -1 is returned and \b errno is set accordingly:
+ *  - \c EINVAL Specified width or height is invalid.
  *  - \c EBUSY The canvas is in use by a display driver and cannot be resized.
  *  - \c ENOMEM Not enough memory for the requested canvas size. If this
@@ -459 +459 @@
  *  \return 0 in case of success, -1 if an error occurred.
  */
-int cucul_set_canvas_boundaries(cucul_canvas_t *cv, int x, int y,
-                                unsigned int w, unsigned int h)
+int cucul_set_canvas_boundaries(cucul_canvas_t *cv, int x, int y, int w, int h)
 {
     cucul_canvas_t *new;
-    unsigned int f, saved_f, framecount;
+    int f, saved_f, framecount;
 
     if(cv->refcount)
     {
         seterrno(EBUSY);
+        return -1;
+    }
+
+    if(w < 0 || h < 0)
+    {
+        seterrno(EINVAL);
         return -1;
     }

libcaca/trunk/cucul/cucul.c

@@ -34 +34 @@
 #include "cucul_internals.h"
 
-static int cucul_resize(cucul_canvas_t *, unsigned int, unsigned int);
+static int cucul_resize(cucul_canvas_t *, int, int);
 
 /** \brief Initialise a \e libcucul canvas.
@@ -47 +47 @@
  *
  *  If an error occurs, NULL is returned and \b errno is set accordingly:
+ *  - \c EINVAL Specified width or height is invalid.
  *  - \c ENOMEM Not enough memory for the requested canvas size.
  *
@@ -53 +54 @@
  *  \return A libcucul canvas handle upon success, NULL if an error occurred.
  */
-cucul_canvas_t * cucul_create_canvas(unsigned int width, unsigned int height)
-{
-    cucul_canvas_t *cv = malloc(sizeof(cucul_canvas_t));
+cucul_canvas_t * cucul_create_canvas(int width, int height)
+{
+    cucul_canvas_t *cv;
+
+    if(width < 0 || height < 0)
+    {
+        seterrno(EINVAL);
+        return NULL;
+    }
+
+    cv = malloc(sizeof(cucul_canvas_t));
 
     if(!cv)
@@ -191 +200 @@
  *
  *  If an error occurs, -1 is returned and \b errno is set accordingly:
+ *  - \c EINVAL Specified width or height is invalid.
  *  - \c EBUSY The canvas is in use by a display driver and cannot be resized.
  *  - \c ENOMEM Not enough memory for the requested canvas size. If this
@@ -200 +210 @@
  *  \return 0 in case of success, -1 if an error occurred.
  */
-int cucul_set_canvas_size(cucul_canvas_t *cv, unsigned int width,
-                                              unsigned int height)
-{
+int cucul_set_canvas_size(cucul_canvas_t *cv, int width, int height)
+{
+    if(width < 0 || height < 0)
+    {
+        seterrno(EINVAL);
+        return -1;
+    }
+
     if(cv->refcount && cv->resize_callback
         && !cv->resize_callback(cv->resize_data))
@@ -222 +237 @@
  *  \return The canvas width.
  */
-unsigned int cucul_get_canvas_width(cucul_canvas_t const *cv)
+int cucul_get_canvas_width(cucul_canvas_t const *cv)
 {
     return cv->width;
@@ -236 +251 @@
  *  \return The canvas height.
  */
-unsigned int cucul_get_canvas_height(cucul_canvas_t const *cv)
+int cucul_get_canvas_height(cucul_canvas_t const *cv)
 {
     return cv->height;
@@ -293 +308 @@
 int cucul_free_canvas(cucul_canvas_t *cv)
 {
-    unsigned int f;
+    int f;
 
     if(cv->refcount)
@@ -357 +372 @@
  */
 
-int cucul_resize(cucul_canvas_t *cv, unsigned int width, unsigned int height)
-{
-    unsigned int x, y, f, old_width, old_height, new_size, old_size;
+int cucul_resize(cucul_canvas_t *cv, int width, int height)
+{
+    int x, y, f, old_width, old_height, new_size, old_size;
 
     old_width = cv->width;
@@ -427 +442 @@
         /* New width is smaller. Copy as many lines as possible. Ignore
          * the first line, it is already in place. */
-        unsigned int lines = height < old_height ? height : old_height;
+        int lines = height < old_height ? height : old_height;
 
         for(f = 0; f < cv->framecount; f++)

libcaca/trunk/cucul/cucul.h

@@ -28 +28 @@
 
 #undef __extern
-#if defined(_WIN32) && defined(__LIBCUCUL__)
+#if defined(_DOXYGEN_SKIP_ME)
+#elif defined(_WIN32) && defined(__LIBCUCUL__)
 #   define __extern extern __declspec(dllexport)
 #else
@@ -87 +88 @@
  *
  *  @{ */
-__extern cucul_canvas_t * cucul_create_canvas(unsigned int, unsigned int);
+__extern cucul_canvas_t * cucul_create_canvas(int, int);
 __extern int cucul_manage_canvas(cucul_canvas_t *, int (*)(void *), void *);
 __extern int cucul_unmanage_canvas(cucul_canvas_t *, int (*)(void *), void *);
-__extern int cucul_set_canvas_size(cucul_canvas_t *, unsigned int,
-                                   unsigned int);
-__extern unsigned int cucul_get_canvas_width(cucul_canvas_t const *);
-__extern unsigned int cucul_get_canvas_height(cucul_canvas_t const *);
+__extern int cucul_set_canvas_size(cucul_canvas_t *, int, int);
+__extern int cucul_get_canvas_width(cucul_canvas_t const *);
+__extern int cucul_get_canvas_height(cucul_canvas_t const *);
 __extern uint8_t const * cucul_get_canvas_chars(cucul_canvas_t const *);
 __extern uint8_t const * cucul_get_canvas_attrs(cucul_canvas_t const *);
@@ -126 +126 @@
 __extern int cucul_blit(cucul_canvas_t *, int, int, cucul_canvas_t const *,
                         cucul_canvas_t const *);
-__extern int cucul_set_canvas_boundaries(cucul_canvas_t *, int, int,
-                                         unsigned int, unsigned int);
+__extern int cucul_set_canvas_boundaries(cucul_canvas_t *, int, int, int, int);
 /*  @} */
 
@@ -208 +207 @@
  *
  *  @{ */
-__extern unsigned int cucul_get_frame_count(cucul_canvas_t const *);
-__extern int cucul_set_frame(cucul_canvas_t *, unsigned int);
+__extern int cucul_get_frame_count(cucul_canvas_t const *);
+__extern int cucul_set_frame(cucul_canvas_t *, int);
 __extern char const *cucul_get_frame_name(cucul_canvas_t const *);
 __extern int cucul_set_frame_name(cucul_canvas_t *, char const *);
-__extern int cucul_create_frame(cucul_canvas_t *, unsigned int);
-__extern int cucul_free_frame(cucul_canvas_t *, unsigned int);
+__extern int cucul_create_frame(cucul_canvas_t *, int);
+__extern int cucul_free_frame(cucul_canvas_t *, int);
 /*  @} */
 
@@ -222 +221 @@
  *
  *  @{ */
-__extern cucul_dither_t *cucul_create_dither(unsigned int, unsigned int,
-                                             unsigned int, unsigned int,
+__extern cucul_dither_t *cucul_create_dither(int, int, int, int,
                                              uint32_t, uint32_t,
                                              uint32_t, uint32_t);
 __extern int cucul_set_dither_palette(cucul_dither_t *,
-                                      unsigned int r[], unsigned int g[],
-                                      unsigned int b[], unsigned int a[]);
+                                      uint32_t r[], uint32_t g[],
+                                      uint32_t b[], uint32_t a[]);
 __extern int cucul_set_dither_brightness(cucul_dither_t *, float);
 __extern float cucul_get_dither_brightness(cucul_dither_t const *);
@@ -262 +260 @@
  *
  *  @{ */
-__extern cucul_font_t *cucul_load_font(void const *, unsigned int);
+__extern cucul_font_t *cucul_load_font(void const *, size_t);
 __extern char const * const * cucul_get_font_list(void);
-__extern unsigned int cucul_get_font_width(cucul_font_t const *);
-__extern unsigned int cucul_get_font_height(cucul_font_t const *);
-__extern unsigned int const *cucul_get_font_blocks(cucul_font_t const *);
+__extern int cucul_get_font_width(cucul_font_t const *);
+__extern int cucul_get_font_height(cucul_font_t const *);
+__extern uint32_t const *cucul_get_font_blocks(cucul_font_t const *);
 __extern int cucul_render_canvas(cucul_canvas_t const *, cucul_font_t const *,
-                                 void *, unsigned int, unsigned int,
-                                 unsigned int);
+                                 void *, int, int, int);
 __extern int cucul_free_font(cucul_font_t *);
 /*  @} */
@@ -367 +364 @@
 #endif
 
-#if !defined(_DOXYGEN_SKIP_ME)
-#   undef __extern
-#endif
+#undef __extern
 
 #endif /* __CUCUL_H__ */

libcaca/trunk/cucul/cucul_internals.h

@@ -23 +23 @@
 {
     /* Frame size */
-    unsigned int width, height;
+    int width, height;
 
     /* Cell information */
@@ -44 +44 @@
 
     /* Frame information */
-    unsigned int frame, framecount;
+    int frame, framecount;
     struct cucul_frame *frames;
 
     /* Canvas management */
-    unsigned int refcount;
-    unsigned int autoinc;
+    int refcount;
+    int autoinc;
     int (*resize_callback)(void *);
     void *resize_data;
 
     /* Shortcut to the active frame information */
-    unsigned int width, height;
+    int width, height;
     uint32_t *chars;
     uint32_t *attrs;
@@ -65 +65 @@
 struct cucul_buffer
 {
-    unsigned long int size;
+    size_t size;
     char *data;
     int user_data;

libcaca/trunk/cucul/dither.c

@@ -139 +139 @@
     char const *algo_name;
     void (*init_dither) (int);
-    unsigned int (*get_dither) (void);
+    int (*get_dither) (void);
     void (*increment_dither) (void);
 
     char const *glyph_name;
     uint32_t const * glyphs;
-    unsigned glyph_count;
+    int glyph_count;
 
     int invert;
@@ -179 +179 @@
 /* Dithering algorithms */
 static void init_no_dither(int);
-static unsigned int get_no_dither(void);
+static int get_no_dither(void);
 static void increment_no_dither(void);
 
 static void init_fstein_dither(int);
-static unsigned int get_fstein_dither(void);
+static int get_fstein_dither(void);
 static void increment_fstein_dither(void);
 
 static void init_ordered2_dither(int);
-static unsigned int get_ordered2_dither(void);
+static int get_ordered2_dither(void);
 static void increment_ordered2_dither(void);
 
 static void init_ordered4_dither(int);
-static unsigned int get_ordered4_dither(void);
+static int get_ordered4_dither(void);
 static void increment_ordered4_dither(void);
 
 static void init_ordered8_dither(int);
-static unsigned int get_ordered8_dither(void);
+static int get_ordered8_dither(void);
 static void increment_ordered8_dither(void);
 
 static void init_random_dither(int);
-static unsigned int get_random_dither(void);
+static int get_random_dither(void);
 static void increment_random_dither(void);
 
@@ -261 +261 @@
  *  \return Dither object upon success, NULL if an error occurred.
  */
-cucul_dither_t *cucul_create_dither(unsigned int bpp, unsigned int w,
-                                    unsigned int h, unsigned int pitch,
+cucul_dither_t *cucul_create_dither(int bpp, int w, int h, int pitch,
                                     uint32_t rmask, uint32_t gmask,
                                     uint32_t bmask, uint32_t amask)
@@ -270 +269 @@
 
     /* Minor sanity test */
-    if(!w || !h || !pitch || bpp > 32 || bpp < 8)
+    if(w < 0 || h < 0 || pitch < 0 || bpp > 32 || bpp < 8)
     {
         seterrno(EINVAL);
@@ -374 +373 @@
  */
 int cucul_set_dither_palette(cucul_dither_t *d,
-                             unsigned int red[], unsigned int green[],
-                             unsigned int blue[], unsigned int alpha[])
+                             uint32_t red[], uint32_t green[],
+                             uint32_t blue[], uint32_t alpha[])
 {
     int i, has_alpha = 0;
@@ -947 +946 @@
     uint32_t savedattr;
     int fs_length;
-    int x1, y1, x2, y2, pitch, deltax, deltay;
-    unsigned int dchmax;
+    int x1, y1, x2, y2, pitch, deltax, deltay, dchmax;
 
     if(!d || !pixels)
@@ -982 +980 @@
             x++)
     {
-        unsigned int i;
-        int ch = 0, distmin;
         unsigned int rgba[4];
+        int error[3];
+        int i, ch = 0, distmin;
         int fg_r = 0, fg_g = 0, fg_b = 0, bg_r, bg_g, bg_b;
         int fromx, fromy, tox, toy, myx, myy, dots, dist;
-        int error[3];
-
-        unsigned int outfg = 0, outbg = 0;
+
+        int outfg = 0, outbg = 0;
         uint32_t outch;
 
@@ -1363 +1360 @@
 }
 
-static unsigned int get_no_dither(void)
+static int get_no_dither(void)
 {
     return 0x80;
@@ -1381 +1378 @@
 }
 
-static unsigned int get_fstein_dither(void)
+static int get_fstein_dither(void)
 {
     return 0x80;
@@ -1394 +1391 @@
  * Ordered 2 dithering
  */
-static unsigned int const *ordered2_table;
-static unsigned int ordered2_index;
+static int const *ordered2_table;
+static int ordered2_index;
 
 static void init_ordered2_dither(int line)
 {
-    static unsigned int const dither2x2[] =
+    static int const dither2x2[] =
     {
         0x00, 0x80,
@@ -1409 +1406 @@
 }
 
-static unsigned int get_ordered2_dither(void)
+static int get_ordered2_dither(void)
 {
     return ordered2_table[ordered2_index];
@@ -1426 +1423 @@
                           -2, -7, -8,  3,
                            4, -3, -4, -7};*/
-static unsigned int const *ordered4_table;
-static unsigned int ordered4_index;
+static int const *ordered4_table;
+static int ordered4_index;
 
 static void init_ordered4_dither(int line)
 {
-    static unsigned int const dither4x4[] =
+    static int const dither4x4[] =
     {
         0x00, 0x80, 0x20, 0xa0,
@@ -1443 +1440 @@
 }
 
-static unsigned int get_ordered4_dither(void)
+static int get_ordered4_dither(void)
 {
     return ordered4_table[ordered4_index];
@@ -1456 +1453 @@
  * Ordered 8 dithering
  */
-static unsigned int const *ordered8_table;
-static unsigned int ordered8_index;
+static int const *ordered8_table;
+static int ordered8_index;
 
 static void init_ordered8_dither(int line)
 {
-    static unsigned int const dither8x8[] =
+    static int const dither8x8[] =
     {
         0x00, 0x80, 0x20, 0xa0, 0x08, 0x88, 0x28, 0xa8,
@@ -1477 +1474 @@
 }
 
-static unsigned int get_ordered8_dither(void)
+static int get_ordered8_dither(void)
 {
     return ordered8_table[ordered8_index];
@@ -1495 +1492 @@
 }
 
-static unsigned int get_random_dither(void)
+static int get_random_dither(void)
 {
     return cucul_rand(0x00, 0x100);
@@ -1510 +1507 @@
 static int init_lookup(void)
 {
-    unsigned int v, s, h;
+    int v, s, h;
 
     /* These ones are constant */

libcaca/trunk/cucul/export.c

@@ -163 +163 @@
 {
     char *data, *cur;
-    unsigned int f, n;
+    int f, n;
 
     /* 52 bytes for the header:
@@ -223 +223 @@
 
     char *data, *cur;
-    unsigned int x, y;
+    int x, y;
 
     /* 23 bytes assumed for max length per pixel ('\e[5;1;3x;4y;9x;10ym' plus
@@ -303 +303 @@
 
     char *data, *cur;
-    unsigned int x, y;
+    int x, y;
 
     uint8_t prevfg = -1;
@@ -377 +377 @@
 {
     char *data, *cur;
-    unsigned int x, y, len;
+    int x, y, len;
 
     /* The HTML header: less than 1000 bytes
@@ -459 +459 @@
 {
     char *data, *cur;
-    unsigned int x, y, len;
+    int x, y, len;
 
     /* The HTML table markup: less than 1000 bytes
@@ -483 +483 @@
         for(x = 0; x < cv->width; x += len)
         {
-            unsigned int i, needfont;
+            int i, needfont;
 
             /* Use colspan option to factor cells with same attributes
@@ -560 +560 @@
 {
     char *data, *cur;
-    unsigned int x, y, len;
+    int x, y, len;
 
     /* The font markup: less than 100 bytes
@@ -581 +581 @@
         for(x = 0; x < cv->width; x += len)
         {
-            unsigned int i, needback, needfront;
+            int i, needback, needfront;
 
             /* Use colspan option to factor cells with same attributes
@@ -667 +667 @@
 
     char *data, *cur;
-    unsigned int x, y;
+    int x, y;
 
     /* 14 bytes assumed for max length per pixel. Worst case scenario:
@@ -793 +793 @@
 
     char *data, *cur;
-    unsigned int x, y;
+    int x, y;
 
     /* 200 is arbitrary but should be ok */
@@ -884 +884 @@
 
     char *data, *cur;
-    unsigned int x, y;
+    int x, y;
 
     /* 200 is arbitrary but should be ok */
@@ -965 +965 @@
     char *data, *cur;
     cucul_font_t *f;
-    unsigned int i, w, h;
+    int i, w, h;
 
     fontlist = cucul_get_font_list();

libcaca/trunk/cucul/figfont.c

@@ -34 +34 @@
 struct cucul_figfont
 {
-    unsigned int term_width;
+    int term_width;
     int x, y, w, h, lines;
 
     enum { H_DEFAULT, H_KERN, H_SMUSH, H_NONE, H_OVERLAP } hmode;
-    unsigned int hsmushrule;
+    int hsmushrule;
     uint32_t hardblank;
-    unsigned int height, baseline, max_length;
+    int height, baseline, max_length;
     int old_layout;
-    unsigned int print_direction, full_layout, codetag_count;
-    unsigned int glyphs;
+    int print_direction, full_layout, codetag_count;
+    int glyphs;
     cucul_canvas_t *fontcv, *charcv;
     int *left, *right; /* Unused yet */
-    unsigned int *lookup;
+    uint32_t *lookup;
 };
 
-static uint32_t hsmush(uint32_t ch1, uint32_t ch2, unsigned int rule);
+static uint32_t hsmush(uint32_t ch1, uint32_t ch2, int rule);
 static cucul_figfont_t * open_figfont(char const *);
 static int free_figfont(cucul_figfont_t *);
@@ -131 +131 @@
 {
     cucul_figfont_t *ff = cv->ff;
-    unsigned int c, w, h, x, y, overlap, extra, xleft, xright;
+    int c, w, h, x, y, overlap, extra, xleft, xright;
 
     switch(ch)
@@ -254 +254 @@
 {
     cucul_figfont_t *ff = cv->ff;
-    unsigned int x, y;
+    int x, y;
 
     //ff->torender = cv;
@@ -292 +292 @@
     char *data = NULL;
     cucul_file_t *f;
-    unsigned int i, j, size, comment_lines;
+    int i, j, size, comment_lines;
 
     ff = malloc(sizeof(cucul_figfont_t));
@@ -488 +488 @@
 }
 
-static uint32_t hsmush(uint32_t ch1, uint32_t ch2, unsigned int rule)
+static uint32_t hsmush(uint32_t ch1, uint32_t ch2, int rule)
 {
     /* Rule 1 */

libcaca/trunk/cucul/font.c

@@ -71 +71 @@
 #define DECLARE_UNPACKGLYPH(bpp) \
     static inline void \
-      unpack_glyph ## bpp(uint8_t *glyph, uint8_t *packed_data, \
-                          unsigned int n) \
+      unpack_glyph ## bpp(uint8_t *glyph, uint8_t *packed_data, int n) \
 { \
-    unsigned int i; \
+    int i; \
     \
     for(i = 0; i < n; i++) \
@@ -112 +111 @@
  *  \return A font handle or NULL in case of error.
  */
-cucul_font_t *cucul_load_font(void const *data, unsigned int size)
+cucul_font_t *cucul_load_font(void const *data, size_t size)
 {
     cucul_font_t *f;
-    unsigned int i;
+    int i;
 
     if(size == 0)
@@ -248 +247 @@
                 + f->header.blocks * sizeof(struct block_info),
            f->header.glyphs * sizeof(struct glyph_info));
-    for(i = 0; i < f->header.glyphs; i++)
+    for(i = 0; i < (int)f->header.glyphs; i++)
     {
         f->glyph_list[i].width = hton16(f->glyph_list[i].width);
@@ -325 +324 @@
  *  \return The standard glyph width.
  */
-unsigned int cucul_get_font_width(cucul_font_t const *f)
+int cucul_get_font_width(cucul_font_t const *f)
 {
     return f->header.width;
@@ -340 +339 @@
  *  \return The standard glyph height.
  */
-unsigned int cucul_get_font_height(cucul_font_t const *f)
+int cucul_get_font_height(cucul_font_t const *f)
 {
     return f->header.height;
@@ -405 +404 @@
  *  all. They may be cropped instead in future versions.
  *
- *  This function never fails.
+ *  If an error occurs, -1 is returned and \b errno is set accordingly:
+ *  - \c EINVAL Specified width, height or pitch is invalid.
  *
  *  \param cv The canvas to render
@@ -413 +413 @@
  *  \param height The height (in pixels) of the image buffer
  *  \param pitch The pitch (in bytes) of an image buffer line.
- *  \return This function always returns 0.
+ *  \return 0 in case of success, -1 if an error occurred.
  */
 int cucul_render_canvas(cucul_canvas_t const *cv, cucul_font_t const *f,
-                        void *buf, unsigned int width,
-                        unsigned int height, unsigned int pitch)
+                        void *buf, int width, int height, int pitch)
 {
     uint8_t *glyph = NULL;
-    unsigned int x, y, xmax, ymax;
+    int x, y, xmax, ymax;
+
+    if(width < 0 || height < 0 || pitch < 0)
+    {
+        seterrno(EINVAL);
+        return -1;
+    }
 
     if(f->header.bpp != 8)
@@ -440 +445 @@
         {
             uint8_t argb[8];
-            unsigned int starty = y * f->header.height;
-            unsigned int startx = x * f->header.width;
+            int starty = y * f->header.height;
+            int startx = x * f->header.width;
             uint32_t ch = cv->chars[y * cv->width + x];
             uint32_t attr = cv->attrs[y * cv->width + x];
-            unsigned int b, i, j;
+            int b, i, j;
             struct glyph_info *g;
 

libcaca/trunk/cucul/frame.c

@@ -37 +37 @@
  *  \return The frame count
  */
-unsigned int cucul_get_frame_count(cucul_canvas_t const *cv)
+int cucul_get_frame_count(cucul_canvas_t const *cv)
 {
     return cv->framecount;
@@ -57 +57 @@
  *  \return 0 in case of success, -1 if an error occurred.
  */
-int cucul_set_frame(cucul_canvas_t *cv, unsigned int id)
-{
-    if(id >= cv->framecount)
+int cucul_set_frame(cucul_canvas_t *cv, int id)
+{
+    if(id < 0 || id >= cv->framecount)
     {
         seterrno(EINVAL);
@@ -125 +125 @@
  *  values range from 0 to the current canvas frame count. If the frame
  *  index is greater than or equals the current canvas frame count, the new
- *  frame is appended at the end of the canvas.
+ *  frame is appended at the end of the canvas. If the frame index is less
+ *  than zero, the new frame is inserted at index 0.
  *
  *  The active frame does not change, but its index may be renumbered due
@@ -137 +138 @@
  *  \return 0 in case of success, -1 if an error occurred.
  */
-int cucul_create_frame(cucul_canvas_t *cv, unsigned int id)
-{
-    unsigned int size = cv->width * cv->height;
-    unsigned int f;
-
-    if(id > cv->framecount)
+int cucul_create_frame(cucul_canvas_t *cv, int id)
+{
+    int size = cv->width * cv->height;
+    int f;
+
+    if(id < 0)
+        id = 0;
+    else if(id > cv->framecount)
         id = cv->framecount;
 
@@ -195 +198 @@
  *  \return 0 in case of success, -1 if an error occurred.
  */
-int cucul_free_frame(cucul_canvas_t *cv, unsigned int id)
-{
-    unsigned int f;
-
-    if(id >= cv->framecount)
+int cucul_free_frame(cucul_canvas_t *cv, int id)
+{
+    int f;
+
+    if(id < 0 || id >= cv->framecount)
     {
         seterrno(EINVAL);

libcaca/trunk/cucul/transform.c

@@ -47 +47 @@
 {
     uint32_t *attrs = cv->attrs;
-    unsigned int i;
+    int i;
 
     for(i = cv->height * cv->width; i--; )
@@ -72 +72 @@
 int cucul_flip(cucul_canvas_t *cv)
 {
-    unsigned int y;
+    int y;
 
     for(y = 0; y < cv->height; y++)
@@ -131 +131 @@
 int cucul_flop(cucul_canvas_t *cv)
 {
-    unsigned int x;
+    int x;
 
     for(x = 0; x < cv->width; x++)
@@ -181 +181 @@
     uint32_t *abegin = cv->attrs;
     uint32_t *aend = abegin + cv->width * cv->height - 1;
-    unsigned int y;
+    int y;
 
     while(cbegin < cend)
@@ -243 +243 @@
 {
     uint32_t *newchars, *newattrs;
-    unsigned int x, y, w2, h2;
+    int x, y, w2, h2;
 
     if(cv->refcount)
@@ -360 +360 @@
 {
     uint32_t *newchars, *newattrs;
-    unsigned int x, y, w2, h2;
+    int x, y, w2, h2;
 
     if(cv->refcount)
@@ -475 +475 @@
 {
     uint32_t *newchars, *newattrs;
-    unsigned int x, y;
+    int x, y;
 
     if(cv->refcount)
@@ -566 +566 @@
 {
     uint32_t *newchars, *newattrs;
-    unsigned int x, y;
+    int x, y;
 
     if(cv->refcount)

libcaca/trunk/examples/text.c

@@ -38 +38 @@
     cucul_canvas_t *cv, *pig;
     void *buffer;
-    unsigned long int len;
-    unsigned int i, j;
+    size_t len;
+    int i, j;
 
     pig = cucul_create_canvas(0, 0);