Changeset 524 for libcaca/trunk/examples/aafire.cTweet

Timestamp:

Mar 5, 2006, 7:43:13 PM (17 years ago)

Author:

Sam Hocevar

Message:

A new low-level text management library (canvas for ultrafast compositing

of unicode letters) is now separated from the higher level rendering and I/O
(that is, libcaca). This commit totally breaks the API, but once everything
is polished I will think about source-level backward compatibility. Most
drivers are broken, but X11 still sorta works.

The new design is much more object-oriented and allows having several

active renderers at the same time, changing renderers on the fly, and more
important, having no renderer at all (useful for converters, or when you
want to do your own renderer).

And in case you are still wondering, the libcucul acronym has "Unicode"

because I want to support at least a subset of Unicode. There are awesome
glyphs in it, including the ones inherited from Codepage 437 such as
"gray 25%" that are used in DOS and Win32 ANSI art.

Location:

libcaca/trunk/examples

Files:

• . (modified) (1 prop)
• aafire.c (modified) (6 diffs)

libcaca/trunk/examples

@@ -3 +3 @@
 .libs
 .deps
-cacademo
-cacademo.exe
 caca-spritedit
 caca-spritedit.exe

@@ -3 +3 @@
 .libs
 .deps
-cacademo
-cacademo.exe
 caca-spritedit
 caca-spritedit.exe

libcaca/trunk/examples/aafire.c

@@ -38 +38 @@
 #define MAXTABLE (256*5)
 #ifdef LIBCACA
+static cucul_t *qq;
+static caca_t *kk;
 static int XSIZ, YSIZ;
-static struct caca_bitmap *caca_bitmap;
+static struct cucul_bitmap *cucul_bitmap;
 static char *bitmap;
 static int pause = 0;
@@ -97 +99 @@
 
 #ifdef LIBCACA
-  if (caca_init())
+  qq = cucul_init();
+  if (!qq)
+    {
+      printf ("Failed to initialize libcucul\n");
+      exit (1);
+    }
+  kk = caca_attach(qq);
+  if (!kk)
     {
       printf ("Failed to initialize libcaca\n");
       exit (1);
     }
-  caca_set_delay(10000);
-  XSIZ = caca_get_width() * 2;
-  YSIZ = caca_get_height() * 2 - 4;
+  caca_set_delay(kk, 10000);
+  XSIZ = cucul_get_width(qq) * 2;
+  YSIZ = cucul_get_height(qq) * 2 - 4;
 #else
   context = aa_autoinit (&aa_defparams);
@@ -130 +139 @@
 
 #ifdef LIBCACA
-  caca_bitmap = caca_create_bitmap(8, XSIZ, YSIZ - 2, XSIZ, 0, 0, 0, 0);
-  caca_set_bitmap_palette(caca_bitmap, r, g, b, a);
-  bitmap = malloc(4 * caca_get_width() * caca_get_height() * sizeof(char));
-  memset(bitmap, 0, 4 * caca_get_width() * caca_get_height());
+  cucul_bitmap = cucul_create_bitmap(qq, 8, XSIZ, YSIZ - 2, XSIZ, 0, 0, 0, 0);
+  cucul_set_bitmap_palette(qq, cucul_bitmap, r, g, b, a);
+  bitmap = malloc(4 * cucul_get_width(qq) * cucul_get_height(qq) * sizeof(char));
+  memset(bitmap, 0, 4 * cucul_get_width(qq) * cucul_get_height(qq));
 #else
   aa_hidecursor (context);
@@ -142 +151 @@
 {
 #ifdef LIBCACA
-  caca_end();
+  caca_detach(kk);
+  cucul_end(qq);
 #else
   aa_close (context);
@@ -224 +234 @@
 #ifdef LIBCACA
 paused:
-  caca_draw_bitmap(0, 0, caca_get_width() - 1, caca_get_height() - 1,
-                   caca_bitmap, bitmap);
-  caca_refresh();
+  cucul_draw_bitmap(qq, 0, 0,
+                    cucul_get_width(qq) - 1, cucul_get_height(qq) - 1,
+                    cucul_bitmap, bitmap);
+  caca_refresh(kk);
   /*XSIZ = caca_get_width() * 2;
   YSIZ = caca_get_height() * 2 - 4;*/
@@ -249 +260 @@
     {
 #ifdef LIBCACA
-      switch (caca_get_event(CACA_EVENT_KEY_PRESS))
+      switch (caca_get_event(kk, CACA_EVENT_KEY_PRESS))
         {
           case CACA_EVENT_KEY_PRESS | CACA_KEY_ESCAPE: return;

@@ -3 +3 @@
 .libs
 .deps
-cacademo
-cacademo.exe
 caca-spritedit
 caca-spritedit.exe