From 270e9f288c7bdd0c92ce273d5b777c24158a5d08 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Tue, 23 Dec 2003 17:01:38 +0000
Subject: [PATCH]   * configure.ac NEWS:     + Prepared release 0.4.   *
 src/graphics.c README BUGS TODO:     + Updated documentation.   * Makefile.am
 doc/Makefile.am:     + Install the generated doxygen documentation.

---
 BUGS            |  2 ++
 Makefile.am     |  3 +++
 NEWS            |  9 +++++++++
 README          |  9 +++++----
 TODO            |  3 ++-
 configure.ac    |  4 +++-
 doc/Makefile.am | 20 +++++++++++++++++++-
 src/graphics.c  |  5 +++++
 8 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/BUGS b/BUGS
index f997ca3..e0f0a35 100644
--- a/BUGS
+++ b/BUGS
@@ -8,3 +8,5 @@ Video rendering
 
    o  Slang cannot display 256 colour pairs under Unix.
 
+   o  the X11 driver is very slow.
+
diff --git a/Makefile.am b/Makefile.am
index ec64a49..a0dd383 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,3 +10,6 @@ AUTOMAKE_OPTIONS = dist-bzip2
 
 bin_SCRIPTS = caca-config
 
+doc_DATA = README BUGS TODO AUTHORS NEWS NOTES
+docdir = $(datadir)/doc/libcaca-dev
+
diff --git a/NEWS b/NEWS
index 79fbd55..2ad108f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,14 @@
 $Id$
 
+Changes between 0.3 and 0.4:
+----------------------------
+
+  * preliminary X11 graphics driver
+  * support for simultaneously compiled-in drivers
+  * honour the CACA_DRIVER, CACA_WIDTH, CACA_HEIGHT and CACA_FONT environment
+    variables
+  * more documentation
+
 Changes between 0.2 and 0.3:
 ----------------------------
 
diff --git a/README b/README
index ee7a6d4..88323a2 100644
--- a/README
+++ b/README
@@ -4,13 +4,14 @@ Building libcaca
 
    o  Run configure then make. Useful configure flags are:
 
-     --enable-ncurses: use the ncurses library (default)
-     --enable-slang: use the SLang library
-     --enable-conio: use MS-DOS conio.h
+     --enable-ncurses: support for the ncurses library (default enabled)
+     --enable-slang: add support for the SLang library
+     --enable-conio: add support for MS-DOS conio.h
+     --enable-x11: add support for native X11 rendering
 
    o  Cross-compilation example:
  
-     ./configure --enable-conio --host=i386-pc-msdosdjgpp
+     ./configure --disable-ncurses --enable-conio --host=i386-pc-msdosdjgpp
 
 
 Using libcaca
diff --git a/TODO b/TODO
index b6b5cfb..459f120 100644
--- a/TODO
+++ b/TODO
@@ -46,5 +46,6 @@ cacaview
 
    o  File browser
 
-   o  Handle GIF and PNG transparency with checkered background
+   o  DONE 11 Dec 2003: Handle GIF and PNG transparency with checkered
+      background
 
diff --git a/configure.ac b/configure.ac
index d674bca..3e7066d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_PREREQ(2.50)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(libcaca, 0.3)
+AM_INIT_AUTOMAKE(libcaca, 0.4)
 AM_CONFIG_HEADER(config.h)
 
 AM_PROG_CC_C_O
@@ -101,6 +101,8 @@ AM_CONDITIONAL(USE_IMLIB2, ${USE_IMLIB2})
 # Build documentation?
 AC_PATH_PROG(DOXYGEN, doxygen, no)
 AM_CONDITIONAL(DOXYGEN, test "${DOXYGEN}" != "no")
+
+# Build LaTeX documentation?
 AC_PATH_PROG(LATEX, latex, no)
 AC_MSG_CHECKING(for a4wide.sty)
 if test -f /usr/share/texmf/tex/latex/misc/a4wide.sty; then
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d1024eb..ce49615 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,7 +2,17 @@ EXTRA_DIST = doxygen.cfg.in footer.html header.html $(man_MANS)
 
 man_MANS = caca-config.1 cacademo.1 caca-spritedit.1 cacaview.1
 
-all: stamp-doxygen stamp-latex
+if DOXYGEN
+htmldoc_DATA = html/doxygen.css html/doxygen.png
+htmldocdir = $(datadir)/doc/libcaca-dev/html
+if LATEX
+psdoc_DATA = latex/refman.ps
+psdocdir = $(datadir)/doc/libcaca-dev/ps
+endif
+endif
+
+html/doxygen.css html/doxygen.png: stamp-doxygen
+latex/refman.ps: stamp-latex
 
 stamp-doxygen:
 if DOXYGEN
@@ -23,3 +33,11 @@ clean-local:
 	-rm -Rf html latex man
 	-rm -f stamp-latex stamp-doxygen
 
+install-data-local:
+if DOXYGEN
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/libcaca-dev/html
+	cp html/*.html $(DESTDIR)$(datadir)/doc/libcaca-dev/html
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/man3
+	cp man/man3/*.3caca $(DESTDIR)$(mandir)/man3
+endif
+
diff --git a/src/graphics.c b/src/graphics.c
index 2271728..20a7fc7 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -749,6 +749,11 @@ void caca_refresh(void)
     {
         unsigned int x, y;
 
+        /* FIXME: This is very, very slow. There are several things that can
+         * be done in order to speed up things:
+         *  - cache characters once rendered
+         *  - pre-render all characters
+         *  - use our own rendering routine (screen depth dependent) */
         for(y = 0; y < _caca_height; y++)
             for(x = 0; x < _caca_width; x++)
             {