Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_text.c ewl_text.h
Log Message:
- remove old code
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- ewl_text.c 21 Nov 2005 17:59:18 -0000 1.57
+++ ewl_text.c 21 Nov 2005 18:04:22 -0000 1.58
@@ -3454,348 +3454,6 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-ewl_text_context_font_set(Ewl_Text_Context *tx, const char *font)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
- DCHECK_PARAM_PTR("font", font);
-
- IF_FREE(tx->font);
- tx->font = strdup(font);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-char *
-ewl_text_context_font_get(Ewl_Text_Context *tx)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("tx", tx, NULL);
-
- DRETURN_PTR(tx->font, DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_font_size_set(Ewl_Text_Context *tx, unsigned int size)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- tx->size = size;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-unsigned int
-ewl_text_context_font_size_get(Ewl_Text_Context *tx)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("tx", tx, 0);
-
- DRETURN_INT(tx->size, DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_styles_set(Ewl_Text_Context *tx, unsigned int styles)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- tx->styles = styles;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-unsigned int
-ewl_text_context_styles_get(Ewl_Text_Context *tx)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("tx", tx, 0);
-
- DRETURN_INT(tx->styles, DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_align_set(Ewl_Text_Context *tx, unsigned int align)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- tx->align = align;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-unsigned int
-ewl_text_context_align_get(Ewl_Text_Context *tx)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("tx", tx, 0);
-
- DRETURN_INT(tx->align, DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_wrap_set(Ewl_Text_Context *tx, unsigned int wrap)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- tx->wrap = wrap;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-unsigned int
-ewl_text_context_wrap_get(Ewl_Text_Context *tx)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("tx", tx, 0);
-
- DRETURN_INT(tx->wrap, DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_color_set(Ewl_Text_Context *tx, unsigned int r,
- unsigned int g, unsigned int b, unsigned int a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- tx->color.r = ((r < 255) ? r : 255);
- tx->color.g = ((g < 255) ? g : 255);
- tx->color.b = ((b < 255) ? b : 255);
- tx->color.a = ((a < 255) ? a : 255);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_color_get(Ewl_Text_Context *tx, unsigned int *r,
- unsigned int *g, unsigned int *b, unsigned int *a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- if (r) *r = tx->color.r;
- if (g) *g = tx->color.g;
- if (b) *b = tx->color.b;
- if (a) *a = tx->color.a;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_bg_color_set(Ewl_Text_Context *tx, unsigned int r,
- unsigned int g, unsigned int b, unsigned int a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- tx->style_colors.bg.r = ((r < 255) ? r : 255);
- tx->style_colors.bg.g = ((g < 255) ? g : 255);
- tx->style_colors.bg.b = ((b < 255) ? b : 255);
- tx->style_colors.bg.a = ((a < 255) ? a : 255);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_bg_color_get(Ewl_Text_Context *tx, unsigned int *r,
- unsigned int *g, unsigned int *b, unsigned int *a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- if (r) *r = tx->style_colors.bg.r;
- if (g) *g = tx->style_colors.bg.g;
- if (b) *b = tx->style_colors.bg.b;
- if (a) *a = tx->style_colors.bg.a;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_glow_color_set(Ewl_Text_Context *tx, unsigned int r,
- unsigned int g, unsigned int b, unsigned int a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- tx->style_colors.glow.r = ((r < 255) ? r : 255);
- tx->style_colors.glow.g = ((g < 255) ? g : 255);
- tx->style_colors.glow.b = ((b < 255) ? b : 255);
- tx->style_colors.glow.a = ((a < 255) ? a : 255);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_glow_color_get(Ewl_Text_Context *tx, unsigned int *r,
- unsigned int *g, unsigned int *b, unsigned int *a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- if (r) *r = tx->style_colors.glow.r;
- if (g) *g = tx->style_colors.glow.g;
- if (b) *b = tx->style_colors.glow.b;
- if (a) *a = tx->style_colors.glow.a;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_outline_color_set(Ewl_Text_Context *tx, unsigned int r,
- unsigned int g, unsigned int b, unsigned int a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- tx->style_colors.outline.r = ((r < 255) ? r : 255);
- tx->style_colors.outline.g = ((g < 255) ? g : 255);
- tx->style_colors.outline.b = ((b < 255) ? b : 255);
- tx->style_colors.outline.a = ((a < 255) ? a : 255);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_outline_color_get(Ewl_Text_Context *tx, unsigned int *r,
- unsigned int *g, unsigned int *b, unsigned int *a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- if (r) *r = tx->style_colors.outline.r;
- if (g) *g = tx->style_colors.outline.g;
- if (b) *b = tx->style_colors.outline.b;
- if (a) *a = tx->style_colors.outline.a;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_shadow_color_set(Ewl_Text_Context *tx, unsigned int r,
- unsigned int g, unsigned int b, unsigned int a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- tx->style_colors.shadow.r = ((r < 255) ? r : 255);
- tx->style_colors.shadow.g = ((g < 255) ? g : 255);
- tx->style_colors.shadow.b = ((b < 255) ? b : 255);
- tx->style_colors.shadow.a = ((a < 255) ? a : 255);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_shadow_color_get(Ewl_Text_Context *tx, unsigned int *r,
- unsigned int *g, unsigned int *b, unsigned int *a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- if (r) *r = tx->style_colors.shadow.r;
- if (g) *g = tx->style_colors.shadow.g;
- if (b) *b = tx->style_colors.shadow.b;
- if (a) *a = tx->style_colors.shadow.a;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_strikethrough_color_set(Ewl_Text_Context *tx, unsigned int r,
- unsigned int g, unsigned int b, unsigned int a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- tx->style_colors.strikethrough.r = ((r < 255) ? r : 255);
- tx->style_colors.strikethrough.g = ((g < 255) ? g : 255);
- tx->style_colors.strikethrough.b = ((b < 255) ? b : 255);
- tx->style_colors.strikethrough.a = ((a < 255) ? a : 255);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_strikethrough_color_get(Ewl_Text_Context *tx, unsigned int *r,
- unsigned int *g, unsigned int *b, unsigned int *a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- if (r) *r = tx->style_colors.strikethrough.r;
- if (g) *g = tx->style_colors.strikethrough.g;
- if (b) *b = tx->style_colors.strikethrough.b;
- if (a) *a = tx->style_colors.strikethrough.a;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_underline_color_set(Ewl_Text_Context *tx, unsigned int r,
- unsigned int g, unsigned int b, unsigned int a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- tx->style_colors.underline.r = ((r < 255) ? r : 255);
- tx->style_colors.underline.g = ((g < 255) ? g : 255);
- tx->style_colors.underline.b = ((b < 255) ? b : 255);
- tx->style_colors.underline.a = ((a < 255) ? a : 255);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_underline_color_get(Ewl_Text_Context *tx, unsigned int *r,
- unsigned int *g, unsigned int *b, unsigned int *a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- if (r) *r = tx->style_colors.underline.r;
- if (g) *g = tx->style_colors.underline.g;
- if (b) *b = tx->style_colors.underline.b;
- if (a) *a = tx->style_colors.underline.a;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_double_underline_color_set(Ewl_Text_Context *tx, unsigned int
r,
- unsigned int g, unsigned int b, unsigned int a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- tx->style_colors.double_underline.r = ((r < 255) ? r : 255);
- tx->style_colors.double_underline.g = ((g < 255) ? g : 255);
- tx->style_colors.double_underline.b = ((b < 255) ? b : 255);
- tx->style_colors.double_underline.a = ((a < 255) ? a : 255);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_text_context_double_underline_color_get(Ewl_Text_Context *tx, unsigned int
*r,
- unsigned int *g, unsigned int *b, unsigned int *a)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("tx", tx);
-
- if (r) *r = tx->style_colors.double_underline.r;
- if (g) *g = tx->style_colors.double_underline.g;
- if (b) *b = tx->style_colors.double_underline.b;
- if (a) *a = tx->style_colors.double_underline.a;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
/*
* Ewl_Text_Tree stuff
*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_text.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_text.h 21 Nov 2005 03:55:47 -0000 1.22
+++ ewl_text.h 21 Nov 2005 18:04:22 -0000 1.23
@@ -295,61 +295,6 @@
int ewl_text_context_compare(Ewl_Text_Context *a, Ewl_Text_Context *b);
Ewl_Text_Context *ewl_text_context_dup(Ewl_Text_Context *old);
-void ewl_text_context_font_set(Ewl_Text_Context *tx, const char *font);
-char *ewl_text_context_font_get(Ewl_Text_Context *tx);
-
-void ewl_text_context_font_size_set(Ewl_Text_Context *tx, unsigned int size);
-unsigned int ewl_text_context_font_size_get(Ewl_Text_Context *tx);
-
-void ewl_text_context_styles_set(Ewl_Text_Context *tx, unsigned int styles);
-unsigned int ewl_text_context_styles_get(Ewl_Text_Context *tx);
-
-void ewl_text_context_align_set(Ewl_Text_Context *tx, unsigned int align);
-unsigned int ewl_text_context_align_get(Ewl_Text_Context *tx);
-
-void ewl_text_context_wrap_set(Ewl_Text_Context *tx, unsigned int wrap);
-unsigned int ewl_text_context_wrap_get(Ewl_Text_Context *tx);
-
-void ewl_text_context_color_set(Ewl_Text_Context *tx, unsigned int r,
- unsigned int g, unsigned int b, unsigned int a);
-void ewl_text_context_color_get(Ewl_Text_Context *tx, unsigned int *r,
- unsigned int *g, unsigned int *b, unsigned int *a);
-
-void ewl_text_context_bg_color_set(Ewl_Text_Context *tx, unsigned int r,
- unsigned int g, unsigned int b, unsigned int a);
-void ewl_text_context_bg_color_get(Ewl_Text_Context *tx, unsigned int *r,
- unsigned int *g, unsigned int *b, unsigned int *a);
-
-void ewl_text_context_glow_color_set(Ewl_Text_Context *tx, unsigned int r,
- unsigned int g, unsigned int b, unsigned int a);
-void ewl_text_context_glow_color_get(Ewl_Text_Context *tx, unsigned int *r,
- unsigned int *g, unsigned int *b, unsigned int *a);
-
-void ewl_text_context_outline_color_set(Ewl_Text_Context *tx, unsigned int r,
- unsigned int g, unsigned int b, unsigned int a);
-void ewl_text_context_outline_color_get(Ewl_Text_Context *tx, unsigned int *r,
- unsigned int *g, unsigned int *b, unsigned int *a);
-
-void ewl_text_context_shadow_color_set(Ewl_Text_Context *tx, unsigned int r,
- unsigned int g, unsigned int b, unsigned int a);
-void ewl_text_context_shadow_color_get(Ewl_Text_Context *tx, unsigned int *r,
- unsigned int *g, unsigned int *b, unsigned int *a);
-
-void ewl_text_context_strikethrough_color_set(Ewl_Text_Context *tx, unsigned
int r,
- unsigned int g, unsigned int b, unsigned int a);
-void ewl_text_context_strikethrough_color_get(Ewl_Text_Context *tx, unsigned
int *r,
- unsigned int *g, unsigned int *b, unsigned int *a);
-
-void ewl_text_context_underline_color_set(Ewl_Text_Context *tx, unsigned int r,
- unsigned int g, unsigned int b, unsigned int a);
-void ewl_text_context_underline_color_get(Ewl_Text_Context *tx, unsigned int
*r,
- unsigned int *g, unsigned int *b, unsigned int *a);
-
-void ewl_text_context_double_underline_color_set(Ewl_Text_Context *tx,
unsigned int r,
- unsigned int g, unsigned int b, unsigned int a);
-void ewl_text_context_double_underline_color_get(Ewl_Text_Context *tx,
unsigned int *r,
- unsigned int *g, unsigned int *b, unsigned int *a);
-
/*
* Ewl_Text_Tree stuff
*/
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc. Get Certified Today
Register for a JBoss Training Course. Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
