Changeset 2305 for libcaca/trunk/caca/driver_x11.cTweet

Timestamp:

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

Author:

Sam Hocevar

Message:

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

File:

• libcaca/trunk/caca/driver_x11.c (modified) (9 diffs)

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)