Changeset 247Tweet

Timestamp:

Dec 11, 2003, 5:56:35 PM (19 years ago)

Author:

Sam Hocevar

Message:

• src/caca.c: + Moved global variables to src/graphics.c.
• src/bitmap.c: + Sanitised prototypes.

Location:

libcaca/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• bitmap.c (modified) (2 diffs)
• caca.c (modified) (1 diff)
• caca.h (modified) (1 diff)
• caca_internals.h (modified) (1 diff)
• graphics.c (modified) (1 diff)

libcaca/trunk/src/Makefile.am

@@ -25 +25 @@
 endif
 libcaca_pic_a_SOURCES = $(libcaca_a_SOURCES)
-libcaca_pic_a_CPPFLAGS = -fPIC
+libcaca_pic_a_CPPFLAGS = -fPIC -DPIC
 

libcaca/trunk/src/bitmap.c

@@ -161 +161 @@
 }
 
-struct caca_bitmap *caca_create_bitmap(int bpp, int w, int h, int pitch,
-                                       int rmask, int gmask, int bmask,
-                                       int amask)
+struct caca_bitmap *caca_create_bitmap(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 caca_bitmap *bitmap;
 
-    /* Currently only this format is supported. Will improve later. */
+    /* Minor sanity test */
     if(!w || !h || !pitch || bpp > 32 || bpp < 8)
         return NULL;
@@ -332 +333 @@
 
 void caca_draw_bitmap(int x1, int y1, int x2, int y2,
-                      const struct caca_bitmap *bitmap, char *pixels)
+                      const struct caca_bitmap *bitmap, void *pixels)
 {
 #if !NEW_RENDERER

libcaca/trunk/src/caca.c

@@ -51 +51 @@
 static void caca_init_terminal(void);
 
-char *_caca_empty_line;
-char *_caca_scratch_line;
-
 #if defined(USE_NCURSES)
 static mmask_t oldmask;
-int _caca_attr[16*16];
-#endif
-
-#if defined(USE_CONIO)
-char *_caca_screen;
 #endif
 

libcaca/trunk/src/caca.h

@@ -213 +213 @@
  */
 struct caca_bitmap;
-struct caca_bitmap *caca_create_bitmap(int, int, int, int, int, int, int, int);
+struct caca_bitmap *caca_create_bitmap(unsigned int, unsigned int,
+                                       unsigned int, unsigned int,
+                                       unsigned int, unsigned int,
+                                       unsigned int, unsigned int);
 void caca_set_bitmap_palette(struct caca_bitmap *, unsigned int[],
                              unsigned int[], unsigned int[], unsigned int[]);
-void caca_draw_bitmap(int, int, int, int, const struct caca_bitmap *, char *);
+void caca_draw_bitmap(int, int, int, int, const struct caca_bitmap *, void *);
 void caca_free_bitmap(struct caca_bitmap *);
 

libcaca/trunk/src/caca_internals.h

@@ -33 +33 @@
 extern int _caca_init_graphics(void);
 
-#if defined(USE_NCURSES)
-extern int _caca_attr[];
-#endif
-
-#if defined(USE_CONIO)
-extern struct text_info _ti;
-extern char *_caca_screen;
-#endif
-
 extern unsigned int _caca_width;
 extern unsigned int _caca_height;
 
-extern char *_caca_empty_line;
-extern char *_caca_scratch_line;
-
 #endif /* __CACA_INTERNALS_H__ */

libcaca/trunk/src/graphics.c

@@ -58 +58 @@
 #include "caca_internals.h"
 
-#ifdef USE_CONIO
-static struct text_info ti;
-#endif
-
+/*
+ * Global variables
+ */
 unsigned int _caca_width;
 unsigned int _caca_height;
+
+/*
+ * Local variables
+ */
+#if defined(USE_NCURSES)
+static int _caca_attr[16*16];
+#endif
+
+#if defined(USE_CONIO)
+static struct text_info ti;
+static char *_caca_screen;
+#endif
+
+static char *_caca_empty_line;
+static char *_caca_scratch_line;
 
 static unsigned int _caca_delay;