Mercurial > MadButterfly
changeset 451:5c9e2a8a4bd8
Remove all "cairo" wording.
- all cairo are replaced by mbe version
- except pango relative ones.
| author | Thinker K.F. Li <thinker@branda.to> |
|---|---|
| date | Wed, 05 Aug 2009 16:10:47 +0800 |
| parents | a417fd980228 |
| children | cb10f3424f3a |
| files | include/mb_graph_engine.h src/X_main.c src/X_supp.c src/event.c |
| diffstat | 4 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/include/mb_graph_engine.h Wed Aug 05 15:54:44 2009 +0800 +++ b/include/mb_graph_engine.h Wed Aug 05 16:10:47 2009 +0800 @@ -3,6 +3,7 @@ #include <stdio.h> #include <cairo.h> +#include <cairo-xlib.h> #include "mb_img_ldr.h" /*! \defgroup mb_graph_engine MadButterfly Graphic Engine
--- a/src/X_main.c Wed Aug 05 15:54:44 2009 +0800 +++ b/src/X_main.c Wed Aug 05 16:10:47 2009 +0800 @@ -5,7 +5,6 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> #include "mb_graph_engine.h" -#include <cairo-xlib.h> #include <pango/pangocairo.h> #include <string.h>
--- a/src/X_supp.c Wed Aug 05 15:54:44 2009 +0800 +++ b/src/X_supp.c Wed Aug 05 16:10:47 2009 +0800 @@ -4,7 +4,6 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> #include "mb_graph_engine.h" -#include <cairo-xlib.h> #include "mb_redraw_man.h" #include "mb_timer.h" #include "mb_X_supp.h"
--- a/src/event.c Wed Aug 05 15:54:44 2009 +0800 +++ b/src/event.c Wed Aug 05 16:10:47 2009 +0800 @@ -558,12 +558,12 @@ } } -/*! \brief Implement exactly point testing with Cairo. +/*! \brief Implement exactly point testing with MB graphic engine. * * \note This function should not be called directly. Call * _shape_pos_is_in() insteaded. */ -static int _shape_pos_is_in_cairo(shape_t *shape, co_aix x, co_aix y, +static int _shape_pos_is_in_mbe(shape_t *shape, co_aix x, co_aix y, int *in_stroke, mbe_t *cr) { draw_shape_path(shape, cr); if(shape->fill) { @@ -592,7 +592,7 @@ if(!r) return FALSE; - r = _shape_pos_is_in_cairo(shape, x, y, in_stroke, cr); + r = _shape_pos_is_in_mbe(shape, x, y, in_stroke, cr); mbe_new_path(cr); if(!r) return FALSE; @@ -735,7 +735,7 @@ * coord is relative less than shapes. Check areas of coord can * skip sub-trees and avoid useless heavy computation. For shapes, * it not only check overlay of area. It also check overlay by - * actually drawing on a cairo surface. + * actually drawing on a mbe surface. */ static int _is_obj_objs_overlay(mb_obj_t *obj, mb_obj_t *others_root, @@ -825,7 +825,7 @@ /*! \brief Test if two objects are overlaid. * - * \todo Detect overlay in better way with cairo. + * \todo Detect overlay in better way with mbe. * \note This function cost heavy on CPU power. */ int mb_objs_are_overlay(redraw_man_t *rdman,