From a21c3c0c9e8b348370845e70ed3f44d094f00bdd Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Wed, 31 Dec 2003 12:05:44 +0000
Subject: [PATCH]   * src/caca.c:     + Do not try the X11 driver if DISPLAY is
 set to the empty string.   * examples/cacaview.c:     + Cosmetic fixes.

---
 examples/cacaview.c | 10 +++++++---
 src/caca.c          |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/examples/cacaview.c b/examples/cacaview.c
index cbe78ce..b6f2ae6 100644
--- a/examples/cacaview.c
+++ b/examples/cacaview.c
@@ -1,5 +1,5 @@
 /*
- *  view          image viewer for libcaca
+ *  cacaview      image viewer for libcaca
  *  Copyright (c) 2003 Sam Hocevar <sam@zoy.org>
  *                All Rights Reserved
  *
@@ -60,7 +60,9 @@ char *pixels = NULL;
 struct caca_bitmap *bitmap = NULL;
 int x, y;
 unsigned int w, h, depth, bpp, rmask, gmask, bmask, amask;
+#if !defined(HAVE_IMLIB2_H)
 unsigned int red[256], green[256], blue[256], alpha[256];
+#endif
 
 int main(int argc, char **argv)
 {
@@ -287,8 +289,10 @@ int main(int argc, char **argv)
             if(yn + y > (int)h) y = h - yn;
             newbitmap = caca_create_bitmap(bpp, 2 * xn, 2 * yn, depth * w,
                                            rmask, gmask, bmask, amask);
+#if !defined(HAVE_IMLIB2_H)
             if(bpp == 8)
                 caca_set_bitmap_palette(newbitmap, red, green, blue, alpha);
+#endif
             draw_checkers(0, fullscreen ? 0 : 1,
                           ww - 1, fullscreen ? wh - 1 : wh - 3);
             caca_draw_bitmap(0, fullscreen ? 0 : 1,
@@ -368,7 +372,7 @@ int main(int argc, char **argv)
 
 static void unload_image(void)
 {
-#ifdef HAVE_IMLIB2_H
+#if defined(HAVE_IMLIB2_H)
     if(image)
         imlib_free_image();
     image = NULL;
@@ -385,7 +389,7 @@ static void unload_image(void)
 
 static void load_image(const char *name)
 {
-#ifdef HAVE_IMLIB2_H
+#if defined(HAVE_IMLIB2_H)
     /* Load the new image */
     image = imlib_load_image(name);
 
diff --git a/src/caca.c b/src/caca.c
index 29dfc76..5421368 100644
--- a/src/caca.c
+++ b/src/caca.c
@@ -407,7 +407,7 @@ static void caca_init_driver(void)
 #endif
 #if defined(USE_X11)
 #if defined(HAVE_GETENV)
-    if(getenv("DISPLAY"))
+    if(getenv("DISPLAY") && *(getenv("DISPLAY")))
 #endif
     {
         _caca_driver = CACA_DRIVER_X11;