Ignore:
Timestamp:
Sep 27, 2008, 3:12:46 PM (12 years ago)
Author:
Sam Hocevar
Message:

Starting refactoring to get rid of libcucul. The initial reason for the
split is rendered moot by the plugin system: when enabled, binaries do
not link directly with libX11 or libGL. I hope this is a step towards
more consisteny and clarity.

File:
1 edited

Legend:

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

    r2313 r2821  
    4343#endif
    4444
    45 #include "cucul.h"
     45#include "caca.h"
    4646
    4747#define BACKLOG 1337     /* Number of pending connections */
     
    111111    char prefix[sizeof(INIT_PREFIX)];
    112112
    113     cucul_canvas_t *canvas;
     113    caca_canvas_t *canvas;
    114114    void *buffer;
    115115    size_t buflen;
     
    190190    }
    191191
    192     server->canvas = cucul_create_canvas(0, 0);
     192    server->canvas = caca_create_canvas(0, 0);
    193193    server->buffer = NULL;
    194194
     
    214214        }
    215215
    216         while(cucul_import_memory(server->canvas, server->input,
     216        while(caca_import_memory(server->canvas, server->input,
    217217                                  server->read, "caca") < 0)
    218218        {
     
    225225            ssize_t needed, wanted;
    226226
    227             needed = cucul_import_memory(server->canvas, server->input,
     227            needed = caca_import_memory(server->canvas, server->input,
    228228                                         server->read, "caca");
    229229            if(needed < 0)
     
    253253        /* Get ANSI representation of the image and skip the end-of buffer
    254254         * linefeed ("\r\n", 2 byte) */
    255         server->buffer = cucul_export_memory(server->canvas, "utf8cr",
     255        server->buffer = caca_export_memory(server->canvas, "utf8cr",
    256256                                             &server->buflen);
    257257        server->buflen -= 2;
     
    285285        free(server->buffer);
    286286
    287     cucul_free_canvas(server->canvas);
     287    caca_free_canvas(server->canvas);
    288288
    289289    /* Restore SIGPIPE handler */
Note: See TracChangeset for help on using the changeset viewer.