Changeset 2824 for libcaca


Ignore:
Timestamp:
Sep 27, 2008, 4:29:11 PM (11 years ago)
Author:
Sam Hocevar
Message:

Continuing the libcucul-libcaca merge.

Location:
libcaca/trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • libcaca/trunk/csharp/AssemblyInfo.cs

    r2058 r2824  
    1717using System.Runtime.CompilerServices;
    1818
    19 [assembly: AssemblyTitle("Cucul")]
    20 [assembly: AssemblyDescription("libcucul .NET bindings")]
     19[assembly: AssemblyTitle("Caca")]
     20[assembly: AssemblyDescription("libcaca .NET bindings")]
    2121[assembly: AssemblyCopyright("(c) 2006 Jean-Yves Lamoureux <jylam@lnxscene.org")]

  • libcaca/trunk/cxx/caca++.pc.in

    r2437 r2824  
    77Description: Colour ASCII-Art library C++ bindings
    88Version: @VERSION@
    9 Requires: cucul++ = @VERSION@
     9Requires:
    1010Conflicts:
    11 Libs: -L${libdir} -lcaca++ -lcucul++
     11Libs: -L${libdir} -lcaca++
    1212Cflags: -I${includedir}

  • libcaca/trunk/cxx/cxxtest.cpp

    r2822 r2824  
    4949    }
    5050    catch (int e) {
    51         cerr << "Error while initializing cucul (" << e << ")" << endl;
     51        cerr << "Error while creating canvas (" << e << ")" << endl;
    5252        return -1;
    5353    }
    … …  
    5757    }
    5858    catch(int e) {
    59         cerr << "Error while attaching cucul to caca (" << e << ")" << endl;
     59        cerr << "Error while attaching canvas to display (" << e << ")" << endl;
    6060        return -1;
    6161    }

  • libcaca/trunk/doc/doxygen.cfg.in

    r2243 r2824  
    486486INPUT                  = @top_srcdir@ \
    487487                         @top_srcdir@/doc \
    488                          @top_srcdir@/cucul \
    489488                         @top_srcdir@/caca \
    490489                         @top_srcdir@/ruby
    … …  
    506505FILE_PATTERNS          = *.dox \
    507506                         *.c \
    508                          cucul.h \
    509507                         caca.h \
    510508                         AUTHORS \

  • libcaca/trunk/doc/libcaca.dox

    r2243 r2824  
    2525 \section devel Developer's documentation
    2626
    27  \e libcaca relies on a low-level, device independent library, called
    28  \e libcucul. \e libcucul can be used alone as a simple ASCII and/or
    29  Unicode compositing canvas.
     27 The complete \e libcaca programming interface is
     28 available from the following header:
    3029
    31  The complete \e libcucul and \e libcaca programming interface is
    32  available from the following headers:
    33 
    34  - cucul.h
    3530 - caca.h
    3631

  • libcaca/trunk/doc/migrating.dox

    r2062 r2824  
    88 \section foo1 Overview
    99
    10  The most important changes in the 1.0 API of \e libcaca are the
    11  \e libcaca / \e libcucul split and the object-oriented design. See these
    12  two examples for a rough idea of what changed:
     10 The most important change in the 1.0 API of \e libcaca is the
     11 object-oriented design. See these two examples for a rough idea of
     12 what changed:
    1313
    1414<table border="0"><tr><td valign="top">
    … …  
    4040</td><td>
    4141\code
    42 #include <cucul.h>
    4342#include <caca.h>
    4443
    … …  
    4746{
    4847    /* Initialise libcaca */
    49     cucul_canvas_t *cv;
     48    caca_canvas_t *cv;
    5049    caca_display_t *dp;
    5150    dp = caca_create_display(cv);
    … …  
    5453    caca_set_display_title(dp, "Window");
    5554    /* Choose drawing colours */
    56     cucul_set_color_ansi(cv, CUCUL_BLACK,
    57                              CUCUL_WHITE);
     55    caca_set_color_ansi(cv, CACA_BLACK,
     56                            CACA_WHITE);
    5857    /* Draw a string at (0, 0) */
    59     cucul_put_str(cv, 0, 0, "Hello world!");
     58    caca_put_str(cv, 0, 0, "Hello world!");
    6059    /* Refresh display */
    6160    caca_refresh_display();
    … …  
    7574 - Functions now take an object handle as their first argument.
    7675 - All input/output functions start with \b caca_ and all
    77    drawing and text handling functions start with \b cucul_ .
     76   drawing and text handling functions start with \b caca_ .
    7877
    7978 \section foo2 Migration strategy
    … …  
    111110 \subsection bar1 Basic functions
    112111
    113  - \b caca_init(): use cucul_create_canvas() to create a \e libcucul canvas,
     112 - \b caca_init(): use caca_create_canvas() to create a \e libcaca canvas,
    114113   followed by caca_create_display() to attach a \e libcaca display to it.
    115114 - \b caca_set_delay(): use caca_set_display_time().
    116115 - \b caca_get_feature(): deprecated.
    117  - \b caca_set_feature(): deprecated, see cucul_set_dither_antialias(),
    118    cucul_set_dither_color() and cucul_set_dither_mode() instead.
    119  - \b caca_get_feature_name(): deprecated, see cucul_get_dither_mode_list(),
    120    cucul_get_dither_antialias_list() and cucul_get_dither_color_list()
     116 - \b caca_set_feature(): deprecated, see caca_set_dither_antialias(),
     117   caca_set_dither_color() and caca_set_dither_mode() instead.
     118 - \b caca_get_feature_name(): deprecated, see caca_get_dither_mode_list(),
     119   caca_get_dither_antialias_list() and caca_get_dither_color_list()
    121120   instead.
    122121 - \b caca_get_rendertime(): use caca_get_display_time().
    123  - \b caca_get_width(): use cucul_get_canvas_width().
    124  - \b caca_get_height(): use cucul_get_canvas_height().
     122 - \b caca_get_width(): use caca_get_canvas_width().
     123 - \b caca_get_height(): use caca_get_canvas_height().
    125124 - \b caca_set_window_title(): use caca_set_display_title().
    126125 - \b caca_get_window_width(): use caca_get_display_width().
    … …  
    128127 - \b caca_refresh(): use caca_refresh_display().
    129128 - \b caca_end(): use caca_free_display() to detach the \e libcaca display,
    130    followed by cucul_free_canvas() to free the underlying \e libcucul canvas.
     129   followed by caca_free_canvas() to free the underlying \e libcaca canvas.
    131130
    132131 \subsection bar2 Event handling
    … …  
    141140 \subsection bar3 Character printing
    142141
    143  - \b caca_set_color(): use cucul_set_color_ansi() or cucul_set_color_argb().
    144  - \b caca_get_fg_color(): use cucul_get_attr().
    145  - \b caca_get_bg_color(): use cucul_get_attr().
     142 - \b caca_set_color(): use caca_set_color_ansi() or caca_set_color_argb().
     143 - \b caca_get_fg_color(): use caca_get_attr().
     144 - \b caca_get_bg_color(): use caca_get_attr().
    146145 - \b caca_get_color_name(): this function is now deprecated due to major
    147146   uselessness.
    148  - \b caca_putchar(): use cucul_put_char().
    149  - \b caca_putstr(): use cucul_put_str().
    150  - \b caca_printf(): use cucul_printf().
    151  - \b caca_clear(): use cucul_clear_canvas().
     147 - \b caca_putchar(): use caca_put_char().
     148 - \b caca_putstr(): use caca_put_str().
     149 - \b caca_printf(): use caca_printf().
     150 - \b caca_clear(): use caca_clear_canvas().
    152151
    153152 \subsection bar4 Primitives drawing
    … …  
    156155 fact that they now act on a given canvas.
    157156
    158  - \b caca_draw_line(): use cucul_draw_line().
    159  - \b caca_draw_polyline(): use cucul_draw_polyline().
    160  - \b caca_draw_thin_line(): use cucul_draw_thin_line().
    161  - \b caca_draw_thin_polyline(): use cucul_draw_thin_polyline().
    162 
    163  - \b caca_draw_circle(): use cucul_draw_circle().
    164  - \b caca_draw_ellipse(): use cucul_draw_ellipse().
    165  - \b caca_draw_thin_ellipse(): use cucul_draw_thin_ellipse().
    166  - \b caca_fill_ellipse(): use cucul_fill_ellipse().
    167 
    168  - \b caca_draw_box(): use cucul_draw_box().
    169  - \b caca_draw_thin_box(): use cucul_draw_thin_box() or cucul_draw_cp437_box().
    170  - \b caca_fill_box(): use cucul_fill_box().
    171 
    172  - \b caca_draw_triangle(): use cucul_draw_triangle().
    173  - \b caca_draw_thin_triangle(): use cucul_draw_thin_triangle().
    174  - \b caca_fill_triangle(): use cucul_fill_triangle().
     157 - \b caca_draw_line(): use caca_draw_line().
     158 - \b caca_draw_polyline(): use caca_draw_polyline().
     159 - \b caca_draw_thin_line(): use caca_draw_thin_line().
     160 - \b caca_draw_thin_polyline(): use caca_draw_thin_polyline().
     161
     162 - \b caca_draw_circle(): use caca_draw_circle().
     163 - \b caca_draw_ellipse(): use caca_draw_ellipse().
     164 - \b caca_draw_thin_ellipse(): use caca_draw_thin_ellipse().
     165 - \b caca_fill_ellipse(): use caca_fill_ellipse().
     166
     167 - \b caca_draw_box(): use caca_draw_box().
     168 - \b caca_draw_thin_box(): use caca_draw_thin_box() or caca_draw_cp437_box().
     169 - \b caca_fill_box(): use caca_fill_box().
     170
     171 - \b caca_draw_triangle(): use caca_draw_triangle().
     172 - \b caca_draw_thin_triangle(): use caca_draw_thin_triangle().
     173 - \b caca_fill_triangle(): use caca_fill_triangle().
    175174
    176175 \subsection bar5 Mathematical functions
    177176
    178  - \b caca_rand(): use cucul_rand(). The second argument is different, make
     177 - \b caca_rand(): use caca_rand(). The second argument is different, make
    179178   sure you take that into account.
    180179 - \b caca_sqrt(): this function is now deprecated, use your system's
    … …  
    186185 completely deprecated.
    187186
    188  - \b caca_load_sprite(): use cucul_import_file().
    189  - \b caca_get_sprite_frames(): use cucul_get_frame_count().
    190  - \b caca_get_sprite_width(): use cucul_get_canvas_width().
    191  - \b caca_get_sprite_height(): use cucul_get_canvas_height().
    192  - \b caca_get_sprite_dx(): use cucul_get_canvas_handle_x().
    193  - \b caca_get_sprite_dy(): use cucul_get_canvas_handle_y().
    194  - \b caca_draw_sprite(): use cucul_set_frame() and cucul_blit().
    195  - \b caca_free_sprite(): use cucul_free_canvas().
     187 - \b caca_load_sprite(): use caca_import_file().
     188 - \b caca_get_sprite_frames(): use caca_get_frame_count().
     189 - \b caca_get_sprite_width(): use caca_get_canvas_width().
     190 - \b caca_get_sprite_height(): use caca_get_canvas_height().
     191 - \b caca_get_sprite_dx(): use caca_get_canvas_handle_x().
     192 - \b caca_get_sprite_dy(): use caca_get_canvas_handle_y().
     193 - \b caca_draw_sprite(): use caca_set_frame() and caca_blit().
     194 - \b caca_free_sprite(): use caca_free_canvas().
    196195
    197196 \subsection bar7 Bitmap handling
    … …  
    200199 store any pixels, they just have information on how bitmaps will be dithered.
    201200
    202  - \b caca_create_bitmap(): use cucul_create_dither().
    203  - \b caca_set_bitmap_palette(): use cucul_set_dither_palette().
    204  - \b caca_draw_bitmap(): use cucul_dither_bitmap().
    205  - \b caca_free_bitmap(): use cucul_free_dither().
     201 - \b caca_create_bitmap(): use caca_create_dither().
     202 - \b caca_set_bitmap_palette(): use caca_set_dither_palette().
     203 - \b caca_draw_bitmap(): use caca_dither_bitmap().
     204 - \b caca_free_bitmap(): use caca_free_dither().
    206205
    207206 \section foo4 Compilation

  • libcaca/trunk/doc/tutorial.dox

    r2189 r2824  
    11/* $Id$ */
    22
    3 /** \page libcaca-tutorial A libcucul and libcaca tutorial
    4 
    5  Before writing your first libcaca application, you need to know the difference between libcucul and libcaca :
    6 - libcucul is the text rendering library. It will do all the work you actually need. From imports (text, ANSI, caca internal format, all of this supporting n-bytes unicode), to exports (sames formats, adding SVG, PostScript, TGA, HTML (both 3 and 4), IRC), it'll cover all your needs.
    7 - libcaca handle everything that can be hardware related. It includes display (RAW, X11, OpenGL, Windows (native console), DOS (conio), ncurses, slang, text VGA (IMB-Compatible)), keyboard (same drivers but RAW), mouse (same drivers but RAW and VGA), time and resize events (on windowed drivers).
    8 
    9 So, you can write a libcucul only program, but you <b>can't</b> write a libcaca only program, it'll be nonsense. Period.
    10 
     3/** \page libcaca-tutorial A libcaca tutorial
    114
    125First, a working program, very simple, to check you can compile and run it:
    … …  
    147\code
    158
    16 #include <cucul.h>
     9#include <caca.h>
    1710#include <caca.h>
    1811
    … …  
    2013{
    2114    /* Initialise libcaca */
    22     cucul_canvas_t *cv; caca_display_t *dp; caca_event_t ev;
     15    caca_canvas_t *cv; caca_display_t *dp; caca_event_t ev;
    2316    dp = caca_create_display(NULL);
    2417    if(!dp) return 1;
    … …  
    2720    caca_set_display_title(dp, "Hello!");
    2821    /* Choose drawing colours */
    29     cucul_set_color_ansi(cv, CUCUL_BLACK, CUCUL_WHITE);
     22    caca_set_color_ansi(cv, CACA_BLACK, CACA_WHITE);
    3023    /* Draw a string at coordinates (0, 0) */
    31     cucul_put_str(cv, 0, 0, "This is a message");
     24    caca_put_str(cv, 0, 0, "This is a message");
    3225    /* Refresh display */
    3326    caca_refresh_display(dp);
    … …  
    4437
    4538What does it do ? (we skip variable definitions, guessing you have a brain) :
    46 - Create a cucul canvas. A canvas is where everything happens. Writing characters, sprites, strings, images, everything. It is mandatory and is the reason of libcuculs' beeing. Size is there a width of 0 pixels, and a height of 0 pixels. It'll be resized according to contents you put in it.
     39- Create a caca canvas. A canvas is where everything happens. Writing characters, sprites, strings, images, everything. It is mandatory and is the reason of libcacas' beeing. Size is there a width of 0 pixels, and a height of 0 pixels. It'll be resized according to contents you put in it.
    4740
    4841- Create a caca display. This is basically the window. Physically it can be a window (most of the displays), a console (ncurses, slang) or a real display (VGA).
    … …  
    5043- Set the window name of our display (only available in windowed displays, does nothing otherwise). (so this is libcaca related)
    5144 
    52 - Set current colors to black background, and white foreground of our canvas (so this is libcucul related)
     45- Set current colors to black background, and white foreground of our canvas (so this is libcaca related)
    5346
    54 - Put a string "This is a message" with current colors in our libcucul canvas.
     47- Put a string "This is a message" with current colors in our libcaca canvas.
    5548
    5649- Refresh our caca display, whish was firstly attached to our canvas
    … …  
    6558You can then compile this code under UNIX-like systems with following command : (you'll need pkg-config and gcc)
    6659\code
    67 gcc `pkg-config --libs --cflags cucul caca` example.c -o example
     60gcc `pkg-config --libs --cflags caca` example.c -o example
    6861\endcode
    6962

  • libcaca/trunk/examples/.gitignore

    r2138 r2824  
    11blit
     2canvas
    23colors
    3 cucul
    44demo
    55demo0

  • libcaca/trunk/msvc/cacademo.vcproj

    r2192 r2824  
    4141                                Name="VCCLCompilerTool"
    4242                                Optimization="0"
    43                                 AdditionalIncludeDirectories="..\src;..\msvc;..\caca;..\cucul"
     43                                AdditionalIncludeDirectories="..\src;..\msvc;..\caca"
    4444                                PreprocessorDefinitions="LIBCACA=1"
    4545                                MinimalRebuild="true"
    … …  
    125125                                InlineFunctionExpansion="1"
    126126                                OmitFramePointers="true"
    127                                 AdditionalIncludeDirectories="..\src;..\msvc;..\caca;..\cucul"
     127                                AdditionalIncludeDirectories="..\src;..\msvc;..\caca"
    128128                                PreprocessorDefinitions="LIBCACA=1"
    129129                                StringPooling="true"

  • libcaca/trunk/msvc/cacafire.vcproj

    r2192 r2824  
    4141                                Name="VCCLCompilerTool"
    4242                                Optimization="0"
    43                                 AdditionalIncludeDirectories="..\src;..\msvc;..\caca;..\cucul"
     43                                AdditionalIncludeDirectories="..\src;..\msvc;..\caca"
    4444                                PreprocessorDefinitions="LIBCACA=1"
    4545                                MinimalRebuild="true"
    … …  
    125125                                InlineFunctionExpansion="1"
    126126                                OmitFramePointers="true"
    127                                 AdditionalIncludeDirectories="..\src;..\msvc;..\caca;..\cucul"
     127                                AdditionalIncludeDirectories="..\src;..\msvc;..\caca"
    128128                                PreprocessorDefinitions="LIBCACA=1"
    129129                                StringPooling="true"

  • libcaca/trunk/msvc/cacaview.vcproj

    r775 r2824  
    4141                                Name="VCCLCompilerTool"
    4242                                Optimization="0"
    43                                 AdditionalIncludeDirectories="..\src;..\msvc;..\caca;..\cucul;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;"
     43                                AdditionalIncludeDirectories="..\src;..\msvc;..\caca;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;"
    4444                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
    4545                                MinimalRebuild="true"

  • libcaca/trunk/msvc/libcaca.sln

    r2070 r2824  
    33Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacafire", "cacafire.vcproj", "{F25D1237-9ED8-4343-B958-308C95FE392F}"
    44        ProjectSection(ProjectDependencies) = postProject
    5                 {44303C1F-BB6A-4C4B-BB19-7D475348F151} = {44303C1F-BB6A-4C4B-BB19-7D475348F151}
    65                {8951ECB0-7CFE-41AB-A426-98D7C441BEA4} = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}
    76        EndProjectSection
    87EndProject
    9 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcucul", "libcucul.vcproj", "{44303C1F-BB6A-4C4B-BB19-7D475348F151}"
    10 EndProject
    118Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcaca", "libcaca.vcproj", "{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}"
    12         ProjectSection(ProjectDependencies) = postProject
    13                 {44303C1F-BB6A-4C4B-BB19-7D475348F151} = {44303C1F-BB6A-4C4B-BB19-7D475348F151}
    14         EndProjectSection
    159EndProject
    1610Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacademo", "cacademo.vcproj", "{EE082122-5ECD-4DB4-93C7-145392074F8B}"
    1711        ProjectSection(ProjectDependencies) = postProject
    1812                {8951ECB0-7CFE-41AB-A426-98D7C441BEA4} = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}
    19                 {44303C1F-BB6A-4C4B-BB19-7D475348F151} = {44303C1F-BB6A-4C4B-BB19-7D475348F151}
    20         EndProjectSection
    21 EndProject
    22 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cucul-sharp", "cucul-sharp.csproj", "{C05C1521-F4E2-48D8-BD83-786EF345A887}"
    23         ProjectSection(ProjectDependencies) = postProject
    24                 {44303C1F-BB6A-4C4B-BB19-7D475348F151} = {44303C1F-BB6A-4C4B-BB19-7D475348F151}
    2513        EndProjectSection
    2614EndProject
    … …  
    3220Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test-csharp", "test-csharp.csproj", "{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}"
    3321EndProject
    34 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcucul++", "libcucul++.vcproj", "{9A5CF69C-8C9D-4186-B68D-ED73633A9B67}"
    35         ProjectSection(ProjectDependencies) = postProject
    36                 {44303C1F-BB6A-4C4B-BB19-7D475348F151} = {44303C1F-BB6A-4C4B-BB19-7D475348F151}
    37         EndProjectSection
    38 EndProject
    3922Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcaca++", "libcaca++.vcproj", "{5AAFB727-094F-4104-A765-A94B32497C7D}"
    4023        ProjectSection(ProjectDependencies) = postProject
    4124                {8951ECB0-7CFE-41AB-A426-98D7C441BEA4} = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}
    42                 {9A5CF69C-8C9D-4186-B68D-ED73633A9B67} = {9A5CF69C-8C9D-4186-B68D-ED73633A9B67}
    4325        EndProjectSection
    4426EndProject
    … …  
    4628        ProjectSection(ProjectDependencies) = postProject
    4729                {5AAFB727-094F-4104-A765-A94B32497C7D} = {5AAFB727-094F-4104-A765-A94B32497C7D}
    48                 {9A5CF69C-8C9D-4186-B68D-ED73633A9B67} = {9A5CF69C-8C9D-4186-B68D-ED73633A9B67}
    4930        EndProjectSection
    5031EndProject
    … …  
    6950                {F25D1237-9ED8-4343-B958-308C95FE392F}.Release|Win32.ActiveCfg = Release|Win32
    7051                {F25D1237-9ED8-4343-B958-308C95FE392F}.Release|Win32.Build.0 = Release|Win32
    71                 {44303C1F-BB6A-4C4B-BB19-7D475348F151}.Debug|Any CPU.ActiveCfg = Debug|Win32
    72                 {44303C1F-BB6A-4C4B-BB19-7D475348F151}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
    73                 {44303C1F-BB6A-4C4B-BB19-7D475348F151}.Debug|Mixed Platforms.Build.0 = Debug|Win32
    74                 {44303C1F-BB6A-4C4B-BB19-7D475348F151}.Debug|Win32.ActiveCfg = Debug|Win32
    75                 {44303C1F-BB6A-4C4B-BB19-7D475348F151}.Debug|Win32.Build.0 = Debug|Win32
    76                 {44303C1F-BB6A-4C4B-BB19-7D475348F151}.Release|Any CPU.ActiveCfg = Release|Win32
    77                 {44303C1F-BB6A-4C4B-BB19-7D475348F151}.Release|Mixed Platforms.ActiveCfg = Release|Win32
    78                 {44303C1F-BB6A-4C4B-BB19-7D475348F151}.Release|Mixed Platforms.Build.0 = Release|Win32
    79                 {44303C1F-BB6A-4C4B-BB19-7D475348F151}.Release|Win32.ActiveCfg = Release|Win32
    80                 {44303C1F-BB6A-4C4B-BB19-7D475348F151}.Release|Win32.Build.0 = Release|Win32
    8152                {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|Any CPU.ActiveCfg = Debug|Win32
    8253                {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
    … …  
    129100                {6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    130101                {6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Win32.ActiveCfg = Release|Any CPU
    131                 {9A5CF69C-8C9D-4186-B68D-ED73633A9B67}.Debug|Any CPU.ActiveCfg = Debug|Win32
    132                 {9A5CF69C-8C9D-4186-B68D-ED73633A9B67}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
    133                 {9A5CF69C-8C9D-4186-B68D-ED73633A9B67}.Debug|Mixed Platforms.Build.0 = Debug|Win32
    134                 {9A5CF69C-8C9D-4186-B68D-ED73633A9B67}.Debug|Win32.ActiveCfg = Debug|Win32
    135                 {9A5CF69C-8C9D-4186-B68D-ED73633A9B67}.Debug|Win32.Build.0 = Debug|Win32
    136                 {9A5CF69C-8C9D-4186-B68D-ED73633A9B67}.Release|Any CPU.ActiveCfg = Release|Win32
    137                 {9A5CF69C-8C9D-4186-B68D-ED73633A9B67}.Release|Mixed Platforms.ActiveCfg = Release|Win32
    138                 {9A5CF69C-8C9D-4186-B68D-ED73633A9B67}.Release|Mixed Platforms.Build.0 = Release|Win32
    139                 {9A5CF69C-8C9D-4186-B68D-ED73633A9B67}.Release|Win32.ActiveCfg = Release|Win32
    140                 {9A5CF69C-8C9D-4186-B68D-ED73633A9B67}.Release|Win32.Build.0 = Release|Win32
    141102                {5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|Any CPU.ActiveCfg = Debug|Win32
    142103                {5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32

  • libcaca/trunk/msvc/test-csharp.csproj

    r2084 r2824  
    4545      <Name>caca-sharp</Name>
    4646    </ProjectReference>
    47     <ProjectReference Include="cucul-sharp.csproj">
    48       <Project>{C05C1521-F4E2-48D8-BD83-786EF345A887}</Project>
    49       <Name>cucul-sharp</Name>
    50     </ProjectReference>
    5147  </ItemGroup>
    5248  <ItemGroup>

  • libcaca/trunk/msvc/test-cxx.vcproj

    r2070 r2824  
    4141                                Name="VCCLCompilerTool"
    4242                                Optimization="0"
    43                                 AdditionalIncludeDirectories="..\msvc;..\cxx;..\cucul;..\caca"
     43                                AdditionalIncludeDirectories="..\msvc;..\cxx;..\caca"
    4444                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
    4545                                MinimalRebuild="true"
    … …  
    117117                        <Tool
    118118                                Name="VCCLCompilerTool"
    119                                 AdditionalIncludeDirectories="..\msvc;..\cxx;..\cucul;..\caca"
     119                                AdditionalIncludeDirectories="..\msvc;..\cxx;..\caca"
    120120                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
    121121                                RuntimeLibrary="2"

  • libcaca/trunk/python/snake.py

    r2060 r2824  
    7979    def draw(self):
    8080        global cv
    81         lcaca.cucul_set_color_ansi(cv, 0x05, 0x00)
     81        lcaca.caca_set_color_ansi(cv, 0x05, 0x00)
    8282
    8383        for p in self.body:
    84             lcaca.cucul_put_char(cv, p[0], p[1], ord('o'))
    85         lcaca.cucul_set_color_ansi(cv, 0x02, 0x00)
    86         lcaca.cucul_put_char(cv, self.head[0], self.head[1], ord('@'))
     84            lcaca.caca_put_char(cv, p[0], p[1], ord('o'))
     85        lcaca.caca_set_color_ansi(cv, 0x02, 0x00)
     86        lcaca.caca_put_char(cv, self.head[0], self.head[1], ord('@'))
    8787        lcaca.caca_refresh_display(dp)
    8888
    … …  
    102102    def draw(self):
    103103        global cv
    104         lcaca.cucul_set_color_ansi(cv, 0x03, 0x00)
    105         lcaca.cucul_put_char(cv, self.x, self.y, ord(str(self.value)))
     104        lcaca.caca_set_color_ansi(cv, 0x03, 0x00)
     105        lcaca.caca_put_char(cv, self.x, self.y, ord(str(self.value)))
    106106        lcaca.caca_refresh_display(dp)
    107107
    108108def draw_border():
    109     lcaca.cucul_set_color_ansi(cv, 0x04, 0x00)
    110     lcaca.cucul_draw_box(cv,
     109    lcaca.caca_set_color_ansi(cv, 0x04, 0x00)
     110    lcaca.caca_draw_box(cv,
    111111                         0,
    112112                         0,
    … …  
    117117event = ev()
    118118lcaca = C.cdll.LoadLibrary('libcaca.so.0')
    119 cv = lcaca.cucul_create_canvas(CANVAS_WIDTH, CANVAS_HEIGHT)
     119cv = lcaca.caca_create_canvas(CANVAS_WIDTH, CANVAS_HEIGHT)
    120120dp = lcaca.caca_create_display(cv)
    121121lcaca.caca_set_display_title(dp, "snake.py - playing with ctypes and libcaca")
    … …  
    161161        s.grow()
    162162
    163     lcaca.cucul_clear_canvas(cv)
     163    lcaca.caca_clear_canvas(cv)
    164164    draw_border()
    165165    s.draw()

  • libcaca/trunk/ruby/ruby.dox

    r2033 r2824  
    1111For the list of methods and some sample code, read:
    1212
    13 \subpage libcucul-ruby-api
    14 
    1513\subpage libcaca-ruby-api
    1614

  • libcaca/trunk/tests/.gitignore

    r2821 r2824  
    11simple
    2 cucul-test
    3 cucul-test
     2caca-test

  • libcaca/trunk/tests/caca-test.cpp

    r2821 r2824  
    11/*
    2  *  cucul-test     testsuite program for libcucul
     2 *  caca-test     testsuite program for libcaca
    33 *  Copyright (c) 2008 Sam Hocevar <sam@zoy.org>
    44 *                All Rights Reserved
Note: See TracChangeset for help on using the changeset viewer.