Ignore:
Timestamp:
Dec 26, 2003, 12:59:48 AM (17 years ago)
Author:
Sam Hocevar
Message:
  • src/caca.c: + Prefer the X11 driver if $DISPLAY is set. + The slang driver is now preferred over the ncurses driver.
  • configure.ac: + Autodetect conio.h.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/src/caca.c

    r280 r285  
    381381        else
    382382#endif
    383 #if defined(USE_NCURSES)
    384         if(!strcasecmp(var, "ncurses"))
    385             _caca_driver = CACA_DRIVER_NCURSES;
     383#if defined(USE_X11)
     384        if(!strcasecmp(var, "x11"))
     385            _caca_driver = CACA_DRIVER_X11;
    386386        else
    387387#endif
     
    391391        else
    392392#endif
    393 #if defined(USE_X11)
    394         if(!strcasecmp(var, "x11"))
    395             _caca_driver = CACA_DRIVER_X11;
     393#if defined(USE_NCURSES)
     394        if(!strcasecmp(var, "ncurses"))
     395            _caca_driver = CACA_DRIVER_NCURSES;
    396396        else
    397397#endif
     
    406406    return;
    407407#endif
    408 #if defined(USE_NCURSES)
    409     _caca_driver = CACA_DRIVER_NCURSES;
    410     return;
     408#if defined(USE_X11)
     409#if defined(HAVE_GETENV)
     410    if(getenv("DISPLAY"))
     411#endif
     412    {
     413        _caca_driver = CACA_DRIVER_X11;
     414        return;
     415    }
    411416#endif
    412417#if defined(USE_SLANG)
     
    414419    return;
    415420#endif
    416 #if defined(USE_X11)
    417     _caca_driver = CACA_DRIVER_X11;
     421#if defined(USE_NCURSES)
     422    _caca_driver = CACA_DRIVER_NCURSES;
    418423    return;
    419424#endif
Note: See TracChangeset for help on using the changeset viewer.