Ignore:
Timestamp:
Apr 18, 2006, 5:11:25 PM (14 years ago)
Author:
Sam Hocevar
Message:
  • Renamed caca_t into caca_display_t.
  • Renamed canvas handle variables from "c" to "cv". Eh ouais mon gros.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/caca/caca_internals.h

    r810 r811  
    6262/* Available external drivers */
    6363#if defined(USE_CONIO)
    64 int conio_install(caca_t *);
     64int conio_install(caca_display_t *);
    6565#endif
    6666#if defined(USE_GL)
    67 int gl_install(caca_t *);
     67int gl_install(caca_display_t *);
    6868#endif
    6969#if defined(USE_NCURSES)
    70 int ncurses_install(caca_t *);
     70int ncurses_install(caca_display_t *);
    7171#endif
    72 int raw_install(caca_t *);
     72int raw_install(caca_display_t *);
    7373#if defined(USE_SLANG)
    74 int slang_install(caca_t *);
     74int slang_install(caca_display_t *);
    7575#endif
    7676#if defined(USE_VGA)
    77 int vga_install(caca_t *);
     77int vga_install(caca_display_t *);
    7878#endif
    7979#if defined(USE_WIN32)
    80 int win32_install(caca_t *);
     80int win32_install(caca_display_t *);
    8181#endif
    8282#if defined(USE_X11)
    83 int x11_install(caca_t *);
     83int x11_install(caca_display_t *);
    8484#endif
    8585
     
    9090};
    9191
    92 /* Internal caca context */
    93 struct caca
     92/* Internal caca display context */
     93struct caca_display
    9494{
    9595    /* A link to our cucul canvas */
    96     cucul_canvas_t *c;
     96    cucul_canvas_t *cv;
    9797
    9898    /* Device-specific functions */
     
    102102        struct driver_private *p;
    103103
    104         int (* init_graphics) (caca_t *);
    105         int (* end_graphics) (caca_t *);
    106         int (* set_window_title) (caca_t *, char const *);
    107         unsigned int (* get_window_width) (caca_t *);
    108         unsigned int (* get_window_height) (caca_t *);
    109         void (* display) (caca_t *);
    110         void (* handle_resize) (caca_t *);
    111         int (* get_event) (caca_t *, caca_event_t *);
    112         void (* set_mouse) (caca_t *, int);
     104        int (* init_graphics) (caca_display_t *);
     105        int (* end_graphics) (caca_display_t *);
     106        int (* set_window_title) (caca_display_t *, char const *);
     107        unsigned int (* get_window_width) (caca_display_t *);
     108        unsigned int (* get_window_height) (caca_display_t *);
     109        void (* display) (caca_display_t *);
     110        void (* handle_resize) (caca_display_t *);
     111        int (* get_event) (caca_display_t *, caca_event_t *);
     112        void (* set_mouse) (caca_display_t *, int);
    113113    } drv;
    114114
     
    154154
    155155/* Internal event functions */
    156 extern void _caca_handle_resize(caca_t *);
     156extern void _caca_handle_resize(caca_display_t *);
    157157#if defined(USE_SLANG) || defined(USE_NCURSES) || defined(USE_CONIO) || defined(USE_GL)
    158 extern void _push_event(caca_t *, caca_event_t *);
    159 extern int _pop_event(caca_t *, caca_event_t *);
     158extern void _push_event(caca_display_t *, caca_event_t *);
     159extern int _pop_event(caca_display_t *, caca_event_t *);
    160160#endif
    161161
Note: See TracChangeset for help on using the changeset viewer.