Mercurial > MadButterfly
diff tools/mb_c_source.m4 @ 280:c8b6ca46950b mbtext
Add merged result
| author | wycc |
|---|---|
| date | Sat, 31 Jan 2009 12:29:50 +0800 |
| parents | a90fd749af82 29acbd8a0dd0 |
| children | 2e97e8082d83 |
line wrap: on
line diff
--- a/tools/mb_c_source.m4 Sat Jan 31 11:51:19 2009 +0800 +++ b/tools/mb_c_source.m4 Sat Jan 31 12:29:50 2009 +0800 @@ -20,6 +20,7 @@ define([ADD_RECT]) define([ADD_COORD]) define([ADD_TEXT],) +define([ADD_IMAGE],) define([PANGO_BEGIN_TEXT],) define([PANGO_END_TEXT],) define([PANGO_SIZE],) @@ -124,6 +125,13 @@ cairo_get_font_face(rdman->cr)); rdman_add_shape(rdman, obj->$1, obj->$6); ]]) + +define([S_ADD_IMAGE],[[ + obj->$1_img_data = MB_IMG_LDR_LOAD(img_ldr, "$2"); + obj->$1 = rdman_shape_image_new(rdman, obj->$1_img_data, + $3, $4, $5, $6); + rdman_add_shape(rdman, obj->$1, obj->$7); +]]) define([S_PANGO_BEGIN_TEXT],[[ { PangoAttribute *attr; @@ -245,6 +253,7 @@ SIMPORT([ADD_RECT]) SIMPORT([ADD_COORD]) SIMPORT([ADD_TEXT]) +SIMPORT([ADD_IMAGE]) SIMPORT([PANGO_BEGIN_TEXT]) SIMPORT([PANGO_END_TEXT]) SIMPORT([PANGO_SIZE]) @@ -288,6 +297,11 @@ define([F_ADD_TEXT],[[ rdman_shape_free(rdman, obj->$1); ]]) + +define([F_ADD_IMAGE],[[ + rdman_shape_free(rdman, obj->$1); + MB_IMAGE_DATA_FREE(obj->$1_img_data); +]]) define([F_PANGO_BEGIN_TEXT],[[ rdman_shape_free(rdman, obj->$1); ]])