Changeset 322


Ignore:
Timestamp:
Jan 7, 2004, 1:45:02 PM (19 years ago)
Author:
Sam Hocevar
Message:
  • libcaca.spec debian/control: + Updated the package descriptions to include cacaball.
  • doc/cacademo.1 doc/Makefile.am: + Use the cacademo manpage as the cacaball manpage.
  • src/: + Added #ifdef _DOXYGEN_SKIP_ME here and there to prvent Doxygen from

documenting bizarre stuff.

Location:
libcaca/trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • libcaca/trunk/NEWS

    r310 r322  
    11$Id$
     2
     3Changes between 0.6 and 0.7:
     4----------------------------
     5
     6  * cacaball, a metaball animation example
    27
    38Changes between 0.5 and 0.6:
    … …  
    4550  * cacaview, an image viewer based on libcaca
    4651
    47 
    4852New in 0.1
    4953----------

  • libcaca/trunk/debian/control

    r310 r322  
    3333 or enable anti-aliasing.
    3434 .
    35  cacafire is a port of AALib's aafire and displays burning ASCII art flames.
    36  .
    37  cacademo is a simple application that shows the libcaca rendering features
    38  such as line and ellipses drawing, triangle filling, and sprite blitting.
    39  .
    40  caca-spritedit is a simple sprite viewer for libcaca.
     35 cacaball is a tiny graphic program that renders animated ASCII metaballs on
     36 the screen, cacafire is a port of AALib's aafire and displays burning ASCII
     37 art flames, cacademo is a simple application that shows the libcaca rendering
     38 features such as line and ellipses drawing, triangle filling and sprite
     39 blitting, and caca-spritedit is a simple sprite viewer for libcaca.

  • libcaca/trunk/debian/rules

    r310 r322  
    4343        DESTDIR=`pwd`/debian/libcaca-dev/ $(MAKE) install prefix=/usr
    4444
     45        mv debian/libcaca-dev/usr/bin/cacaball debian/caca-utils/usr/bin
    4546        mv debian/libcaca-dev/usr/bin/cacademo debian/caca-utils/usr/bin
    4647        mv debian/libcaca-dev/usr/bin/cacaview debian/caca-utils/usr/bin
    … …  
    4950
    5051        mv debian/libcaca-dev/usr/share/libcaca debian/caca-utils/usr/share
     52        mv debian/libcaca-dev/usr/share/man/man1/cacaball.1 \
     53           debian/caca-utils/usr/share/man/man1/
    5154        mv debian/libcaca-dev/usr/share/man/man1/cacademo.1 \
    5255           debian/caca-utils/usr/share/man/man1/

  • libcaca/trunk/doc/Makefile.am

    r313 r322  
    4848        rm -f $(DESTDIR)$(mandir)/man1/cacafire.1
    4949        ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacafire.1
     50        rm -f $(DESTDIR)$(mandir)/man1/cacaball.1
     51        ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacaball.1
    5052endif
    5153

  • libcaca/trunk/doc/cacademo.1

    r248 r322  
    1 .TH libcaca 1 "2003-11-22" "libcaca"
     1.TH libcaca 1 "2004-1-6" "libcaca"
    22.SH NAME
    3 cacademo, cacafire \- libcaca's demonstration applications
     3cacademo, cacafire, cacaball \- libcaca's demonstration applications
    44.SH SYNOPSIS
    55cacademo
    66.PP
    77cacafire
     8.PP
     9cacaball
    810.RI
    911.SH DESCRIPTION
    10 This manual page documents briefly the cacademo and cacafire programs.
     12This manual page documents briefly the cacademo, cacafire and cacaball
     13programs.
    1114.PP
    1215.B cacademo
    … …  
    1720.B cacafire
    1821displays burning ASCII art flames.
     22.PP
     23.B cacaball
     24displays ASCII art metaballs.
    1925.SH BUGS
    2026Please report any bugs you find to <libcaca@lists.zoy.org>.
    2127.SH LICENSE
    22 cacademo and cacafire are all covered by the GNU Lesser General Public
    23 License (LGPL).
     28cacademo, cacafire and cacaball are covered by the GNU Lesser General
     29Public License (LGPL).
    2430.SH AUTHORS
     31.B cacademo
     32and this manual page were written by Sam Hocevar <sam@zoy.org>.
     33.PP
    2534.B cacafire
    2635is a port of AAlib's
    … …  
    2837written by Jan Hubicka <hubicka@freesoft.cz>.
    2938.PP
    30 .B cacademo
    31 and this manual page were written by Sam Hocevar <sam@zoy.org>
     39.B cacaball
     40was written by Jean-Yves Lamoureux <jylam@lnxscene.org>.
    3241.SH SEE ALSO
    3342cacaview(1), aafire(1)

  • libcaca/trunk/libcaca.spec

    r312 r322  
    4848or enable anti-aliasing.
    4949
    50 cacafire is a port of AALib's aafire and displays burning ASCII art flames.
    51 
    52 cacademo is a simple application that shows the libcaca rendering features
    53 such as line and ellipses drawing, triangle filling, and sprite blitting.
    54 
    55 caca-spritedit is a simple sprite viewer for libcaca.
     50cacaball is a tiny graphic program that renders animated ASCII metaballs on
     51the screen, cacafire is a port of AALib's aafire and displays burning ASCII
     52art flames, cacademo is a simple application that shows the libcaca rendering
     53features such as line and ellipses drawing, triangle filling and sprite
     54blitting, and caca-spritedit is a simple sprite viewer for libcaca.
    5655
    5756%prep
    … …  
    9493%files -n caca-utils
    9594%defattr(-,root,root)
     95%{_prefix}/bin/cacaball
    9696%{_prefix}/bin/cacademo
    9797%{_prefix}/bin/cacafire
    … …  
    100100%{_prefix}/share/doc/caca-utils-%{version}/*
    101101%{_prefix}/share/libcaca/*
     102%{_prefix}/share/man/man1/cacaball.1*
    102103%{_prefix}/share/man/man1/cacademo.1*
    103104%{_prefix}/share/man/man1/cacafire.1*

  • libcaca/trunk/src/bitmap.c

    r308 r322  
    3030#include "config.h"
    3131
    32 #if defined(HAVE_INTTYPES_H)
     32#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
    3333#   include <inttypes.h>
    3434#else
    … …  
    5050 * Global variables
    5151 */
     52#if !defined(_DOXYGEN_SKIP_ME)
    5253enum caca_feature _caca_background;
    5354enum caca_feature _caca_dithering;
    5455enum caca_feature _caca_antialiasing;
     56#endif
    5557
    5658/*
    5759 * Local variables
    5860 */
    59 #define LOOKUP_VAL 32
    60 #define LOOKUP_SAT 32
    61 #define LOOKUP_HUE 16
     61#if !defined(_DOXYGEN_SKIP_ME)
     62#   define LOOKUP_VAL 32
     63#   define LOOKUP_SAT 32
     64#   define LOOKUP_HUE 16
     65#endif
    6266static unsigned char hsv_distances[LOOKUP_VAL][LOOKUP_SAT][LOOKUP_HUE];
    6367static enum caca_color lookup_colors[8];
    … …  
    7680};
    7781
     82#if !defined(_DOXYGEN_SKIP_ME)
    7883#define HSV_XRATIO 6
    7984#define HSV_YRATIO 3
    … …  
    9297                         * ((h) - hsv_palette[index * 4 + 1])) \
    9398           : 0)))
     99#endif
    94100
    95101/*
    … …  
    124130static void increment_random_dither(void);
    125131
     132#if !defined(_DOXYGEN_SKIP_ME)
    126133struct caca_bitmap
    127134{
    … …  
    134141    int red[256], green[256], blue[256], alpha[256];
    135142};
     143#endif
    136144
    137145static void mask2shift(unsigned int mask, int *right, int *left)
    … …  
    230238 * \brief Set the palette of an 8bpp bitmap object.
    231239 *
    232  * \param bpp The bitmap object.
     240 * \param bitmap The bitmap object.
    233241 * \param red An array of 256 red values.
    234242 * \param green An array of 256 green values.
    235243 * \param blue An array of 256 blue values.
    236244 * \param alpha An array of 256 alpha values.
    237  * \return void
    238245 */
    239246void caca_set_bitmap_palette(struct caca_bitmap *bitmap,
    … …  
    419426
    420427    /* FIXME: choose better characters! */
    421 #   define DENSITY_CHARS 13
     428#if !defined(_DOXYGEN_SKIP_ME)
     429#   define DENSITY_CHARS ((sizeof(density_chars)/sizeof(char const))-1)
     430#endif
    422431    static char const density_chars[] =
    423432        "    "
    … …  
    606615}
    607616
     617#if !defined(_DOXYGEN_SKIP_ME)
    608618int _caca_init_bitmap(void)
    609619{
    … …  
    668678    return 0;
    669679}
     680#endif /* _DOXYGEN_SKIP_ME */
    670681
    671682/*

  • libcaca/trunk/src/caca.c

    r309 r322  
    6060static void caca_init_terminal(void);
    6161
     62#if !defined(_DOXYGEN_SKIP_ME)
    6263enum caca_driver _caca_driver;
     64#endif
    6365
    6466#if defined(USE_NCURSES)
    … …  
    230232 *
    231233 *  \param feature The requested feature.
    232  *  \return The current value of the feature or CACA_UNKNOWN_FEATURE if an
     234 *  \return The current value of the feature or CACA_FEATURE_UNKNOWN if an
    233235 *          error occurred..
    234236 */
    … …  
    245247
    246248        default:
    247             return CACA_UNKNOWN_FEATURE;
     249            return CACA_FEATURE_UNKNOWN;
    248250    }
    249251}
    … …  
    286288            break;
    287289
    288         case CACA_UNKNOWN_FEATURE:
     290        case CACA_FEATURE_UNKNOWN:
    289291            break;
    290292    }

  • libcaca/trunk/src/caca.h

    r316 r322  
    155155#define CACA_DITHERING_MAX    0x35 /**< Last dithering feature. */
    156156
    157     CACA_UNKNOWN_FEATURE = 0xffff /**< Unknown feature. */
     157    CACA_FEATURE_UNKNOWN = 0xffff /**< Unknown feature. */
    158158};
    159159
    … …  
    161161 * Backwards compatibility macros
    162162 */
    163 #ifndef _DOXYGEN_SKIP_ME
     163#if !defined(_DOXYGEN_SKIP_ME)
    164164#define caca_dithering caca_feature
    165165#define caca_set_dithering caca_set_feature

  • libcaca/trunk/src/conic.c

    r298 r322  
    3131#include "config.h"
    3232
    33 #if defined(HAVE_INTTYPES_H)
     33#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
    3434#   include <inttypes.h>
    3535#else

  • libcaca/trunk/src/graphics.c

    r318 r322  
    5050#endif
    5151
    52 #if defined(HAVE_INTTYPES_H)
     52#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
    5353#   include <inttypes.h>
     54#else
     55typedef unsigned char uint8_t;
    5456#endif
    5557
    … …  
    6870 * Global variables
    6971 */
     72#if !defined(_DOXYGEN_SKIP_ME)
    7073unsigned int _caca_width = 0;
    7174unsigned int _caca_height = 0;
     75#endif
    7276
    7377/*
    … …  
    142146#endif
    143147
    144 #if defined(USE_X11)
     148#if defined(USE_X11) && !defined(_DOXYGEN_SKIP_ME)
    145149Display *x11_dpy;
    146150Window x11_window;
    … …  
    479483}
    480484
     485#if !defined(_DOXYGEN_SKIP_ME)
    481486int _caca_init_graphics(void)
    482487{
    … …  
    777782    return 0;
    778783}
     784#endif /* _DOXYGEN_SKIP_ME */
    779785
    780786/** \brief Set the refresh delay.
    … …  
    851857void caca_refresh(void)
    852858{
     859#if !defined(_DOXYGEN_SKIP_ME)
    853860#define IDLE_USEC 10000
     861#endif
    854862    static int lastticks = 0;
    855863    int ticks = lastticks + _caca_getticks();

  • libcaca/trunk/src/io.c

    r316 r322  
    5959static unsigned int _read_key(void);
    6060
     61#if !defined(_DOXYGEN_SKIP_ME)
    6162#define KEY_BUFLEN 10
     63#endif
    6264static unsigned int keybuf[KEY_BUFLEN + 1]; /* zero-terminated */
    6365static int keys = 0;

  • libcaca/trunk/src/line.c

    r305 r322  
    3131#include "config.h"
    3232
    33 #if defined(HAVE_INTTYPES_H)
     33#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
    3434#   include <inttypes.h>
    3535#else
    … …  
    4242#include "caca_internals.h"
    4343
     44#if !defined(_DOXYGEN_SKIP_ME)
    4445struct line
    4546{
    … …  
    4950    void (*draw) (struct line*);
    5051};
     52#endif
    5153
    5254static void clip_line(struct line*);

  • libcaca/trunk/src/sprite.c

    r305 r322  
    3737#include "caca_internals.h"
    3838
     39#if !defined(_DOXYGEN_SKIP_ME)
    3940struct caca_frame
    4041{
    … …  
    5051    struct caca_frame *frames;
    5152};
     53#endif
    5254
    5355/**
Note: See TracChangeset for help on using the changeset viewer.