Mercurial > MadButterfly
annotate src/redraw_man.c @ 65:35c2b7ba140b
Use file name of generated M4 script as name of header
author | Thinker K.F. Li <thinker@branda.to> |
---|---|
date | Wed, 13 Aug 2008 02:11:55 +0800 |
parents | 1ca417f741f1 |
children | 9ab15ebc9061 |
rev | line source |
---|---|
12 | 1 #include <stdio.h> |
2 #include <stdlib.h> | |
3 #include <string.h> | |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
4 #include <cairo.h> |
12 | 5 #include "mb_types.h" |
6 #include "shapes.h" | |
7 #include "tools.h" | |
8 #include "redraw_man.h" | |
9 | |
26
d50f33040de6
Set line width for path.
Thinker K.F. Li <thinker@branda.to>
parents:
25
diff
changeset
|
10 /* NOTE: bounding box should also consider width of stroke. |
d50f33040de6
Set line width for path.
Thinker K.F. Li <thinker@branda.to>
parents:
25
diff
changeset
|
11 */ |
d50f33040de6
Set line width for path.
Thinker K.F. Li <thinker@branda.to>
parents:
25
diff
changeset
|
12 |
12 | 13 #define OK 0 |
14 #define ERR -1 | |
15 | |
13 | 16 #define OFFSET(type, field) ((void *)&((type *)NULL)->field - (void *)NULL) |
17 #define SWAP(a, b, t) do { t c; c = a; a = b; b = c; } while(0) | |
18 | |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
19 #ifdef UNITTEST |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
20 typedef struct _sh_dummy sh_dummy_t; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
21 |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
22 extern void sh_dummy_transform(shape_t *shape); |
20
74d3d5dc9aaa
rename XXX_draw() to XXX_fill()
Thinker K.F. Li <thinker@branda.to>
parents:
19
diff
changeset
|
23 extern void sh_dummy_fill(shape_t *, cairo_t *); |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
24 #endif /* UNITTEST */ |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
25 |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
26 /*! \brief Sort a list of element by a unsigned integer. |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
27 * |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
28 * The result is in ascend order. The unsigned integers is |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
29 * at offset specified by 'off' from start address of elemnts. |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
30 */ |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
31 static void _insert_sort(void **elms, int num, int off) { |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
32 int i, j; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
33 unsigned int val; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
34 |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
35 for(i = 1; i < num; i++) { |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
36 val = *(unsigned int *)(elms[i] + off); |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
37 for(j = i; j > 0; j--) { |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
38 if(*(unsigned int *)(elms[j - 1] + off) <= val) |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
39 break; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
40 elms[j] = elms[j - 1]; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
41 } |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
42 elms[j] = elms[i]; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
43 } |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
44 } |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
45 |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
46 static int extend_memblk(void **buf, int o_size, int n_size) { |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
47 void *new_buf; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
48 |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
49 new_buf = realloc(*buf, n_size); |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
50 if(new_buf == NULL) |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
51 return ERR; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
52 |
30
e06a4a667ce2
Accept mouse/pointer event and hint the shape that the pointer is over.
Thinker K.F. Li <thinker@branda.to>
parents:
29
diff
changeset
|
53 *buf = new_buf; |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
54 |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
55 return OK; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
56 } |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
57 |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
58 static int add_dirty_geo(redraw_man_t *rdman, geo_t *geo) { |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
59 int max_dirty_geos; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
60 int r; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
61 |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
62 if(rdman->n_dirty_geos >= rdman->max_dirty_geos) { |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
63 max_dirty_geos = rdman->n_geos; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
64 r = extend_memblk((void **)&rdman->dirty_geos, |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
65 sizeof(geo_t *) * rdman->n_dirty_geos, |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
66 sizeof(geo_t *) * max_dirty_geos); |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
67 if(r != OK) |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
68 return ERR; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
69 rdman->max_dirty_geos = max_dirty_geos; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
70 } |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
71 |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
72 rdman->dirty_geos[rdman->n_dirty_geos++] = geo; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
73 return OK; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
74 } |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
75 |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
76 static int add_dirty_area(redraw_man_t *rdman, area_t *area) { |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
77 int max_dirty_areas; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
78 int r; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
79 |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
80 if(rdman->n_dirty_areas >= rdman->max_dirty_areas) { |
37 | 81 /* every geo object and coord object can contribute 2 areas. |
82 * rdman_draw_area() may also contribute 1 area. | |
83 */ | |
84 max_dirty_areas = (rdman->n_geos + rdman->n_coords) * 2 + 1; | |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
85 r = extend_memblk((void **)&rdman->dirty_areas, |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
86 sizeof(area_t *) * rdman->n_dirty_areas, |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
87 sizeof(area_t *) * max_dirty_areas); |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
88 if(r != OK) |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
89 return ERR; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
90 rdman->max_dirty_areas = max_dirty_areas; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
91 } |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
92 |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
93 rdman->dirty_areas[rdman->n_dirty_areas++] = area; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
94 return OK; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
95 } |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
96 |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
97 static void area_to_positions(area_t *area, co_aix (*poses)[2]) { |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
98 poses[0][0] = area->x; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
99 poses[0][1] = area->y; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
100 poses[1][0] = area->x + area->w; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
101 poses[1][1] = area->y + area->h;; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
102 } |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
103 |
24
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
104 int redraw_man_init(redraw_man_t *rdman, cairo_t *cr, cairo_t *backend) { |
12 | 105 extern void redraw_man_destroy(redraw_man_t *rdman); |
106 | |
107 memset(rdman, 0, sizeof(redraw_man_t)); | |
108 | |
109 rdman->geo_pool = elmpool_new(sizeof(geo_t), 128); | |
110 if(rdman->geo_pool == NULL) | |
111 return ERR; | |
112 | |
113 rdman->coord_pool = elmpool_new(sizeof(coord_t), 16); | |
114 if(rdman->coord_pool == NULL) { | |
115 elmpool_free(rdman->geo_pool); | |
116 return ERR; | |
117 } | |
118 | |
18
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
119 rdman->shnode_pool = elmpool_new(sizeof(shnode_t), 16); |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
120 if(rdman->shnode_pool == NULL) { |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
121 elmpool_free(rdman->geo_pool); |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
122 elmpool_free(rdman->coord_pool); |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
123 return ERR; |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
124 } |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
125 |
12 | 126 rdman->root_coord = elmpool_elm_alloc(rdman->coord_pool); |
127 if(rdman->root_coord == NULL) | |
128 redraw_man_destroy(rdman); | |
13 | 129 rdman->n_coords = 1; |
12 | 130 coord_init(rdman->root_coord, NULL); |
131 | |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
132 rdman->cr = cr; |
24
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
133 rdman->backend = backend; |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
134 |
12 | 135 return OK; |
136 } | |
137 | |
138 void redraw_man_destroy(redraw_man_t *rdman) { | |
139 elmpool_free(rdman->coord_pool); | |
140 elmpool_free(rdman->geo_pool); | |
18
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
141 elmpool_free(rdman->shnode_pool); |
13 | 142 if(rdman->dirty_coords) |
143 free(rdman->dirty_coords); | |
14 | 144 if(rdman->dirty_geos) |
145 free(rdman->dirty_geos); | |
30
e06a4a667ce2
Accept mouse/pointer event and hint the shape that the pointer is over.
Thinker K.F. Li <thinker@branda.to>
parents:
29
diff
changeset
|
146 if(rdman->gen_geos) |
e06a4a667ce2
Accept mouse/pointer event and hint the shape that the pointer is over.
Thinker K.F. Li <thinker@branda.to>
parents:
29
diff
changeset
|
147 free(rdman->gen_geos); |
12 | 148 } |
149 | |
150 | |
151 #define ASSERT(x) | |
152 /* | |
153 * Change transformation matrix | |
154 * - update aggregated transformation matrix | |
155 * - of coord_t object been changed. | |
156 * - of children coord_t objects. | |
157 * - redraw members of coord_t objects. | |
158 * - redraw shape objects they are overlaid with members. | |
159 * - find out overlaid shape objects. | |
160 * - geo_t of a coord_t object | |
161 * - can make finding more efficiency. | |
162 * - fill overlay geo_t objects of members. | |
163 * | |
164 * Change a shape object | |
165 * - redraw changed object. | |
166 * - redraw shape objects they are overlaid with changed object. | |
167 * - find out overlaid shape objects. | |
168 * | |
169 * That coord and geo of shape objects are setted by user code | |
170 * give user code a chance to collect coord and geo objects together | |
171 * and gain interest of higher cache hit rate. | |
172 */ | |
173 | |
174 /*! \brief Find out all affected shape objects. | |
175 * | |
176 * Find out all shape objects that are overalid with geo_t of | |
177 * a geometry changed object. | |
178 * | |
179 * Linear scan geo_t objects of all shape objects in all_shapes | |
180 * list of a redraw_man_t object. | |
181 */ | |
182 int rdman_find_overlaid_shapes(redraw_man_t *rdman, geo_t *geo, | |
183 geo_t ***overlays) { | |
184 int n_geos; | |
185 geo_t **geos; | |
186 geo_t *geo_cur; | |
187 int n_overlays; | |
188 geo_t **_overlays; | |
189 int i; | |
190 | |
191 n_geos = rdman->n_geos; | |
192 | |
193 geos = (geo_t **)malloc(sizeof(geo_t *) * n_geos); | |
194 if(geos == NULL) | |
195 return -1; | |
196 | |
197 _overlays = (geo_t **)malloc(sizeof(geo_t *) * n_geos); | |
198 if(geos == NULL) { | |
199 free(geos); | |
200 return -1; | |
201 } | |
202 | |
203 geo_cur = STAILQ_HEAD(rdman->all_geos); | |
204 for(i = 0; i < n_geos; i++) { | |
205 geos[i] = geo_cur; | |
206 geo_cur = STAILQ_NEXT(geo_t, next, geo_cur); | |
207 } | |
208 geo_mark_overlay(geo, n_geos, geos, &n_overlays, _overlays); | |
209 | |
210 free(geos); | |
211 *overlays = _overlays; | |
212 | |
213 return n_overlays; | |
214 } | |
215 | |
216 int rdman_add_shape(redraw_man_t *rdman, shape_t *shape, coord_t *coord) { | |
217 geo_t *geo; | |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
218 #ifdef GEO_ORDER |
13 | 219 geo_t *visit; |
220 unsigned int next_order; | |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
221 #endif |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
222 int r; |
12 | 223 |
224 geo = elmpool_elm_alloc(rdman->geo_pool); | |
225 if(geo == NULL) | |
226 return ERR; | |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
227 |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
228 geo_init(geo); |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
229 |
12 | 230 sh_attach_geo(shape, geo); |
231 STAILQ_INS_TAIL(rdman->all_geos, geo_t, next, geo); | |
232 rdman->n_geos++; | |
13 | 233 |
58 | 234 /*! \todo remove order number. */ |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
235 #ifdef GEO_ORDER |
13 | 236 geo->order = ++rdman->next_geo_order; |
237 if(geo->order == 0) { | |
238 next_order = 0; | |
239 for(visit = STAILQ_HEAD(rdman->all_geos); | |
240 visit != NULL; | |
241 visit = STAILQ_NEXT(geo_t, next, visit)) | |
242 visit->order = ++next_order; | |
243 rdman->next_geo_order = next_order; | |
244 } | |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
245 #endif |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
246 |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
247 /* New one should be dirty to recompute it when drawing. */ |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
248 geo->flags |= GEF_DIRTY; |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
249 r = add_dirty_geo(rdman, geo); |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
250 if(r != OK) |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
251 return ERR; |
13 | 252 |
12 | 253 sh_attach_coord(shape, coord); |
254 | |
255 return OK; | |
256 } | |
257 | |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
258 /*! \brief Remove a shape object from redraw manager. |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
259 * |
58 | 260 * \todo redraw shape objects that overlaid with removed one. |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
261 */ |
12 | 262 int rdman_remove_shape(redraw_man_t *rdman, shape_t *shape) { |
263 STAILQ_REMOVE(rdman->all_geos, geo_t, next, shape->geo); | |
264 elmpool_elm_free(rdman->geo_pool, shape->geo); | |
265 sh_detach_geo(shape); | |
266 rdman->n_geos--; | |
267 sh_detach_coord(shape); | |
268 return OK; | |
269 } | |
270 | |
271 coord_t *rdman_coord_new(redraw_man_t *rdman, coord_t *parent) { | |
13 | 272 coord_t *coord, *root_coord; |
273 coord_t *visit; | |
12 | 274 |
275 coord = elmpool_elm_alloc(rdman->coord_pool); | |
276 if(coord == NULL) | |
277 return NULL; | |
278 | |
279 coord_init(coord, parent); | |
13 | 280 rdman->n_coords++; |
281 | |
282 coord->order = ++rdman->next_coord_order; | |
283 if(coord->order == 0) { | |
284 rdman->next_coord_order = 0; | |
285 root_coord = visit = rdman->root_coord; | |
286 /* skip root coord. */ | |
287 visit = preorder_coord_subtree(root_coord, visit); | |
288 while(visit) { | |
289 visit->order = ++rdman->next_coord_order; | |
290 visit = preorder_coord_subtree(root_coord, visit); | |
291 } | |
292 } | |
12 | 293 |
294 return coord; | |
295 } | |
296 | |
297 /*! \brief Free a coord of a redraw_man_t object. | |
298 * | |
299 * \param coord is a coord_t without children and members. | |
300 * \return 0 for successful, -1 for error. | |
301 */ | |
302 int rdman_coord_free(redraw_man_t *rdman, coord_t *coord) { | |
303 coord_t *parent; | |
304 | |
305 parent = coord->parent; | |
306 if(parent == NULL) | |
307 return ERR; | |
308 | |
309 if(STAILQ_HEAD(coord->members) != NULL) | |
310 return ERR; | |
311 | |
312 if(STAILQ_HEAD(coord->children) != NULL) | |
313 return ERR; | |
314 | |
315 STAILQ_REMOVE(parent->children, coord_t, sibling, coord); | |
316 elmpool_elm_free(rdman->coord_pool, coord); | |
13 | 317 rdman->n_coords--; |
318 | |
319 return OK; | |
320 } | |
321 | |
322 /*! \brief Mark a coord is changed. | |
323 * | |
324 * A changed coord_t object is marked as dirty and put | |
325 * into dirty_coords list. | |
326 */ | |
327 int rdman_coord_changed(redraw_man_t *rdman, coord_t *coord) { | |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
328 coord_t *child; |
13 | 329 int max_dirty_coords; |
330 int r; | |
331 | |
332 if(coord->flags & COF_DIRTY) | |
333 return OK; | |
334 | |
335 if(rdman->n_dirty_coords >= rdman->max_dirty_coords) { | |
336 /* Max of dirty_coords is not big enough. */ | |
337 max_dirty_coords = rdman->max_dirty_coords + 16; | |
338 | |
339 r = extend_memblk((void **)&rdman->dirty_coords, | |
340 sizeof(coord_t *) * rdman->n_dirty_coords, | |
341 sizeof(coord_t *) * max_dirty_coords); | |
342 rdman->max_dirty_coords = max_dirty_coords; | |
343 } | |
344 | |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
345 /* Make the coord and child coords dirty. */ |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
346 for(child = coord; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
347 child != NULL; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
348 child = preorder_coord_subtree(coord, child)) { |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
349 rdman->dirty_coords[rdman->n_dirty_coords++] = coord; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
350 coord->flags |= COF_DIRTY; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
351 } |
13 | 352 |
353 return OK; | |
354 } | |
355 | |
18
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
356 static int _rdman_shape_changed(redraw_man_t *rdman, shape_t *shape) { |
13 | 357 geo_t *geo; |
358 int r; | |
359 | |
360 geo = shape->geo; | |
361 | |
362 if(geo->flags & GEF_DIRTY) | |
363 return OK; | |
364 | |
365 r = add_dirty_geo(rdman, geo); | |
366 if(r == ERR) | |
367 return ERR; | |
368 geo->flags |= GEF_DIRTY; | |
12 | 369 |
370 return OK; | |
371 } | |
372 | |
18
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
373 /*! \brief Mark a shape is changed. |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
374 * |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
375 * The geo_t object of a changed shape is mark as dirty and |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
376 * put into dirty_geos list. |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
377 */ |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
378 int rdman_shape_changed(redraw_man_t *rdman, shape_t *shape) { |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
379 return _rdman_shape_changed(rdman, shape); |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
380 } |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
381 |
29 | 382 int rdman_paint_changed(redraw_man_t *rdman, paint_t *paint) { |
383 shnode_t *node; | |
384 int r; | |
385 | |
386 for(node = STAILQ_HEAD(paint->members); | |
387 node != NULL; | |
388 node = STAILQ_NEXT(shnode_t, next, node)) { | |
389 r = _rdman_shape_changed(rdman, node->shape); | |
390 if(r != OK) | |
391 return ERR; | |
392 } | |
393 return OK; | |
394 } | |
395 | |
28 | 396 /* Clean dirties */ |
397 | |
57
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
398 static int is_coord_subtree_hidden(coord_t *coord) { |
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
399 while(coord) { |
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
400 if(coord->flags & COF_HIDDEN) |
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
401 return 1; |
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
402 coord = coord->parent; |
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
403 } |
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
404 return 0; |
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
405 } |
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
406 |
28 | 407 static void clean_shape(shape_t *shape) { |
408 switch(shape->sh_type) { | |
409 case SHT_PATH: | |
410 sh_path_transform(shape); | |
411 break; | |
412 case SHT_TEXT: | |
413 sh_text_transform(shape); | |
414 break; | |
35
581a03196093
Support rectangle tag of SVG.
Thinker K.F. Li <thinker@branda.to>
parents:
33
diff
changeset
|
415 case SHT_RECT: |
581a03196093
Support rectangle tag of SVG.
Thinker K.F. Li <thinker@branda.to>
parents:
33
diff
changeset
|
416 sh_rect_transform(shape); |
581a03196093
Support rectangle tag of SVG.
Thinker K.F. Li <thinker@branda.to>
parents:
33
diff
changeset
|
417 break; |
28 | 418 #ifdef UNITTEST |
419 default: | |
420 sh_dummy_transform(shape); | |
421 break; | |
422 #endif /* UNITTEST */ | |
423 } | |
424 shape->geo->flags &= ~GEF_DIRTY; | |
57
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
425 |
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
426 if(is_coord_subtree_hidden(shape->coord)) |
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
427 shape->geo->flags |= GEF_HIDDEN; |
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
428 else |
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
429 shape->geo->flags &= ~GEF_HIDDEN; |
28 | 430 } |
431 | |
432 static int clean_coord(coord_t *coord) { | |
433 shape_t *shape; | |
434 geo_t *geo; | |
435 co_aix (*poses)[2]; | |
436 int cnt, pos_cnt; | |
437 | |
438 compute_aggr_of_coord(coord); | |
439 | |
440 /* Clean member shapes. */ | |
441 cnt = 0; | |
442 for(shape = STAILQ_HEAD(coord->members); | |
443 shape != NULL; | |
444 shape = STAILQ_NEXT(shape_t, coord_mem_next, shape)) { | |
445 geo = shape->geo; | |
446 SWAP(geo->cur_area, geo->last_area, area_t *); | |
447 clean_shape(shape); | |
448 cnt++; | |
449 } | |
450 | |
451 /* Compute area of the coord. */ | |
452 poses = (co_aix (*)[2])malloc(sizeof(co_aix [2]) * 2 * cnt); | |
453 if(poses == NULL) | |
454 return ERR; | |
455 | |
456 pos_cnt = 0; | |
457 for(shape = STAILQ_HEAD(coord->members); | |
458 shape != NULL; | |
459 shape = STAILQ_NEXT(shape_t, coord_mem_next, shape)) { | |
460 geo = shape->geo; | |
461 | |
462 area_to_positions(geo->cur_area, poses + pos_cnt); | |
463 pos_cnt += 2; | |
464 } | |
465 | |
466 SWAP(coord->cur_area, coord->last_area, area_t *); | |
467 area_init(coord->cur_area, pos_cnt, poses); | |
468 free(poses); | |
469 | |
470 coord->flags &= ~COF_DIRTY; | |
471 | |
472 return OK; | |
473 } | |
474 | |
475 static int clean_rdman_coords(redraw_man_t *rdman) { | |
476 coord_t *coord; | |
477 coord_t **dirty_coords; | |
478 int n_dirty_coords; | |
479 int i, r; | |
480 | |
481 n_dirty_coords = rdman->n_dirty_coords; | |
482 if(n_dirty_coords > 0) { | |
483 dirty_coords = rdman->dirty_coords; | |
484 _insert_sort((void **)dirty_coords, n_dirty_coords, | |
485 OFFSET(coord_t, order)); | |
486 for(i = 0; i < n_dirty_coords; i++) { | |
487 coord = dirty_coords[i]; | |
488 if(!(coord->flags & COF_DIRTY)) | |
489 continue; | |
490 r = clean_coord(coord); | |
491 if(r != OK) | |
492 return ERR; | |
493 /* These two steps can be avoided for drawing all. */ | |
494 add_dirty_area(rdman, &coord->areas[0]); | |
495 add_dirty_area(rdman, &coord->areas[1]); | |
496 } | |
497 rdman->n_dirty_coords = 0; | |
498 } | |
499 return OK; | |
500 } | |
501 | |
502 static int clean_rdman_geos(redraw_man_t *rdman) { | |
503 int i; | |
504 int n_dirty_geos; | |
505 geo_t **dirty_geos; | |
506 geo_t *visit_geo; | |
507 | |
508 n_dirty_geos = rdman->n_dirty_geos; | |
509 if(n_dirty_geos > 0) { | |
510 dirty_geos = rdman->dirty_geos; | |
511 for(i = 0; i < n_dirty_geos; i++) { | |
512 visit_geo = dirty_geos[i]; | |
513 if(!(visit_geo->flags & GEF_DIRTY)) | |
514 continue; | |
515 | |
516 SWAP(visit_geo->cur_area, visit_geo->last_area, area_t *); | |
517 clean_shape(visit_geo->shape); | |
518 add_dirty_area(rdman, visit_geo->cur_area); | |
519 add_dirty_area(rdman, visit_geo->last_area); | |
520 } | |
521 rdman->n_dirty_geos = 0; | |
522 } | |
523 | |
524 return OK; | |
525 } | |
526 | |
29 | 527 static int clean_rdman_dirties(redraw_man_t *rdman) { |
528 int r; | |
529 | |
530 r = clean_rdman_coords(rdman); | |
531 if(r != OK) | |
532 return ERR; | |
533 | |
534 r = clean_rdman_geos(rdman); | |
535 if(r != OK) | |
536 return ERR; | |
537 | |
538 return OK; | |
539 } | |
540 | |
541 | |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
542 /* Drawing and Redrawing |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
543 * ============================================================ |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
544 */ |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
545 |
26
d50f33040de6
Set line width for path.
Thinker K.F. Li <thinker@branda.to>
parents:
25
diff
changeset
|
546 #ifndef UNITTEST |
d50f33040de6
Set line width for path.
Thinker K.F. Li <thinker@branda.to>
parents:
25
diff
changeset
|
547 static void set_shape_stroke_param(shape_t *shape, cairo_t *cr) { |
d50f33040de6
Set line width for path.
Thinker K.F. Li <thinker@branda.to>
parents:
25
diff
changeset
|
548 cairo_set_line_width(cr, shape->stroke_width); |
d50f33040de6
Set line width for path.
Thinker K.F. Li <thinker@branda.to>
parents:
25
diff
changeset
|
549 } |
33
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
550 |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
551 static void fill_path_preserve(redraw_man_t *rdman) { |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
552 cairo_fill_preserve(rdman->cr); |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
553 } |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
554 |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
555 static void fill_path(redraw_man_t *rdman) { |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
556 cairo_fill(rdman->cr); |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
557 } |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
558 |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
559 static void stroke_path(redraw_man_t *rdman) { |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
560 cairo_stroke(rdman->cr); |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
561 } |
26
d50f33040de6
Set line width for path.
Thinker K.F. Li <thinker@branda.to>
parents:
25
diff
changeset
|
562 #else |
d50f33040de6
Set line width for path.
Thinker K.F. Li <thinker@branda.to>
parents:
25
diff
changeset
|
563 static void set_shape_stroke_param(shape_t *shape, cairo_t *cr) { |
d50f33040de6
Set line width for path.
Thinker K.F. Li <thinker@branda.to>
parents:
25
diff
changeset
|
564 } |
33
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
565 |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
566 static void fill_path_preserve(redraw_man_t *rdman) { |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
567 } |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
568 |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
569 static void fill_path(redraw_man_t *rdman) { |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
570 } |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
571 |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
572 static void stroke_path(redraw_man_t *rdman) { |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
573 } |
26
d50f33040de6
Set line width for path.
Thinker K.F. Li <thinker@branda.to>
parents:
25
diff
changeset
|
574 #endif |
d50f33040de6
Set line width for path.
Thinker K.F. Li <thinker@branda.to>
parents:
25
diff
changeset
|
575 |
22 | 576 static void draw_shape(redraw_man_t *rdman, shape_t *shape) { |
577 paint_t *fill, *stroke; | |
18
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
578 |
33
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
579 if(shape->fill || shape->stroke) { |
19 | 580 switch(shape->sh_type) { |
581 case SHT_PATH: | |
33
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
582 sh_path_draw(shape, rdman->cr); |
19 | 583 break; |
27 | 584 case SHT_TEXT: |
33
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
585 sh_text_draw(shape, rdman->cr); |
27 | 586 break; |
35
581a03196093
Support rectangle tag of SVG.
Thinker K.F. Li <thinker@branda.to>
parents:
33
diff
changeset
|
587 case SHT_RECT: |
581a03196093
Support rectangle tag of SVG.
Thinker K.F. Li <thinker@branda.to>
parents:
33
diff
changeset
|
588 sh_rect_draw(shape, rdman->cr); |
581a03196093
Support rectangle tag of SVG.
Thinker K.F. Li <thinker@branda.to>
parents:
33
diff
changeset
|
589 break; |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
590 #ifdef UNITTEST |
19 | 591 default: |
20
74d3d5dc9aaa
rename XXX_draw() to XXX_fill()
Thinker K.F. Li <thinker@branda.to>
parents:
19
diff
changeset
|
592 sh_dummy_fill(shape, rdman->cr); |
19 | 593 break; |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
594 #endif /* UNITTEST */ |
19 | 595 } |
33
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
596 |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
597 fill = shape->fill; |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
598 if(shape->fill) { |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
599 fill->prepare(fill, rdman->cr); |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
600 if(shape->stroke) |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
601 fill_path_preserve(rdman); |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
602 else |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
603 fill_path(rdman); |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
604 } |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
605 |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
606 stroke = shape->stroke; |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
607 if(stroke) { |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
608 stroke->prepare(stroke, rdman->cr); |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
609 set_shape_stroke_param(shape, rdman->cr); |
d82749f77108
Fix bug of demo and remove *_fill() and *_stroke().
Thinker K.F. Li <thinker@branda.to>
parents:
30
diff
changeset
|
610 stroke_path(rdman); |
22 | 611 } |
612 } | |
13 | 613 } |
614 | |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
615 #ifndef UNITTEST |
25
29937c26bb01
Fix bug of a dark line appear when animating.
Thinker K.F. Li <thinker@branda.to>
parents:
24
diff
changeset
|
616 static void clean_canvas(cairo_t *cr) { |
58 | 617 /*! \todo clean to background color. */ |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
618 cairo_set_source_rgb(cr, 0, 0, 0); |
24
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
619 cairo_paint(cr); |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
620 } |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
621 |
24
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
622 static void make_clip(cairo_t *cr, int n_dirty_areas, |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
623 area_t **dirty_areas) { |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
624 int i; |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
625 area_t *area; |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
626 |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
627 for(i = 0; i < n_dirty_areas; i++) { |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
628 area = dirty_areas[i]; |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
629 cairo_rectangle(cr, area->x, area->y, area->w, area->h); |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
630 } |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
631 cairo_clip(cr); |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
632 } |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
633 |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
634 static void reset_clip(redraw_man_t *rdman) { |
24
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
635 cairo_reset_clip(rdman->backend); |
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
636 } |
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
637 |
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
638 static void copy_cr_2_backend(redraw_man_t *rdman, int n_dirty_areas, |
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
639 area_t **dirty_areas) { |
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
640 if(n_dirty_areas) |
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
641 make_clip(rdman->backend, n_dirty_areas, dirty_areas); |
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
642 |
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
643 cairo_paint(rdman->backend); |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
644 } |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
645 #else /* UNITTEST */ |
25
29937c26bb01
Fix bug of a dark line appear when animating.
Thinker K.F. Li <thinker@branda.to>
parents:
24
diff
changeset
|
646 static void clean_canvas(cairo_t *cr) { |
24
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
647 } |
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
648 |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
649 static void reset_clip(redraw_man_t *rdman) { |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
650 } |
24
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
651 |
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
652 static void copy_cr_2_backend(redraw_man_t *rdman, int n_dirty_areas, |
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
653 area_t **dirty_areas) { |
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
654 } |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
655 #endif /* UNITTEST */ |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
656 |
22 | 657 static void draw_shapes_in_areas(redraw_man_t *rdman, |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
658 int n_areas, |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
659 area_t **areas) { |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
660 geo_t *visit_geo; |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
661 int i; |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
662 |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
663 for(visit_geo = STAILQ_HEAD(rdman->all_geos); |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
664 visit_geo != NULL; |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
665 visit_geo = STAILQ_NEXT(geo_t, next, visit_geo)) { |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
666 if(visit_geo->flags & GEF_DIRTY) |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
667 clean_shape(visit_geo->shape); |
57
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
668 if(visit_geo->flags & GEF_HIDDEN) |
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
669 continue; |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
670 for(i = 0; i < n_areas; i++) { |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
671 if(is_overlay(visit_geo->cur_area, areas[i])) { |
22 | 672 draw_shape(rdman, visit_geo->shape); |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
673 break; |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
674 } |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
675 } |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
676 } |
13 | 677 } |
678 | |
24
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
679 |
13 | 680 /*! \brief Re-draw all changed shapes or shapes affected by changed coords. |
681 * | |
682 * A coord object has a geo to keep track the range that it's members will | |
683 * draw on. Geo of a coord should be recomputed when the coord is changed. | |
684 * Geo of a coord used to accelerate finding overlay shape objects of | |
685 * a specified geo. A coord object also must be recomputed when one of | |
686 * it's members is changed. | |
687 * | |
688 * New and old geo values of a coord object that is recomputed for | |
689 * changing of it-self must be used to find overlay shape objects. | |
690 * New and old geo values of a shape should also be used to find | |
691 * overlay shape objects, too. If a shape's coord is changed, shape's | |
692 * geo object is not used to find overlay shape objects any more. | |
693 * | |
694 * steps: | |
695 * - update chagned coord objects | |
14 | 696 * - recompute area for changed coord objects |
13 | 697 * - recompute geo for members shape objects |
14 | 698 * - clear dirty of geo for members to prevent from |
699 * recomputing for change of shape objects. | |
700 * - add old and new area value to list of dirty areas. | |
13 | 701 * - recompute geo for changed shape objects |
14 | 702 * - only if a shape object is dirty. |
703 * - put new and old value of area of geo to list of dirty areas. | |
704 * - Scan all shapes and redraw shapes overlaid with dirty areas. | |
13 | 705 * |
14 | 706 * dirty flag of coord objects is cleared after update. |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
707 * dirty flag of geo objects is also cleared after recomputing. |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
708 * Clean dirty flag can prevent redundant computing for geo and |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
709 * corod objects. |
14 | 710 * |
13 | 711 */ |
712 int rdman_redraw_changed(redraw_man_t *rdman) { | |
28 | 713 int r; |
13 | 714 int n_dirty_areas; |
14 | 715 area_t **dirty_areas; |
13 | 716 |
29 | 717 r = clean_rdman_dirties(rdman); |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
718 if(r != OK) |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
719 return ERR; |
13 | 720 |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
721 n_dirty_areas = rdman->n_dirty_areas; |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
722 dirty_areas = rdman->dirty_areas; |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
723 if(n_dirty_areas > 0) { |
25
29937c26bb01
Fix bug of a dark line appear when animating.
Thinker K.F. Li <thinker@branda.to>
parents:
24
diff
changeset
|
724 clean_canvas(rdman->cr); |
22 | 725 draw_shapes_in_areas(rdman, n_dirty_areas, dirty_areas); |
24
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
726 copy_cr_2_backend(rdman, rdman->n_dirty_areas, rdman->dirty_areas); |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
727 rdman->n_dirty_areas = 0; |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
728 reset_clip(rdman); |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
729 } |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
730 rdman->n_dirty_areas = 0; |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
731 |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
732 return OK; |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
733 } |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
734 |
38 | 735 /* NOTE: Before redrawing, the canvas/surface must be cleaned. |
736 * NOTE: After redrawing, the content must be copied to the backend surface. | |
737 */ | |
738 | |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
739 int rdman_redraw_all(redraw_man_t *rdman) { |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
740 geo_t *geo; |
29 | 741 int r; |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
742 |
29 | 743 r = clean_rdman_dirties(rdman); |
744 if(r != OK) | |
745 return ERR; | |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
746 |
37 | 747 clean_canvas(rdman->cr); |
748 | |
15
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
749 for(geo = STAILQ_HEAD(rdman->all_geos); |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
750 geo != NULL; |
c2ce186a5c37
X_main uses rdman_redraw_all()
Thinker K.F. Li <thinker@branda.to>
parents:
14
diff
changeset
|
751 geo = STAILQ_NEXT(geo_t, next, geo)) { |
57
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
752 if(geo->flags & GEF_HIDDEN) |
ab028c9f0930
Ability to hidden shapes and action of visibility.
Thinker K.F. Li <thinker@branda.to>
parents:
38
diff
changeset
|
753 continue; |
22 | 754 draw_shape(rdman, geo->shape); |
13 | 755 } |
24
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
756 copy_cr_2_backend(rdman, 0, NULL); |
29 | 757 rdman->n_dirty_areas = 0; |
13 | 758 |
759 return OK; | |
12 | 760 } |
761 | |
37 | 762 int rdman_redraw_area(redraw_man_t *rdman, co_aix x, co_aix y, |
763 co_aix w, co_aix h) { | |
764 area_t area; | |
765 int r; | |
766 | |
767 area.x = x; | |
768 area.y = y; | |
769 area.w = w; | |
770 area.h = h; | |
771 add_dirty_area(rdman, &area); | |
772 | |
773 r = rdman_redraw_changed(rdman); | |
774 | |
775 return r; | |
776 } | |
777 | |
30
e06a4a667ce2
Accept mouse/pointer event and hint the shape that the pointer is over.
Thinker K.F. Li <thinker@branda.to>
parents:
29
diff
changeset
|
778 int rdman_force_clean(redraw_man_t *rdman) { |
e06a4a667ce2
Accept mouse/pointer event and hint the shape that the pointer is over.
Thinker K.F. Li <thinker@branda.to>
parents:
29
diff
changeset
|
779 int r; |
e06a4a667ce2
Accept mouse/pointer event and hint the shape that the pointer is over.
Thinker K.F. Li <thinker@branda.to>
parents:
29
diff
changeset
|
780 |
e06a4a667ce2
Accept mouse/pointer event and hint the shape that the pointer is over.
Thinker K.F. Li <thinker@branda.to>
parents:
29
diff
changeset
|
781 r = clean_rdman_dirties(rdman); |
e06a4a667ce2
Accept mouse/pointer event and hint the shape that the pointer is over.
Thinker K.F. Li <thinker@branda.to>
parents:
29
diff
changeset
|
782 |
e06a4a667ce2
Accept mouse/pointer event and hint the shape that the pointer is over.
Thinker K.F. Li <thinker@branda.to>
parents:
29
diff
changeset
|
783 return r; |
e06a4a667ce2
Accept mouse/pointer event and hint the shape that the pointer is over.
Thinker K.F. Li <thinker@branda.to>
parents:
29
diff
changeset
|
784 } |
e06a4a667ce2
Accept mouse/pointer event and hint the shape that the pointer is over.
Thinker K.F. Li <thinker@branda.to>
parents:
29
diff
changeset
|
785 |
18
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
786 shnode_t *shnode_new(redraw_man_t *rdman, shape_t *shape) { |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
787 shnode_t *node; |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
788 |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
789 node = (shnode_t *)elmpool_elm_alloc(rdman->shnode_pool); |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
790 if(node) { |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
791 node->shape = shape; |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
792 node->next = NULL; |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
793 } |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
794 return node; |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
795 } |
0f3baa488a62
Support solid color paint for fill.
Thinker K.F. Li <thinker@branda.to>
parents:
17
diff
changeset
|
796 |
12 | 797 /* |
16
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
798 * Dirty of geo |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
799 * A geo is dirty when any of the shape, size or positions is changed. |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
800 * It's geo and positions should be recomputed before drawing. So, |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
801 * dirty geos are marked as dirty and put into dirty_geos list. |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
802 * The list is inspected before drawing to make sure the right shape, |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
803 * size, and positions. |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
804 * |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
805 * Dirty of coord |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
806 * A coord is dirty when it's transformation matrix being changed. |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
807 * Dirty coords are marked as dirty and put into dirty_coords list. |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
808 * Once a coord is dirty, every member geos of it are also dirty. |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
809 * Because, their shape, size and positions will be changed. But, |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
810 * they are not marked as dirty and put into dirty_geos list, since |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
811 * all these member geos will be recomputed for computing new current |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
812 * area of the coord. The changes of a coord also affect child |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
813 * coords. Once parent is dirty, all children are also dirty for |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
814 * their aggregate matrix out of date. Dirty coords should be |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
815 * clean in preorder of tree traversal. The dirty_coords list |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
816 * are sorted to keep the order before cleaning. |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
817 * Whenever a coord is marked dirty and put into dirty_coords list, |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
818 * all it's children should also be marked and put. |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
819 * |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
820 * The procedure of clean coords comprises recomputing aggregate |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
821 * tranform matrix and area where members spreading in. |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
822 * |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
823 * The list is inspected before drawing to recompute new shape, size, |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
824 * and positions of member geos of coords in the list. The drity |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
825 * flag of member geos will be clean. |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
826 * |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
827 * Clean coords should be performed before clean geos, since clean |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
828 * coords will also clean member geos. |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
829 */ |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
830 |
e17e12b112c4
A simple animation using rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
15
diff
changeset
|
831 /* |
12 | 832 * When redraw an area, the affected elements may also extend to |
833 * outside of the area. Since the order of drawing will change | |
834 * the result, it will infect more and more elements to keep | |
835 * drawing order althrough they are overlaid directly with | |
836 * specified area. | |
837 * | |
838 * To fix the problem, we don't extend the set of redrawing to | |
839 * elements they are not overliad directly. The redrawing is | |
840 * performed on a temporary surface, clipped to fit the area, and | |
841 * update only specified area on the destinate surface. | |
842 */ | |
843 | |
844 /* | |
845 * To accelerate speed of transformation, when a matrix changed, | |
846 * transformation should be aggregated and computed in a loop. | |
847 * It can get intereset of higher hit rate of cache. | |
848 * - shapes prvoide list of positions needed to be transformed. | |
849 * - redraw_man transforms positions from shapes. | |
850 * - shapes drawing with result of transforms. | |
851 * - shapes should be called to give them a chance to update geometries. | |
852 */ | |
853 | |
13 | 854 /* |
855 * functions: | |
856 * - redraw all | |
857 * - redraw changed | |
858 */ | |
859 | |
12 | 860 #ifdef UNITTEST |
861 | |
862 #include <CUnit/Basic.h> | |
19 | 863 #include "paint.h" |
12 | 864 |
865 struct _sh_dummy { | |
866 shape_t shape; | |
867 co_aix x, y; | |
868 co_aix w, h; | |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
869 int draw_cnt; |
12 | 870 }; |
871 | |
872 shape_t *sh_dummy_new(co_aix x, co_aix y, co_aix w, co_aix h) { | |
873 sh_dummy_t *dummy; | |
874 | |
875 dummy = (sh_dummy_t *)malloc(sizeof(sh_dummy_t)); | |
876 if(dummy == NULL) | |
877 return NULL; | |
878 | |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
879 memset(dummy, 0, sizeof(sh_dummy_t)); |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
880 |
12 | 881 dummy->x = x; |
882 dummy->y = y; | |
883 dummy->w = w; | |
884 dummy->h = h; | |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
885 dummy->draw_cnt = 0; |
12 | 886 |
887 return (shape_t *)dummy; | |
888 } | |
889 | |
890 void sh_dummy_free(shape_t *sh) { | |
891 free(sh); | |
892 } | |
893 | |
894 void sh_dummy_transform(shape_t *shape) { | |
895 sh_dummy_t *dummy = (sh_dummy_t *)shape; | |
896 co_aix poses[2][2]; | |
897 co_aix x1, y1, x2, y2; | |
898 | |
899 if(shape->geo && shape->coord) { | |
900 x1 = dummy->x; | |
901 y1 = dummy->y; | |
902 x2 = x1 + dummy->w; | |
903 y2 = y1 + dummy->h; | |
904 | |
905 coord_trans_pos(shape->coord, &x1, &y1); | |
906 coord_trans_pos(shape->coord, &x2, &y2); | |
907 poses[0][0] = x1; | |
908 poses[0][1] = y1; | |
909 poses[1][0] = x2; | |
910 poses[1][1] = y2; | |
911 | |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
912 if(shape->geo) |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
913 geo_from_positions(shape->geo, 2, poses); |
12 | 914 } |
915 } | |
916 | |
20
74d3d5dc9aaa
rename XXX_draw() to XXX_fill()
Thinker K.F. Li <thinker@branda.to>
parents:
19
diff
changeset
|
917 void sh_dummy_fill(shape_t *shape, cairo_t *cr) { |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
918 sh_dummy_t *dummy; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
919 |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
920 dummy = (sh_dummy_t *)shape; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
921 dummy->draw_cnt++; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
922 } |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
923 |
19 | 924 static void dummy_paint_prepare(paint_t *paint, cairo_t *cr) { |
925 } | |
926 | |
927 static void dummy_paint_free(paint_t *paint) { | |
928 if(paint) | |
929 free(paint); | |
930 } | |
931 | |
932 paint_t *dummy_paint_new(redraw_man_t *rdman) { | |
933 paint_t *paint; | |
934 | |
935 paint = (paint_t *)malloc(sizeof(paint_t)); | |
936 if(paint == NULL) | |
937 return NULL; | |
938 | |
939 paint_init(paint, dummy_paint_prepare, dummy_paint_free); | |
940 | |
941 return paint; | |
942 } | |
943 | |
12 | 944 void test_rdman_find_overlaid_shapes(void) { |
945 redraw_man_t rdman; | |
946 geo_t geo; | |
947 coord_t *coords[3]; | |
948 shape_t *shapes[5]; | |
949 geo_t **overlays; | |
13 | 950 co_aix pos[2][2]; |
12 | 951 int n; |
952 int i; | |
953 | |
24
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
954 redraw_man_init(&rdman, NULL, NULL); |
12 | 955 coords[0] = rdman.root_coord; |
956 for(i = 1; i < 3; i++) { | |
957 coords[i] = rdman_coord_new(&rdman, rdman.root_coord); | |
958 } | |
959 for(i = 0; i < 5; i++) { | |
960 shapes[i] = sh_dummy_new(10 + i * 30, 10 + i * 20, 25, 15); | |
961 CU_ASSERT(shapes[i] != NULL); | |
962 } | |
963 for(i = 0; i < 3; i++) | |
964 rdman_add_shape(&rdman, shapes[i], coords[1]); | |
965 for(i = 3; i < 5; i++) | |
966 rdman_add_shape(&rdman, shapes[i], coords[2]); | |
967 | |
968 coords[1]->matrix[0] = 2; | |
969 coords[0]->matrix[4] = 2; | |
970 | |
971 update_aggr_matrix(coords[0]); | |
972 for(i = 0; i < 5; i++) | |
973 sh_dummy_transform(shapes[i]); | |
974 | |
13 | 975 pos[0][0] = 100; |
976 pos[0][1] = 120; | |
977 pos[1][0] = 100 + 140; | |
978 pos[1][1] = 120 + 40; | |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
979 geo_init(&geo); |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
980 geo_from_positions(&geo, 2, pos); |
12 | 981 |
982 n = rdman_find_overlaid_shapes(&rdman, &geo, &overlays); | |
983 CU_ASSERT(n == 2); | |
984 CU_ASSERT(overlays != NULL); | |
985 CU_ASSERT(overlays[0] == shapes[2]->geo); | |
986 CU_ASSERT(overlays[1] == shapes[3]->geo); | |
987 | |
988 free(overlays); | |
989 for(i = 0; i < 5; i++) | |
990 sh_dummy_free(shapes[i]); | |
991 | |
992 redraw_man_destroy(&rdman); | |
993 } | |
994 | |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
995 void test_rdman_redraw_changed(void) { |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
996 coord_t *coords[3]; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
997 shape_t *shapes[3]; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
998 sh_dummy_t **dummys; |
19 | 999 paint_t *paint; |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1000 redraw_man_t *rdman; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1001 redraw_man_t _rdman; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1002 int i; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1003 |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1004 dummys = (sh_dummy_t **)shapes; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1005 |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1006 rdman = &_rdman; |
24
e598bc809c0f
No more flash when animation.
Thinker K.F. Li <thinker@branda.to>
parents:
23
diff
changeset
|
1007 redraw_man_init(rdman, NULL, NULL); |
19 | 1008 paint = dummy_paint_new(rdman); |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1009 for(i = 0; i < 3; i++) { |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1010 shapes[i] = sh_dummy_new(0, 0, 50, 50); |
19 | 1011 rdman_paint_fill(rdman, paint, shapes[i]); |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1012 coords[i] = rdman_coord_new(rdman, rdman->root_coord); |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1013 coords[i]->matrix[2] = 10 + i * 100; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1014 coords[i]->matrix[5] = 10 + i * 100; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1015 rdman_coord_changed(rdman, coords[i]); |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1016 rdman_add_shape(rdman, shapes[i], coords[i]); |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1017 } |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1018 rdman_redraw_all(rdman); |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1019 CU_ASSERT(dummys[0]->draw_cnt == 1); |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1020 CU_ASSERT(dummys[1]->draw_cnt == 1); |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1021 CU_ASSERT(dummys[2]->draw_cnt == 1); |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1022 |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1023 coords[2]->matrix[2] = 100; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1024 coords[2]->matrix[5] = 100; |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1025 rdman_coord_changed(rdman, coords[2]); |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1026 rdman_redraw_changed(rdman); |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1027 |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1028 CU_ASSERT(dummys[0]->draw_cnt == 1); |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1029 CU_ASSERT(dummys[1]->draw_cnt == 2); |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1030 CU_ASSERT(dummys[2]->draw_cnt == 2); |
19 | 1031 |
1032 paint->free(paint); | |
1033 redraw_man_destroy(rdman); | |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1034 } |
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1035 |
12 | 1036 CU_pSuite get_redraw_man_suite(void) { |
1037 CU_pSuite suite; | |
1038 | |
1039 suite = CU_add_suite("Suite_redraw_man", NULL, NULL); | |
1040 CU_ADD_TEST(suite, test_rdman_find_overlaid_shapes); | |
17
41f0907b27ac
Unittest for rdman_redraw_changed().
Thinker K.F. Li <thinker@branda.to>
parents:
16
diff
changeset
|
1041 CU_ADD_TEST(suite, test_rdman_redraw_changed); |
12 | 1042 |
1043 return suite; | |
1044 } | |
1045 | |
1046 #endif /* UNITTEST */ |