- Timestamp:
- Dec 1, 2007, 6:58:20 PM (13 years ago)
- Location:
- libcaca/trunk
- Files:
-
- 2 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
libcaca/trunk/cucul/Makefile.am
r2109 r2110 30 30 export.c \ 31 31 file.c \ 32 figfont.c \ 32 33 $(NULL) 33 34 libcucul_la_DEPENDENCIES = \ -
libcaca/trunk/cucul/canvas.c
r2043 r2110 491 491 free(cv->frames); 492 492 493 memcpy(cv, new, sizeof(cucul_canvas_t));493 cv->frames = new->frames; 494 494 free(new); 495 495 -
libcaca/trunk/cucul/cucul.c
r2075 r2110 86 86 cucul_set_color_ansi(cv, CUCUL_DEFAULT, CUCUL_TRANSPARENT); 87 87 88 cv->ff = NULL; 89 88 90 if(cucul_resize(cv, width, height) < 0) 89 91 { … … 306 308 free(cv->frames[f].name); 307 309 } 310 311 if(cv->ff) 312 _cucul_free_figfont(cv->ff); 308 313 309 314 free(cv->frames); -
libcaca/trunk/cucul/cucul.h
r2109 r2110 279 279 unsigned int); 280 280 __extern int cucul_free_font(cucul_font_t *); 281 /* @} */ 282 283 /** \defgroup cucul_figfont libcucul FIGfont handling 284 * 285 * These functions provide FIGlet and TOIlet font handling routines. 286 * 287 * @{ */ 288 __extern int cucul_canvas_set_figfont(cucul_canvas_t *, char const *); 281 289 /* @} */ 282 290 -
libcaca/trunk/cucul/cucul_internals.h
r2109 r2110 20 20 #endif 21 21 22 typedef struct cucul_figfont cucul_figfont_t; 23 22 24 struct cucul_frame 23 25 { … … 40 42 struct cucul_canvas 41 43 { 44 /* XXX: look at cucul_set_canvas_boundaries() before adding anything 45 * to this structure. The function is quite hacky. */ 46 42 47 /* Frame information */ 43 48 unsigned int frame, framecount; … … 55 60 uint32_t *attrs; 56 61 uint32_t curattr; 62 63 /* FIGfont management */ 64 cucul_figfont_t *ff; 57 65 }; 58 66 … … 78 86 extern char *_cucul_file_gets(char *, int, cucul_file_t *); 79 87 88 /* FIGfont functions */ 89 extern cucul_figfont_t * _cucul_open_figfont(char const *); 90 extern int _cucul_free_figfont(cucul_figfont_t *); 91 80 92 #endif /* __CUCUL_INTERNALS_H__ */ -
libcaca/trunk/examples/.gitignore
r2101 r2110 7 7 event 8 8 export 9 figfont 9 10 font 10 11 font2tga -
libcaca/trunk/examples/Makefile.am
r2101 r2110 3 3 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\" 4 4 5 noinst_PROGRAMS = blit colors cucul demo demo0 dithering event export f ont font2tga frames fullwidth gamma hsv input spritedit swallow text transform truecolor unicode import5 noinst_PROGRAMS = blit colors cucul demo demo0 dithering event export figfont font font2tga frames fullwidth gamma hsv input spritedit swallow text transform truecolor unicode import 6 6 7 7 blit_SOURCES = blit.c … … 30 30 export_SOURCES = export.c 31 31 export_LDADD = ../cucul/libcucul.la 32 33 figfont_SOURCES = figfont.c 34 figfont_LDADD = ../cucul/libcucul.la 32 35 33 36 font_SOURCES = font.c
Note: See TracChangeset
for help on using the changeset viewer.