summaryrefslogtreecommitdiff
path: root/src/examples/evas
diff options
context:
space:
mode:
authorBryce Harrington <bryce@osg.samsung.com>2017-05-10 11:03:37 +0200
committerStefan Schmidt <stefan@osg.samsung.com>2017-05-10 11:03:38 +0200
commitc6212e6e67af4e48e90fe9ddea64774e82b908d8 (patch)
tree9793506842b32474188f95970d3463c9804df8fb /src/examples/evas
parent0f5ab72ed073ef552db206bd9831aa73c862efe2 (diff)
examples/evas: Improve linespacing consistency
Summary: Also fixes a handful of obvious indentation irregularities, including some reformatting of some printf() multi-line indents that commit a71b770b did not properly adjust. No functional code changes. Reviewers: cedric Subscribers: jpeg Differential Revision: https://phab.enlightenment.org/D4864
Diffstat (limited to 'src/examples/evas')
-rw-r--r--src/examples/evas/evas-3d-aabb.c3
-rw-r--r--src/examples/evas/evas-3d-blending.c12
-rw-r--r--src/examples/evas/evas-3d-colorpick.c20
-rw-r--r--src/examples/evas/evas-3d-cube-rotate.c4
-rw-r--r--src/examples/evas/evas-3d-eet.c1
-rw-r--r--src/examples/evas/evas-3d-fog.c11
-rw-r--r--src/examples/evas/evas-3d-hull.c4
-rw-r--r--src/examples/evas/evas-3d-obj.c1
-rw-r--r--src/examples/evas/evas-3d-shadows.c2
-rw-r--r--src/examples/evas/evas-3d-static-lod.c2
-rw-r--r--src/examples/evas/evas-aspect-hints.c16
-rw-r--r--src/examples/evas/evas-box.c34
-rw-r--r--src/examples/evas/evas-event-filter.c1
-rw-r--r--src/examples/evas/evas-events.c24
-rw-r--r--src/examples/evas/evas-gl.c3
-rw-r--r--src/examples/evas/evas-hints.c30
-rw-r--r--src/examples/evas/evas-images.c15
-rw-r--r--src/examples/evas/evas-images2.c38
-rw-r--r--src/examples/evas/evas-images4.c9
-rw-r--r--src/examples/evas/evas-images5.c7
-rw-r--r--src/examples/evas/evas-init-shutdown.c3
-rw-r--r--src/examples/evas/evas-map-aa.c1
-rw-r--r--src/examples/evas/evas-multi-touch.c3
-rw-r--r--src/examples/evas/evas-multiseat-events.c72
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c13
-rw-r--r--src/examples/evas/evas-object-manipulation.c8
-rw-r--r--src/examples/evas/evas-smart-interface.c31
-rw-r--r--src/examples/evas/evas-smart-object.c32
-rw-r--r--src/examples/evas/evas-stacking.c31
-rw-r--r--src/examples/evas/evas-text.c26
-rw-r--r--src/examples/evas/evas-textblock-obstacles.c11
-rw-r--r--src/examples/evas/evas-transparent.c1
-rw-r--r--src/examples/evas/evas-vg-batman.c2
-rw-r--r--src/examples/evas/evas-vg-simple.c6
34 files changed, 245 insertions, 232 deletions
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index 3b91bff..37f954d 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -48,7 +48,6 @@ Eo *material = NULL;
48Eo *texture = NULL; 48Eo *texture = NULL;
49Eo *light = NULL; 49Eo *light = NULL;
50 50
51
52static Eina_Bool 51static Eina_Bool
53_redraw_aabb(); 52_redraw_aabb();
54 53
@@ -203,7 +202,7 @@ main(void)
203 evas_canvas3d_mesh_vertex_assembly_set(mesh_box, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES); 202 evas_canvas3d_mesh_vertex_assembly_set(mesh_box, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES);
204 evas_canvas3d_mesh_shader_mode_set(mesh_box, EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR); 203 evas_canvas3d_mesh_shader_mode_set(mesh_box, EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR);
205 evas_canvas3d_mesh_frame_material_set(mesh_box, 0, material_box); 204 evas_canvas3d_mesh_frame_material_set(mesh_box, 0, material_box);
206 _redraw_aabb(); 205 _redraw_aabb();
207 206
208 evas_canvas3d_node_member_add(root_node, mesh_box_node); 207 evas_canvas3d_node_member_add(root_node, mesh_box_node);
209 evas_canvas3d_node_mesh_add(mesh_box_node, mesh_box); 208 evas_canvas3d_node_mesh_add(mesh_box_node, mesh_box);
diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c
index 1c03cf2..8409efa 100644
--- a/src/examples/evas/evas-3d-blending.c
+++ b/src/examples/evas/evas-3d-blending.c
@@ -112,7 +112,6 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void
112 printf("sfactor = %s, dfactor = %s\n", blend_func_names[func1], blend_func_names[func2]); 112 printf("sfactor = %s, dfactor = %s\n", blend_func_names[func1], blend_func_names[func2]);
113} 113}
114 114
115
116static void 115static void
117_on_delete(Ecore_Evas *ee EINA_UNUSED) 116_on_delete(Ecore_Evas *ee EINA_UNUSED)
118{ 117{
@@ -153,14 +152,14 @@ _camera_setup(Scene_Data *data)
153 152
154 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 153 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
155 154
156 data->camera_node = 155 data->camera_node =
157 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 156 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
158 157
159 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 158 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
160 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); 159 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
161 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 160 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
162 161
163 evas_canvas3d_node_member_add(data->root_node, data->camera_node); 162 evas_canvas3d_node_member_add(data->root_node, data->camera_node);
164} 163}
165 164
166static void 165static void
@@ -298,7 +297,6 @@ main(void)
298 /* Set the image object as render target for 3D scene. */ 297 /* Set the image object as render target for 3D scene. */
299 efl_canvas_scene3d_set(image, data.scene); 298 efl_canvas_scene3d_set(image, data.scene);
300 299
301
302 /* Add animation timer callback. */ 300 /* Add animation timer callback. */
303 ecore_animator_frametime_set(0.008); 301 ecore_animator_frametime_set(0.008);
304 anim = ecore_animator_add(_animate_scene, &data); 302 anim = ecore_animator_add(_animate_scene, &data);
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index 83dd623..447ae0c 100644
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -64,8 +64,8 @@ Ecore_Getopt optdesc = {
64 } 64 }
65}; 65};
66 66
67 typedef struct _Object 67typedef struct _Object
68 { 68{
69 Eo *primitive; 69 Eo *primitive;
70 Eo *node; 70 Eo *node;
71 Eo *mesh; 71 Eo *mesh;
@@ -77,7 +77,7 @@ Ecore_Getopt optdesc = {
77 Eina_Bool (*sphere_init)(void *sphere, const char *texture); 77 Eina_Bool (*sphere_init)(void *sphere, const char *texture);
78 Eina_Bool (*sphere_animate)(void *data); 78 Eina_Bool (*sphere_animate)(void *data);
79 79
80 } Test_object; 80} Test_object;
81 81
82typedef struct _Scene 82typedef struct _Scene
83{ 83{
@@ -111,9 +111,9 @@ _on_delete(Ecore_Evas *ee EINA_UNUSED)
111 } 111 }
112 eina_list_free(globalscene.spheres); 112 eina_list_free(globalscene.spheres);
113 113
114
115 ecore_main_loop_quit(); 114 ecore_main_loop_quit();
116} 115}
116
117static void 117static void
118_on_canvas_resize(Ecore_Evas *ee) 118_on_canvas_resize(Ecore_Evas *ee)
119{ 119{
@@ -130,9 +130,11 @@ _animate_sphere(void *data)
130 static int angle = 0.0; 130 static int angle = 0.0;
131 Eo *n = (Eo*)(((Test_object *)data)->node); 131 Eo *n = (Eo*)(((Test_object *)data)->node);
132 Evas_Real s = ((Test_object *)data)->speed; 132 Evas_Real s = ((Test_object *)data)->speed;
133
133 evas_canvas3d_node_orientation_angle_axis_set(n, angle, s, s - 1, s + 1); 134 evas_canvas3d_node_orientation_angle_axis_set(n, angle, s, s - 1, s + 1);
134 angle++; 135 angle++;
135 if (angle > 360) angle = 0.0; 136 if (angle > 360) angle = 0.0;
137
136 return EINA_TRUE; 138 return EINA_TRUE;
137} 139}
138 140
@@ -157,6 +159,7 @@ void _recalculate_position()
157 } 159 }
158 } 160 }
159} 161}
162
160static void 163static void
161_on_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, 164_on_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
162 Evas_Object *eo EINA_UNUSED, void *event_info) 165 Evas_Object *eo EINA_UNUSED, void *event_info)
@@ -165,6 +168,7 @@ _on_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
165 Evas_Real x, y, z; 168 Evas_Real x, y, z;
166 Eina_List *l; 169 Eina_List *l;
167 Test_object * item; 170 Test_object * item;
171
168 if (!strcmp(ev->key, "Down")) 172 if (!strcmp(ev->key, "Down"))
169 { 173 {
170 evas_canvas3d_node_position_get(globalscene.camera_node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z); 174 evas_canvas3d_node_position_get(globalscene.camera_node, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z);
@@ -196,6 +200,7 @@ _on_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
196 else 200 else
197 printf("Down, Up for position of camera; Left, Right for scale of each node"); 201 printf("Down, Up for position of camera; Left, Right for scale of each node");
198} 202}
203
199static void 204static void
200_on_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info) 205_on_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info)
201{ 206{
@@ -238,6 +243,7 @@ Eina_Bool
238_init_sphere(void *this, const char *texture) 243_init_sphere(void *this, const char *texture)
239{ 244{
240 Test_object *sphere = (Test_object *)this; 245 Test_object *sphere = (Test_object *)this;
246
241 sphere->primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); 247 sphere->primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
242 sphere->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); 248 sphere->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
243 sphere->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 249 sphere->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
@@ -262,10 +268,10 @@ _init_sphere(void *this, const char *texture)
262 evas_canvas3d_material_color_set(sphere->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0); 268 evas_canvas3d_material_color_set(sphere->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0);
263 evas_canvas3d_material_color_set(sphere->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); 269 evas_canvas3d_material_color_set(sphere->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
264 evas_canvas3d_material_shininess_set(sphere->material, 50.0); 270 evas_canvas3d_material_shininess_set(sphere->material, 50.0);
271
265 return EINA_TRUE; 272 return EINA_TRUE;
266} 273}
267 274
268
269Eina_Bool 275Eina_Bool
270_init_scene(const char *texture) 276_init_scene(const char *texture)
271{ 277{
@@ -303,6 +309,7 @@ _init_scene(const char *texture)
303 for (i = 0; i < globalscene.col * globalscene.row; i++) 309 for (i = 0; i < globalscene.col * globalscene.row; i++)
304 { 310 {
305 Test_object *spheretmp; 311 Test_object *spheretmp;
312
306 m = malloc(sizeof(Test_object)); 313 m = malloc(sizeof(Test_object));
307 m->sphere_init = _init_sphere; 314 m->sphere_init = _init_sphere;
308 if (!i) 315 if (!i)
@@ -330,6 +337,7 @@ _init_scene(const char *texture)
330 evas_canvas3d_scene_root_node_set(globalscene.scene, globalscene.root_node); 337 evas_canvas3d_scene_root_node_set(globalscene.scene, globalscene.root_node);
331 evas_canvas3d_scene_camera_node_set(globalscene.scene, globalscene.camera_node); 338 evas_canvas3d_scene_camera_node_set(globalscene.scene, globalscene.camera_node);
332 evas_canvas3d_scene_size_set(globalscene.scene, WIDTH, HEIGHT); 339 evas_canvas3d_scene_size_set(globalscene.scene, WIDTH, HEIGHT);
340
333 return EINA_TRUE; 341 return EINA_TRUE;
334} 342}
335 343
@@ -358,7 +366,7 @@ int main(int argc, char **argv)
358 if (!texture) texture = (char *)image_path; 366 if (!texture) texture = (char *)image_path;
359 367
360 printf("row - %d, col - %d, precision of spheres - %d, texture - %s\n", 368 printf("row - %d, col - %d, precision of spheres - %d, texture - %s\n",
361 row, col, precision, texture); 369 row, col, precision, texture);
362 370
363 ecore_evas = ecore_evas_new("opengl_x11", 10, 10, WIDTH, HEIGHT, NULL); 371 ecore_evas = ecore_evas_new("opengl_x11", 10, 10, WIDTH, HEIGHT, NULL);
364 372
diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c
index e2946e9..79ff793 100644
--- a/src/examples/evas/evas-3d-cube-rotate.c
+++ b/src/examples/evas/evas-3d-cube-rotate.c
@@ -76,14 +76,15 @@ static Eina_Bool
76_continue_scene(void *data) 76_continue_scene(void *data)
77{ 77{
78 Scene_Data *d = (Scene_Data *)data; 78 Scene_Data *d = (Scene_Data *)data;
79
79 if (d->mouse_indicator == 1) 80 if (d->mouse_indicator == 1)
80 { 81 {
81 evas_event_feed_mouse_down(evas, 1, EVAS_BUTTON_NONE, 0, &data); 82 evas_event_feed_mouse_down(evas, 1, EVAS_BUTTON_NONE, 0, &data);
82 } 83 }
84
83 return EINA_TRUE; 85 return EINA_TRUE;
84} 86}
85 87
86
87static void 88static void
88_rotate_x_reload(Evas_Canvas3D_Scene *eo_scene, Evas_Event_Mouse_Down *ev, Evas_Canvas3D_Node *node, Evas_Canvas3D_Mesh *mesh, 89_rotate_x_reload(Evas_Canvas3D_Scene *eo_scene, Evas_Event_Mouse_Down *ev, Evas_Canvas3D_Node *node, Evas_Canvas3D_Mesh *mesh,
89 float *angle_diff, Evas_Coord *mouse_coord) 90 float *angle_diff, Evas_Coord *mouse_coord)
@@ -133,6 +134,7 @@ static void
133_stop_scene(void *data, Evas *_evas EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info EINA_UNUSED) 134_stop_scene(void *data, Evas *_evas EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info EINA_UNUSED)
134{ 135{
135 Scene_Data *d = (Scene_Data *)data; 136 Scene_Data *d = (Scene_Data *)data;
137
136 d->angle = 0.0; 138 d->angle = 0.0;
137 d->mouse_indicator = 2; 139 d->mouse_indicator = 2;
138} 140}
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index b99b2ce..2619bb1 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -38,7 +38,6 @@ Ecore_Evas *ecore_evas = NULL;
38Evas *evas = NULL; 38Evas *evas = NULL;
39Eo *background = NULL; 39Eo *background = NULL;
40Eo *image = NULL; 40Eo *image = NULL;
41
42Eo *scene = NULL; 41Eo *scene = NULL;
43Eo *root_node = NULL; 42Eo *root_node = NULL;
44Eo *camera_node = NULL; 43Eo *camera_node = NULL;
diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c
index f675638..1ae330a 100644
--- a/src/examples/evas/evas-3d-fog.c
+++ b/src/examples/evas/evas-3d-fog.c
@@ -87,14 +87,14 @@ _camera_setup(Scene_Data *data)
87 87
88 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 88 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
89 89
90 data->camera_node = 90 data->camera_node =
91 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 91 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
92 92
93 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 93 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
94 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 7.0); 94 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 7.0);
95 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 95 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
96 96
97 evas_canvas3d_node_member_add(data->root_node, data->camera_node); 97 evas_canvas3d_node_member_add(data->root_node, data->camera_node);
98} 98}
99 99
100static void 100static void
@@ -121,7 +121,6 @@ _set_ball(Eo *mesh, Eo *sphere, Evas_Canvas3D_Material *material)
121 evas_canvas3d_mesh_frame_material_set(mesh, 0, material); 121 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
122} 122}
123 123
124
125static void 124static void
126_mesh_setup(Scene_Data *data) 125_mesh_setup(Scene_Data *data)
127{ 126{
diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c
index b741599..0813163 100644
--- a/src/examples/evas/evas-3d-hull.c
+++ b/src/examples/evas/evas-3d-hull.c
@@ -173,12 +173,12 @@ _print_result(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Mesh *convex_mesh)
173 v_count = evas_canvas3d_mesh_vertex_count_get(mesh); 173 v_count = evas_canvas3d_mesh_vertex_count_get(mesh);
174 174
175 printf("Vertex count is %d for convex hull\n", 175 printf("Vertex count is %d for convex hull\n",
176 v_count); 176 v_count);
177 177
178 v_count = evas_canvas3d_mesh_vertex_count_get(convex_mesh); 178 v_count = evas_canvas3d_mesh_vertex_count_get(convex_mesh);
179 179
180 printf("Vertex count is %d for blender convex hull\n\n", 180 printf("Vertex count is %d for blender convex hull\n\n",
181 v_count); 181 v_count);
182 182
183 return; 183 return;
184} 184}
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index 3b96e22..c9a67f6 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -142,6 +142,7 @@ main(void)
142{ 142{
143 int i; 143 int i;
144 char buffer[PATH_MAX], full_file_path[PATH_MAX]; 144 char buffer[PATH_MAX], full_file_path[PATH_MAX];
145
145 // Unless Evas 3D supports Software renderer, we set gl backend forcely. 146 // Unless Evas 3D supports Software renderer, we set gl backend forcely.
146 setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); 147 setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
147 148
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index e145404..216557f 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -616,12 +616,14 @@ _on_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, voi
616 evas_canvas3d_scene_pick(d->scene, ev->canvas.x, ev->canvas.y, &n, &m, &s, &t); 616 evas_canvas3d_scene_pick(d->scene, ev->canvas.x, ev->canvas.y, &n, &m, &s, &t);
617 617
618} 618}
619
619int 620int
620main(void) 621main(void)
621{ 622{
622 Scene_Data data; 623 Scene_Data data;
623 Ecore_Animator *anim; 624 Ecore_Animator *anim;
624 Eina_List *nodes1 = NULL, *nodes2 = NULL; 625 Eina_List *nodes1 = NULL, *nodes2 = NULL;
626
625 // Unless Evas 3D supports Software renderer, we set gl backend forcely. 627 // Unless Evas 3D supports Software renderer, we set gl backend forcely.
626 setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); 628 setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
627 if (!ecore_evas_init()) return 0; 629 if (!ecore_evas_init()) return 0;
diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c
index 81dc993..85bb71b 100644
--- a/src/examples/evas/evas-3d-static-lod.c
+++ b/src/examples/evas/evas-3d-static-lod.c
@@ -219,6 +219,7 @@ _scene_setup(Scene_Data *data)
219 evas_canvas3d_scene_root_node_set(data->scene, data->root_node); 219 evas_canvas3d_scene_root_node_set(data->scene, data->root_node);
220 evas_canvas3d_scene_camera_node_set(data->scene, data->camera_node); 220 evas_canvas3d_scene_camera_node_set(data->scene, data->camera_node);
221} 221}
222
222static void 223static void
223_on_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, 224_on_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED,
224 void *event_info) 225 void *event_info)
@@ -230,6 +231,7 @@ _on_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *eo EINA_U
230 else if(!strcmp("Down", ev->key)) 231 else if(!strcmp("Down", ev->key))
231 animation_type = EINA_TRUE; 232 animation_type = EINA_TRUE;
232} 233}
234
233int 235int
234main(void) 236main(void)
235{ 237{
diff --git a/src/examples/evas/evas-aspect-hints.c b/src/examples/evas/evas-aspect-hints.c
index f05a932..9698d5b 100644
--- a/src/examples/evas/evas-aspect-hints.c
+++ b/src/examples/evas/evas-aspect-hints.c
@@ -93,11 +93,11 @@ _on_keydown(void *data EINA_UNUSED,
93 strcmp(ev->key, "h") == 0) /* print help */ 93 strcmp(ev->key, "h") == 0) /* print help */
94 { 94 {
95 printf("commands are:\n" 95 printf("commands are:\n"
96 "\tc - cycle aspect control on object\n" 96 "\tc - cycle aspect control on object\n"
97 "\th - change horizontal aspect component\n" 97 "\th - change horizontal aspect component\n"
98 "\tv - change vertical aspect component\n" 98 "\tv - change vertical aspect component\n"
99 "\ts - print current object's status\n" 99 "\ts - print current object's status\n"
100 "\tH - print help\n"); 100 "\tH - print help\n");
101 return; 101 return;
102 } 102 }
103 103
@@ -109,8 +109,8 @@ _on_keydown(void *data EINA_UNUSED,
109 evas_object_size_hint_aspect_get(d.rect, &aspect, &w, &h); 109 evas_object_size_hint_aspect_get(d.rect, &aspect, &w, &h);
110 110
111 printf("Object has aspect %s, with horizontal compontent %d" 111 printf("Object has aspect %s, with horizontal compontent %d"
112 " and vertical component %d\n", 112 " and vertical component %d\n",
113 _get_aspect_name(aspect), w, h); 113 _get_aspect_name(aspect), w, h);
114 114
115 return; 115 return;
116 } 116 }
@@ -127,7 +127,7 @@ _on_keydown(void *data EINA_UNUSED,
127 evas_object_size_hint_aspect_set(d.rect, aspect, w, h); 127 evas_object_size_hint_aspect_set(d.rect, aspect, w, h);
128 128
129 printf("Changing aspect control to %s\n", 129 printf("Changing aspect control to %s\n",
130 _get_aspect_name(aspect)); 130 _get_aspect_name(aspect));
131 131
132 return; 132 return;
133 } 133 }
diff --git a/src/examples/evas/evas-box.c b/src/examples/evas/evas-box.c
index 0193c6d..22d445f 100644
--- a/src/examples/evas/evas-box.c
+++ b/src/examples/evas/evas-box.c
@@ -161,8 +161,8 @@ list_free:
161 161
162 evas_object_box_align_set(d.box, h, v); 162 evas_object_box_align_set(d.box, h, v);
163 163
164 printf("Applying new alignment values (%.1f, %.1f)" 164 printf("Applying new alignment values (%.1f, %.1f) on the box\n",
165 " on the box\n", h, v); 165 h, v);
166 return; 166 return;
167 } 167 }
168 168
@@ -179,8 +179,8 @@ list_free:
179 179
180 evas_object_box_padding_set(d.box, h, v); 180 evas_object_box_padding_set(d.box, h, v);
181 181
182 printf("Applying new padding values (%d, %d)" 182 printf("Applying new padding values (%d, %d) on the box\n",
183 " on the box\n", h, v); 183 h, v);
184 return; 184 return;
185 } 185 }
186 186
@@ -189,7 +189,8 @@ list_free:
189 evas_object_box_layout_set( 189 evas_object_box_layout_set(
190 d.box, evas_object_box_layout_horizontal, NULL, NULL); 190 d.box, evas_object_box_layout_horizontal, NULL, NULL);
191 191
192 printf("Applying '%s' layout on the box\n", "horizontal"); 192 printf("Applying '%s' layout on the box\n",
193 "horizontal");
193 return; 194 return;
194 } 195 }
195 196
@@ -198,7 +199,8 @@ list_free:
198 evas_object_box_layout_set( 199 evas_object_box_layout_set(
199 d.box, evas_object_box_layout_vertical, NULL, NULL); 200 d.box, evas_object_box_layout_vertical, NULL, NULL);
200 201
201 printf("Applying '%s' layout on the box\n", "vertical"); 202 printf("Applying '%s' layout on the box\n",
203 "vertical");
202 return; 204 return;
203 } 205 }
204 206
@@ -209,7 +211,7 @@ list_free:
209 NULL); 211 NULL);
210 212
211 printf("Applying '%s' layout on the box\n", 213 printf("Applying '%s' layout on the box\n",
212 "horizontal homogeneous"); 214 "horizontal homogeneous");
213 return; 215 return;
214 } 216 }
215 217
@@ -219,7 +221,7 @@ list_free:
219 d.box, evas_object_box_layout_homogeneous_vertical, NULL, NULL); 221 d.box, evas_object_box_layout_homogeneous_vertical, NULL, NULL);
220 222
221 printf("Applying '%s' layout on the box\n", 223 printf("Applying '%s' layout on the box\n",
222 "vertical homogeneous"); 224 "vertical homogeneous");
223 return; 225 return;
224 } 226 }
225 227
@@ -230,7 +232,7 @@ list_free:
230 NULL, NULL); 232 NULL, NULL);
231 233
232 printf("Applying '%s' layout on the box\n", 234 printf("Applying '%s' layout on the box\n",
233 "horizontal maximum size homogeneous"); 235 "horizontal maximum size homogeneous");
234 return; 236 return;
235 } 237 }
236 238
@@ -241,7 +243,7 @@ list_free:
241 NULL, NULL); 243 NULL, NULL);
242 244
243 printf("Applying '%s' layout on the box\n", 245 printf("Applying '%s' layout on the box\n",
244 "vertical maximum size homogeneous"); 246 "vertical maximum size homogeneous");
245 return; 247 return;
246 } 248 }
247 249
@@ -250,7 +252,8 @@ list_free:
250 evas_object_box_layout_set( 252 evas_object_box_layout_set(
251 d.box, evas_object_box_layout_flow_horizontal, NULL, NULL); 253 d.box, evas_object_box_layout_flow_horizontal, NULL, NULL);
252 254
253 printf("Applying '%s' layout on the box\n", "horizontal flow"); 255 printf("Applying '%s' layout on the box\n",
256 "horizontal flow");
254 return; 257 return;
255 } 258 }
256 259
@@ -259,7 +262,8 @@ list_free:
259 evas_object_box_layout_set( 262 evas_object_box_layout_set(
260 d.box, evas_object_box_layout_flow_vertical, NULL, NULL); 263 d.box, evas_object_box_layout_flow_vertical, NULL, NULL);
261 264
262 printf("Applying '%s' layout on the box\n", "vertical flow"); 265 printf("Applying '%s' layout on the box\n",
266 "vertical flow");
263 return; 267 return;
264 } 268 }
265 269
@@ -268,7 +272,8 @@ list_free:
268 evas_object_box_layout_set( 272 evas_object_box_layout_set(
269 d.box, evas_object_box_layout_stack, NULL, NULL); 273 d.box, evas_object_box_layout_stack, NULL, NULL);
270 274
271 printf("Applying '%s' layout on the box\n", "stack"); 275 printf("Applying '%s' layout on the box\n",
276 "stack");
272 return; 277 return;
273 } 278 }
274 279
@@ -276,7 +281,8 @@ list_free:
276 { 281 {
277 evas_object_box_layout_set(d.box, _custom_layout, NULL, NULL); 282 evas_object_box_layout_set(d.box, _custom_layout, NULL, NULL);
278 283
279 printf("Applying '%s' layout on the box\n", "CUSTOM"); 284 printf("Applying '%s' layout on the box\n",
285 "CUSTOM");
280 return; 286 return;
281 } 287 }
282} 288}
diff --git a/src/examples/evas/evas-event-filter.c b/src/examples/evas/evas-event-filter.c
index aa41d8e..0b95a87 100644
--- a/src/examples/evas/evas-event-filter.c
+++ b/src/examples/evas/evas-event-filter.c
@@ -274,4 +274,3 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
274 ecore_evas_shutdown(); 274 ecore_evas_shutdown();
275 return EXIT_FAILURE; 275 return EXIT_FAILURE;
276} 276}
277
diff --git a/src/examples/evas/evas-events.c b/src/examples/evas/evas-events.c
index 5c4bae2..7838ce9 100644
--- a/src/examples/evas/evas-events.c
+++ b/src/examples/evas/evas-events.c
@@ -66,13 +66,13 @@ _object_focus_in_cb(void *data EINA_UNUSED,
66 void *event_info) 66 void *event_info)
67{ 67{
68 printf("An object got focused: %s\n", 68 printf("An object got focused: %s\n",
69 evas_object_name_get(event_info)); 69 evas_object_name_get(event_info));
70 70
71 printf("Let's recheck it: %s\n", 71 printf("Let's recheck it: %s\n",
72 evas_object_name_get(evas_focus_get(e))); 72 evas_object_name_get(evas_focus_get(e)));
73 73
74 printf("And again: %s\n", evas_object_focus_get(event_info) ? 74 printf("And again: %s\n", evas_object_focus_get(event_info) ?
75 "OK!" : "Oops, something is bad."); 75 "OK!" : "Oops, something is bad.");
76} 76}
77 77
78/* render flush callback */ 78/* render flush callback */
@@ -106,7 +106,7 @@ static Eina_Bool
106_thaw_cb(void *data EINA_UNUSED) 106_thaw_cb(void *data EINA_UNUSED)
107{ 107{
108 printf("Canvas was frozen %d times, now thawing.\n", 108 printf("Canvas was frozen %d times, now thawing.\n",
109 evas_event_freeze_get(d.canvas)); 109 evas_event_freeze_get(d.canvas));
110 evas_event_thaw(d.canvas); 110 evas_event_thaw(d.canvas);
111 return EINA_FALSE; /* do not re-issue the timer */ 111 return EINA_FALSE; /* do not re-issue the timer */
112} 112}
@@ -141,8 +141,8 @@ _on_keydown(void *data EINA_UNUSED,
141 Evas_Event_Key_Down *ev = einfo; 141 Evas_Event_Key_Down *ev = einfo;
142 142
143 printf("We've got key input: %s\n", ev->key); 143 printf("We've got key input: %s\n", ev->key);
144 printf("It actually came from %s\n", d.focus ? 144 printf("It actually came from %s\n",
145 "focus" : "key grab"); 145 d.focus ? "focus" : "key grab");
146 146
147 if (strcmp(ev->key, "h") == 0) /* print help */ 147 if (strcmp(ev->key, "h") == 0) /* print help */
148 { 148 {
@@ -173,15 +173,15 @@ _on_keydown(void *data EINA_UNUSED,
173 Evas_Modifier_Mask mask = 173 Evas_Modifier_Mask mask =
174 evas_key_modifier_mask_get(d.canvas, "Control"); 174 evas_key_modifier_mask_get(d.canvas, "Control");
175 175
176 printf("Switching to %s for key input\n", d.focus ? 176 printf("Switching to %s for key input\n",
177 "key grabs" : "focus"); 177 d.focus ? "key grabs" : "focus");
178 178
179 if (d.focus) 179 if (d.focus)
180 { 180 {
181 evas_object_focus_set(d.bg, EINA_FALSE); 181 evas_object_focus_set(d.bg, EINA_FALSE);
182 printf("Focused object is now %s\n", 182 printf("Focused object is now %s\n",
183 evas_focus_get(d.canvas) ? 183 evas_focus_get(d.canvas) ?
184 "still valid! Something went wrong." : "none."); 184 "still valid! Something went wrong." : "none.");
185 185
186 ret = evas_object_key_grab(d.bg, "a", 0, 0, EINA_TRUE); 186 ret = evas_object_key_grab(d.bg, "a", 0, 0, EINA_TRUE);
187 if (!ret) 187 if (!ret)
@@ -269,8 +269,8 @@ c_end:
269 { 269 {
270 Eina_Bool precise = evas_object_precise_is_inside_get(d.img); 270 Eina_Bool precise = evas_object_precise_is_inside_get(d.img);
271 271
272 printf("Toggling precise point collision detection %s on" 272 printf("Toggling precise point collision detection %s on Enlightenment logo\n",
273 " Enlightenment logo\n", precise ? "off" : "on"); 273 precise ? "off" : "on");
274 evas_object_precise_is_inside_set(d.img, !precise); 274 evas_object_precise_is_inside_set(d.img, !precise);
275 275
276 return; 276 return;
diff --git a/src/examples/evas/evas-gl.c b/src/examples/evas/evas-gl.c
index 9bcfdca..81601dc 100644
--- a/src/examples/evas/evas-gl.c
+++ b/src/examples/evas/evas-gl.c
@@ -256,8 +256,8 @@ img_pixel_cb(void *data, Evas_Object *obj)
256 float model[16], mvp[16]; 256 float model[16], mvp[16];
257 GLData *gl_data = data; 257 GLData *gl_data = data;
258 Evas_GL_API *glapi = gl_data->glapi; 258 Evas_GL_API *glapi = gl_data->glapi;
259
260 Evas_Coord w, h; 259 Evas_Coord w, h;
260
261 evas_object_image_size_get(obj, &w, &h); 261 evas_object_image_size_get(obj, &w, &h);
262 262
263 //Set up the context and surface as the current one 263 //Set up the context and surface as the current one
@@ -377,6 +377,7 @@ _win_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_in
377{ 377{
378 float aspect; 378 float aspect;
379 Evas_Coord w,h; 379 Evas_Coord w,h;
380
380 evas_object_geometry_get( obj, NULL, NULL, &w, &h); 381 evas_object_geometry_get( obj, NULL, NULL, &w, &h);
381 382
382 GLData *gl_data = data; 383 GLData *gl_data = data;
diff --git a/src/examples/evas/evas-hints.c b/src/examples/evas/evas-hints.c
index 1dfb35f..5ac91f5 100644
--- a/src/examples/evas/evas-hints.c
+++ b/src/examples/evas/evas-hints.c
@@ -116,20 +116,24 @@ _print_rect_stats(Evas_Object *rect)
116 double x, y; 116 double x, y;
117 117
118 evas_object_size_hint_align_get(rect, &x, &y); 118 evas_object_size_hint_align_get(rect, &x, &y);
119 printf("\talign hints: h(%f), v(%f)\n", x, y); 119 printf("\talign hints: h(%f), v(%f)\n",
120 x, y);
120 121
121 efl_gfx_size_hint_combined_min_get(rect, &w, &h); 122 efl_gfx_size_hint_combined_min_get(rect, &w, &h);
122 printf("\tmin. size hints: h(%d), v(%d)\n", w, h); 123 printf("\tmin. size hints: h(%d), v(%d)\n",
124 w, h);
123 125
124 evas_object_size_hint_max_get(rect, &w, &h); 126 evas_object_size_hint_max_get(rect, &w, &h);
125 printf("\tmax. size hints: h(%d), v(%d)\n", w, h); 127 printf("\tmax. size hints: h(%d), v(%d)\n",
128 w, h);
126 129
127 evas_object_size_hint_padding_get(rect, &l, &r, &t, &b); 130 evas_object_size_hint_padding_get(rect, &l, &r, &t, &b);
128 printf("\tpadding hints: l(%d), r(%d), t(%d), b(%d)\n", 131 printf("\tpadding hints: l(%d), r(%d), t(%d), b(%d)\n",
129 l, r, t, b); 132 l, r, t, b);
130 133
131 evas_object_size_hint_weight_get(rect, &x, &y); 134 evas_object_size_hint_weight_get(rect, &x, &y);
132 printf("\tweight hints: h(%f), v(%f)\n", x, y); 135 printf("\tweight hints: h(%f), v(%f)\n",
136 x, y);
133} 137}
134 138
135/* use the following commands to interact with this example - 'h' is 139/* use the following commands to interact with this example - 'h' is
@@ -192,7 +196,7 @@ _on_keydown(void *data EINA_UNUSED,
192 rect, r_data->align_ptr->x, r_data->align_ptr->y); 196 rect, r_data->align_ptr->x, r_data->align_ptr->y);
193 197
194 printf("Changing align hints for %s rect. to (%f, %f)\n", 198 printf("Changing align hints for %s rect. to (%f, %f)\n",
195 name, r_data->align_ptr->x, r_data->align_ptr->y); 199 name, r_data->align_ptr->x, r_data->align_ptr->y);
196 return; 200 return;
197 } 201 }
198 202
@@ -209,7 +213,7 @@ _on_keydown(void *data EINA_UNUSED,
209 rect, r_data->min_ptr->w, r_data->min_ptr->h); 213 rect, r_data->min_ptr->w, r_data->min_ptr->h);
210 214
211 printf("Changing min. size hints for %s rect. to (%d, %d)\n", 215 printf("Changing min. size hints for %s rect. to (%d, %d)\n",
212 name, r_data->min_ptr->w, r_data->min_ptr->h); 216 name, r_data->min_ptr->w, r_data->min_ptr->h);
213 return; 217 return;
214 } 218 }
215 219
@@ -226,7 +230,7 @@ _on_keydown(void *data EINA_UNUSED,
226 rect, r_data->max_ptr->w, r_data->max_ptr->h); 230 rect, r_data->max_ptr->w, r_data->max_ptr->h);
227 231
228 printf("Changing max. size hints for %s rect. to (%d, %d)\n", 232 printf("Changing max. size hints for %s rect. to (%d, %d)\n",
229 name, r_data->max_ptr->w, r_data->max_ptr->h); 233 name, r_data->max_ptr->w, r_data->max_ptr->h);
230 return; 234 return;
231 } 235 }
232 236
@@ -243,10 +247,9 @@ _on_keydown(void *data EINA_UNUSED,
243 rect, r_data->padding_ptr->l, r_data->padding_ptr->r, 247 rect, r_data->padding_ptr->l, r_data->padding_ptr->r,
244 r_data->padding_ptr->t, r_data->padding_ptr->b); 248 r_data->padding_ptr->t, r_data->padding_ptr->b);
245 249
246 printf("Changing padding size hints for %s rect." 250 printf("Changing padding size hints for %s rect. to (%d, %d, %d, %d)\n",
247 " to (%d, %d, %d, %d)\n", 251 name, r_data->padding_ptr->l, r_data->padding_ptr->r,
248 name, r_data->padding_ptr->l, r_data->padding_ptr->r, 252 r_data->padding_ptr->t, r_data->padding_ptr->b);
249 r_data->padding_ptr->t, r_data->padding_ptr->b);
250 return; 253 return;
251 } 254 }
252 255
@@ -266,7 +269,7 @@ _on_keydown(void *data EINA_UNUSED,
266 rect, r_data->weight_ptr->x, r_data->weight_ptr->y); 269 rect, r_data->weight_ptr->x, r_data->weight_ptr->y);
267 270
268 printf("Changing weight hints for %s rect. to (%f, %f)\n", 271 printf("Changing weight hints for %s rect. to (%f, %f)\n",
269 name, r_data->weight_ptr->x, r_data->weight_ptr->y); 272 name, r_data->weight_ptr->x, r_data->weight_ptr->y);
270 return; 273 return;
271 } 274 }
272} 275}
@@ -376,4 +379,3 @@ error:
376 " up to ecore-evas for this example to run properly.\n"); 379 " up to ecore-evas for this example to run properly.\n");
377 return -1; 380 return -1;
378} 381}
379
diff --git a/src/examples/evas/evas-images.c b/src/examples/evas/evas-images.c
index 8b9bfca..2cda226 100644
--- a/src/examples/evas/evas-images.c
+++ b/src/examples/evas/evas-images.c
@@ -109,7 +109,7 @@ _on_keydown(void *data EINA_UNUSED,
109 evas_object_image_smooth_scale_set(d.border, !smooth_scale); 109 evas_object_image_smooth_scale_set(d.border, !smooth_scale);
110 110
111 printf("Image's border is now %s smooth scaling\n", 111 printf("Image's border is now %s smooth scaling\n",
112 smooth_scale ? "without" : "with"); 112 smooth_scale ? "without" : "with");
113 113
114 return; 114 return;
115 } 115 }
@@ -157,7 +157,7 @@ _on_keydown(void *data EINA_UNUSED,
157 evas_object_image_border_center_fill_set(d.border, fill); 157 evas_object_image_border_center_fill_set(d.border, fill);
158 158
159 printf("Image's border center region aspect is now \"%s\"\n", 159 printf("Image's border center region aspect is now \"%s\"\n",
160 _border_fill_mode_to_str(fill)); 160 _border_fill_mode_to_str(fill));
161 161
162 return; 162 return;
163 } 163 }
@@ -169,7 +169,7 @@ _on_keydown(void *data EINA_UNUSED,
169 evas_object_image_alpha_set(d.img1, !alpha); 169 evas_object_image_alpha_set(d.img1, !alpha);
170 170
171 printf("Image's alpha channel is now %s\n", 171 printf("Image's alpha channel is now %s\n",
172 alpha ? "off" : "on"); 172 alpha ? "off" : "on");
173 173
174 return; 174 return;
175 } 175 }
@@ -181,7 +181,7 @@ _on_keydown(void *data EINA_UNUSED,
181 evas_object_image_filled_set(d.img1, !filled); 181 evas_object_image_filled_set(d.img1, !filled);
182 182
183 printf("Image's x filled property is now %s\n", 183 printf("Image's x filled property is now %s\n",
184 filled ? "off" : "on"); 184 filled ? "off" : "on");
185 185
186 return; 186 return;
187 } 187 }
@@ -249,7 +249,7 @@ _on_keydown(void *data EINA_UNUSED,
249 evas_object_image_fill_get(d.img1, &x, &y, &w, &h); 249 evas_object_image_fill_get(d.img1, &x, &y, &w, &h);
250 250
251 printf("Image has fill properties set to: %d, %d, %d, %d\n", 251 printf("Image has fill properties set to: %d, %d, %d, %d\n",
252 x, y, w, h); 252 x, y, w, h);
253 253
254 return; 254 return;
255 } 255 }
@@ -292,9 +292,8 @@ main(void)
292 } 292 }
293 else 293 else
294 { 294 {
295 printf( 295 printf("loaded image '%s' with succes! error string is \"%s\"\n",
296 "loaded image '%s' with succes! error string is \"%s\"\n", 296 valid_path, evas_load_error_str(err));
297 valid_path, evas_load_error_str(err));
298 297
299 evas_object_move(d.img1, 3, 3); 298 evas_object_move(d.img1, 3, 3);
300 evas_object_image_fill_set(d.img1, 0, 0, WIDTH / 2, HEIGHT / 2); 299 evas_object_image_fill_set(d.img1, 0, 0, WIDTH / 2, HEIGHT / 2);
diff --git a/src/examples/evas/evas-images2.c b/src/examples/evas/evas-images2.c
index 60f0563..ab1e598 100644
--- a/src/examples/evas/evas-images2.c
+++ b/src/examples/evas/evas-images2.c
@@ -52,8 +52,8 @@ _mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
52 void *event_info) 52 void *event_info)
53{ 53{
54 Evas_Event_Mouse_Down *ev = event_info; 54 Evas_Event_Mouse_Down *ev = event_info;
55 printf("Mouse Down - obj(%p), coords(%d %d)\n", obj, ev->canvas.x, 55 printf("Mouse Down - obj(%p), coords(%d %d)\n",
56 ev->canvas.y); 56 obj, ev->canvas.x, ev->canvas.y);
57} 57}
58 58
59static void 59static void
@@ -61,8 +61,8 @@ _mouse_move(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
61 void *event_info) 61 void *event_info)
62{ 62{
63 Evas_Event_Mouse_Move *ev = event_info; 63 Evas_Event_Mouse_Move *ev = event_info;
64 printf("Mouse Move - obj(%p), coords(%d %d)\n", obj, ev->cur.canvas.x, 64 printf("Mouse Move - obj(%p), coords(%d %d)\n",
65 ev->cur.canvas.y); 65 obj, ev->cur.canvas.x, ev->cur.canvas.y);
66} 66}
67 67
68static void 68static void
@@ -70,8 +70,8 @@ _mouse_up(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
70 void *event_info) 70 void *event_info)
71{ 71{
72 Evas_Event_Mouse_Up *ev = event_info; 72 Evas_Event_Mouse_Up *ev = event_info;
73 printf("Mouse Up - obj(%p), coords(%d %d)\n", obj, ev->canvas.x, 73 printf("Mouse Up - obj(%p), coords(%d %d)\n",
74 ev->canvas.y); 74 obj, ev->canvas.x, ev->canvas.y);
75} 75}
76 76
77static void 77static void
@@ -79,8 +79,8 @@ _multi_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
79 void *event_info) 79 void *event_info)
80{ 80{
81 Evas_Event_Multi_Down *ev = event_info; 81 Evas_Event_Multi_Down *ev = event_info;
82 printf("Multi Down - obj(%p), coords(%d %d)\n", obj, ev->canvas.x, 82 printf("Multi Down - obj(%p), coords(%d %d)\n",
83 ev->canvas.y); 83 obj, ev->canvas.x, ev->canvas.y);
84} 84}
85 85
86static void 86static void
@@ -88,8 +88,8 @@ _multi_move(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
88 void *event_info) 88 void *event_info)
89{ 89{
90 Evas_Event_Multi_Move *ev = event_info; 90 Evas_Event_Multi_Move *ev = event_info;
91 printf("Multi Move - obj(%p), coords(%d %d)\n", obj, ev->cur.canvas.x, 91 printf("Multi Move - obj(%p), coords(%d %d)\n",
92 ev->cur.canvas.y); 92 obj, ev->cur.canvas.x, ev->cur.canvas.y);
93} 93}
94 94
95static void 95static void
@@ -97,8 +97,8 @@ _multi_up(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
97 void *event_info) 97 void *event_info)
98{ 98{
99 Evas_Event_Multi_Up *ev = event_info; 99 Evas_Event_Multi_Up *ev = event_info;
100 printf("Multi Up - obj(%p), coords(%d %d)\n", obj, ev->canvas.x, 100 printf("Multi Up - obj(%p), coords(%d %d)\n",
101 ev->canvas.y); 101 obj, ev->canvas.x, ev->canvas.y);
102} 102}
103 103
104static void 104static void
@@ -106,8 +106,8 @@ _mouse_in(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
106 void *event_info) 106 void *event_info)
107{ 107{
108 Evas_Event_Mouse_In *ev = event_info; 108 Evas_Event_Mouse_In *ev = event_info;
109 printf("Mouse In - obj(%p), coords(%d %d)\n", obj, ev->canvas.x, 109 printf("Mouse In - obj(%p), coords(%d %d)\n",
110 ev->canvas.y); 110 obj, ev->canvas.x, ev->canvas.y);
111} 111}
112 112
113static void 113static void
@@ -115,8 +115,8 @@ _mouse_out(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
115 void *event_info) 115 void *event_info)
116{ 116{
117 Evas_Event_Mouse_Out *ev = event_info; 117 Evas_Event_Mouse_Out *ev = event_info;
118 printf("Mouse Out - obj(%p), coords(%d %d)\n", obj, ev->canvas.x, 118 printf("Mouse Out - obj(%p), coords(%d %d)\n",
119 ev->canvas.y); 119 obj, ev->canvas.x, ev->canvas.y);
120} 120}
121 121
122static void 122static void
@@ -172,7 +172,7 @@ _on_keydown(void *data EINA_UNUSED,
172 int stride = evas_object_image_stride_get(d.noise_img); 172 int stride = evas_object_image_stride_get(d.noise_img);
173 173
174 printf("Image has row stride value of %d, which accounts" 174 printf("Image has row stride value of %d, which accounts"
175 " for %d pixels\n", stride, stride / 4); 175 " for %d pixels\n", stride, stride / 4);
176 176
177 return; 177 return;
178 } 178 }
@@ -199,7 +199,7 @@ _on_keydown(void *data EINA_UNUSED,
199 file_path, quality_str); 199 file_path, quality_str);
200 else 200 else
201 printf("Image saved to '%s' (flags '%s'), check it out with " 201 printf("Image saved to '%s' (flags '%s'), check it out with "
202 "an image viewer\n", file_path, quality_str); 202 "an image viewer\n", file_path, quality_str);
203 203
204 return; 204 return;
205 } 205 }
@@ -287,7 +287,7 @@ main(void)
287 evas_object_resize(d.noise_img, WIDTH / 4, HEIGHT / 4); 287 evas_object_resize(d.noise_img, WIDTH / 4, HEIGHT / 4);
288 evas_object_show(d.noise_img); 288 evas_object_show(d.noise_img);
289 printf("Creating noise image with size %d, %d\n", 289 printf("Creating noise image with size %d, %d\n",
290 WIDTH / 4, HEIGHT / 4); 290 WIDTH / 4, HEIGHT / 4);
291 291
292 d.text_obj = evas_object_textblock_add(d.evas); 292 d.text_obj = evas_object_textblock_add(d.evas);
293 evas_object_textblock_text_markup_set(d.text_obj, "Hello world! :)"); 293 evas_object_textblock_text_markup_set(d.text_obj, "Hello world! :)");
diff --git a/src/examples/evas/evas-images4.c b/src/examples/evas/evas-images4.c
index 94b2eeb..1dd0faa 100644
--- a/src/examples/evas/evas-images4.c
+++ b/src/examples/evas/evas-images4.c
@@ -90,7 +90,7 @@ _on_keydown(void *data EINA_UNUSED,
90 file_path, quality_str); 90 file_path, quality_str);
91 else 91 else
92 printf("Image saved to '%s' (flags '%s'), check it out with " 92 printf("Image saved to '%s' (flags '%s'), check it out with "
93 "an image viewer\n", file_path, quality_str); 93 "an image viewer\n", file_path, quality_str);
94 94
95 return; 95 return;
96 } 96 }
@@ -109,7 +109,7 @@ _on_keydown(void *data EINA_UNUSED,
109 { 109 {
110 evas_object_image_orient_set(d.img, key_val); 110 evas_object_image_orient_set(d.img, key_val);
111 printf("Set %i and got %i\n", key_val, 111 printf("Set %i and got %i\n", key_val,
112 evas_object_image_orient_get(d.img)); 112 evas_object_image_orient_get(d.img));
113 113
114 return; 114 return;
115 } 115 }
@@ -152,9 +152,8 @@ main(void)
152 } 152 }
153 else 153 else
154 { 154 {
155 printf( 155 printf("loaded image '%s' with success! error string is \"%s\"\n",
156 "loaded image '%s' with success! error string is \"%s\"\n", 156 img_path, evas_load_error_str(err));
157 img_path, evas_load_error_str(err));
158 157
159 evas_object_move(d.img, WIDTH / 2, HEIGHT / 2); 158 evas_object_move(d.img, WIDTH / 2, HEIGHT / 2);
160 evas_object_image_fill_set(d.img, 0, 0, WIDTH / 2, HEIGHT / 2); 159 evas_object_image_fill_set(d.img, 0, 0, WIDTH / 2, HEIGHT / 2);
diff --git a/src/examples/evas/evas-images5.c b/src/examples/evas/evas-images5.c
index 51b67f2..2178c82 100644
--- a/src/examples/evas/evas-images5.c
+++ b/src/examples/evas/evas-images5.c
@@ -91,7 +91,7 @@ _on_keydown(void *data EINA_UNUSED,
91 file_path, quality_str); 91 file_path, quality_str);
92 else 92 else
93 printf("Image saved to '%s' (flags '%s'), check it out with " 93 printf("Image saved to '%s' (flags '%s'), check it out with "
94 "an image viewer\n", file_path, quality_str); 94 "an image viewer\n", file_path, quality_str);
95 95
96 return; 96 return;
97 } 97 }
@@ -170,9 +170,8 @@ main(void)
170 } 170 }
171 else 171 else
172 { 172 {
173 printf( 173 printf("loaded image '%s' with success! error string is \"%s\"\n",
174 "loaded image '%s' with success! error string is \"%s\"\n", 174 img_path, evas_load_error_str(err));
175 img_path, evas_load_error_str(err));
176 175
177 evas_object_move(d.img, WIDTH / 2, HEIGHT / 2); 176 evas_object_move(d.img, WIDTH / 2, HEIGHT / 2);
178 evas_object_image_fill_set(d.img, 0, 0, WIDTH / 2, HEIGHT / 2); 177 evas_object_image_fill_set(d.img, 0, 0, WIDTH / 2, HEIGHT / 2);
diff --git a/src/examples/evas/evas-init-shutdown.c b/src/examples/evas/evas-init-shutdown.c
index 40263ce..b3df2e6 100644
--- a/src/examples/evas/evas-init-shutdown.c
+++ b/src/examples/evas/evas-init-shutdown.c
@@ -41,5 +41,4 @@ main(void)
41 41
42 evas_shutdown(); 42 evas_shutdown();
43 return 0; 43 return 0;
44 } 44}
45
diff --git a/src/examples/evas/evas-map-aa.c b/src/examples/evas/evas-map-aa.c
index 3e65606..a3619f0 100644
--- a/src/examples/evas/evas-map-aa.c
+++ b/src/examples/evas/evas-map-aa.c
@@ -352,4 +352,3 @@ panic:
352 " up to ecore-evas for this example to run properly.\n"); 352 " up to ecore-evas for this example to run properly.\n");
353 return -2; 353 return -2;
354} 354}
355
diff --git a/src/examples/evas/evas-multi-touch.c b/src/examples/evas/evas-multi-touch.c
index 51543ce..22b907e 100644
--- a/src/examples/evas/evas-multi-touch.c
+++ b/src/examples/evas/evas-multi-touch.c
@@ -280,7 +280,7 @@ _axis_update_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EI
280 } 280 }
281 281
282 printf("distance %.2f, pressure %.2f, twist %.2f, azimuth %.2f, tilt %.2f\n", 282 printf("distance %.2f, pressure %.2f, twist %.2f, azimuth %.2f, tilt %.2f\n",
283 distance, pressure, twist, azimuth, tilt); 283 distance, pressure, twist, azimuth, tilt);
284 _mouse_update_handle(ev->toolid, azimuth, tilt, twist, pressure); 284 _mouse_update_handle(ev->toolid, azimuth, tilt, twist, pressure);
285} 285}
286 286
@@ -344,4 +344,3 @@ error:
344 ecore_evas_shutdown(); 344 ecore_evas_shutdown();
345 return -1; 345 return -1;
346} 346}
347
diff --git a/src/examples/evas/evas-multiseat-events.c b/src/examples/evas/evas-multiseat-events.c
index 260730a..1a206b3 100644
--- a/src/examples/evas/evas-multiseat-events.c
+++ b/src/examples/evas/evas-multiseat-events.c
@@ -39,8 +39,8 @@ _canvas_focus_in_cb(void *data EINA_UNUSED, const Efl_Event *event)
39 focused = efl_input_focus_object_get(ev); 39 focused = efl_input_focus_object_get(ev);
40 40
41 printf("Object %s was focused by seat %s\n", 41 printf("Object %s was focused by seat %s\n",
42 evas_object_name_get(focused), 42 evas_object_name_get(focused),
43 efl_input_device_name_get(seat)); 43 efl_input_device_name_get(seat));
44} 44}
45 45
46static void 46static void
@@ -53,9 +53,9 @@ _hold_cb(void *data EINA_UNUSED, const Efl_Event *event)
53 seat = efl_input_device_seat_get(efl_input_device_get(ev)); 53 seat = efl_input_device_seat_get(efl_input_device_get(ev));
54 54
55 printf("Hold %s at object %s from seat %s\n", 55 printf("Hold %s at object %s from seat %s\n",
56 efl_input_hold_get(ev) ? "on" : "off", 56 efl_input_hold_get(ev) ? "on" : "off",
57 evas_object_name_get(event->object), 57 evas_object_name_get(event->object),
58 efl_input_device_name_get(seat)); 58 efl_input_device_name_get(seat));
59} 59}
60 60
61static void 61static void
@@ -68,9 +68,9 @@ _focus_cb(void *data EINA_UNUSED, const Efl_Event *event)
68 seat = efl_input_device_get(ev); 68 seat = efl_input_device_get(ev);
69 69
70 printf("Focus %s at object %s from seat %s\n", 70 printf("Focus %s at object %s from seat %s\n",
71 event->desc == EFL_EVENT_FOCUS_IN ? "in" : "out", 71 event->desc == EFL_EVENT_FOCUS_IN ? "in" : "out",
72 evas_object_name_get(event->object), 72 evas_object_name_get(event->object),
73 efl_input_device_name_get(seat)); 73 efl_input_device_name_get(seat));
74} 74}
75 75
76static void 76static void
@@ -83,9 +83,9 @@ _pointer_in_out_cb(void *data EINA_UNUSED, const Efl_Event *event)
83 seat = efl_input_device_seat_get(efl_input_device_get(ev)); 83 seat = efl_input_device_seat_get(efl_input_device_get(ev));
84 84
85 printf("Pointer %s at object %s from seat %s\n", 85 printf("Pointer %s at object %s from seat %s\n",
86 event->desc == EFL_EVENT_POINTER_IN ? "in" : "out", 86 event->desc == EFL_EVENT_POINTER_IN ? "in" : "out",
87 evas_object_name_get(event->object), 87 evas_object_name_get(event->object),
88 efl_input_device_name_get(seat)); 88 efl_input_device_name_get(seat));
89} 89}
90 90
91static void 91static void
@@ -114,8 +114,8 @@ _pointer_down_cb(void *data EINA_UNUSED, const Efl_Event *event)
114 } 114 }
115 115
116 printf("%s at object %s from seat %s\n", buf, 116 printf("%s at object %s from seat %s\n", buf,
117 evas_object_name_get(event->object), 117 evas_object_name_get(event->object),
118 efl_input_device_name_get(seat)); 118 efl_input_device_name_get(seat));
119} 119}
120 120
121static void 121static void
@@ -128,9 +128,9 @@ _pointer_up_cb(void *data EINA_UNUSED, const Efl_Event *event)
128 seat = efl_input_device_seat_get(efl_input_device_get(ev)); 128 seat = efl_input_device_seat_get(efl_input_device_get(ev));
129 129
130 printf("Pointer button %i up at object %s from seat %s\n", 130 printf("Pointer button %i up at object %s from seat %s\n",
131 efl_input_pointer_button_get(ev), 131 efl_input_pointer_button_get(ev),
132 evas_object_name_get(event->object), 132 evas_object_name_get(event->object),
133 efl_input_device_name_get(seat)); 133 efl_input_device_name_get(seat));
134} 134}
135 135
136static void 136static void
@@ -143,10 +143,10 @@ _pointer_move_cb(void *data EINA_UNUSED, const Efl_Event *event)
143 seat = efl_input_device_seat_get(efl_input_device_get(ev)); 143 seat = efl_input_device_seat_get(efl_input_device_get(ev));
144 144
145 printf("Pointer moved to %1.f,%1.f at object %s from seat %s\n", 145 printf("Pointer moved to %1.f,%1.f at object %s from seat %s\n",
146 efl_input_pointer_value_get(ev, EFL_INPUT_VALUE_X), 146 efl_input_pointer_value_get(ev, EFL_INPUT_VALUE_X),
147 efl_input_pointer_value_get(ev, EFL_INPUT_VALUE_Y), 147 efl_input_pointer_value_get(ev, EFL_INPUT_VALUE_Y),
148 evas_object_name_get(event->object), 148 evas_object_name_get(event->object),
149 efl_input_device_name_get(seat)); 149 efl_input_device_name_get(seat));
150} 150}
151 151
152static void 152static void
@@ -159,10 +159,10 @@ _pointer_wheel_cb(void *data EINA_UNUSED, const Efl_Event *event)
159 seat = efl_input_device_seat_get(efl_input_device_get(ev)); 159 seat = efl_input_device_seat_get(efl_input_device_get(ev));
160 160
161 printf("Wheel: '%i,%i' on object %s from seat %s\n", 161 printf("Wheel: '%i,%i' on object %s from seat %s\n",
162 efl_input_pointer_wheel_direction_get(ev), 162 efl_input_pointer_wheel_direction_get(ev),
163 efl_input_pointer_wheel_delta_get(ev), 163 efl_input_pointer_wheel_delta_get(ev),
164 evas_object_name_get(event->object), 164 evas_object_name_get(event->object),
165 efl_input_device_name_get(seat)); 165 efl_input_device_name_get(seat));
166} 166}
167 167
168static void 168static void
@@ -177,13 +177,13 @@ _key_down_cb(void *data EINA_UNUSED, const Efl_Event *event)
177 seat = efl_input_device_seat_get(efl_input_device_get(ev)); 177 seat = efl_input_device_seat_get(efl_input_device_get(ev));
178 178
179 printf("Key down: '%s' on object %s from seat %s\n", 179 printf("Key down: '%s' on object %s from seat %s\n",
180 efl_input_key_name_get(ev), 180 efl_input_key_name_get(ev),
181 evas_object_name_get(event->object), 181 evas_object_name_get(event->object),
182 efl_input_device_name_get(seat)); 182 efl_input_device_name_get(seat));
183 183
184 if (evas_seat_key_modifier_is_set(mods, "Control", seat)) 184 if (evas_seat_key_modifier_is_set(mods, "Control", seat))
185 printf("Ctrl is pressed by seat %s\n", 185 printf("Ctrl is pressed by seat %s\n",
186 efl_input_device_name_get(seat)); 186 efl_input_device_name_get(seat));
187} 187}
188 188
189static void 189static void
@@ -196,9 +196,9 @@ _key_up_cb(void *data EINA_UNUSED, const Efl_Event *event)
196 seat = efl_input_device_seat_get(efl_input_device_get(ev)); 196 seat = efl_input_device_seat_get(efl_input_device_get(ev));
197 197
198 printf("Key up: '%s' on object %s from seat %s\n", 198 printf("Key up: '%s' on object %s from seat %s\n",
199 efl_input_key_name_get(ev), 199 efl_input_key_name_get(ev),
200 evas_object_name_get(event->object), 200 evas_object_name_get(event->object),
201 efl_input_device_name_get(seat)); 201 efl_input_device_name_get(seat));
202} 202}
203 203
204static void 204static void
@@ -210,9 +210,9 @@ _dev_added_or_removed(void *data EINA_UNUSED, const Efl_Event *event)
210 return; 210 return;
211 211
212 printf("The seat '%s' - description: '%s' was '%s'\n", 212 printf("The seat '%s' - description: '%s' was '%s'\n",
213 efl_input_device_name_get(dev), 213 efl_input_device_name_get(dev),
214 efl_input_device_description_get(dev), 214 efl_input_device_description_get(dev),
215 event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED ? "added" : "removed"); 215 event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED ? "added" : "removed");
216} 216}
217 217
218EFL_CALLBACKS_ARRAY_DEFINE(canvas_callbacks, 218EFL_CALLBACKS_ARRAY_DEFINE(canvas_callbacks,
@@ -283,8 +283,8 @@ main(void)
283 { 283 {
284 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_CLASS_SEAT) 284 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_CLASS_SEAT)
285 printf("The seat '%s' - description: '%s' was 'added'\n", 285 printf("The seat '%s' - description: '%s' was 'added'\n",
286 efl_input_device_name_get(dev), 286 efl_input_device_name_get(dev),
287 efl_input_device_description_get(dev)); 287 efl_input_device_description_get(dev));
288 } 288 }
289 289
290 ecore_evas_show(ee); 290 ecore_evas_show(ee);
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index a8dc9eb..c64101a 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -88,7 +88,7 @@ _on_keydown(void *data EINA_UNUSED,
88 efl_gfx_color_set(d.clipper, r, g, b, alpha); 88 efl_gfx_color_set(d.clipper, r, g, b, alpha);
89 89
90 printf("Changing clipper's opacity: %d%%\n", 90 printf("Changing clipper's opacity: %d%%\n",
91 (int)((alpha / 255.0) * 100)); 91 (int)((alpha / 255.0) * 100));
92 return; 92 return;
93 } 93 }
94 94
@@ -173,15 +173,15 @@ main(void)
173 * Object must be deleted explicitly at the end of program.*/ 173 * Object must be deleted explicitly at the end of program.*/
174 d.bg = efl_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas); 174 d.bg = efl_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas);
175 175
176 /* Eo-styled way to perform actions on an object*/ 176 /* Eo-styled way to perform actions on an object */
177 evas_object_name_set(d.bg, "background rectangle"); 177 evas_object_name_set(d.bg, "background rectangle");
178 efl_gfx_color_set(d.bg, 255, 255, 255, 255); 178 efl_gfx_color_set(d.bg, 255, 255, 255, 255);
179 /* white bg */ 179 /* white bg */
180 efl_gfx_position_set(d.bg, 0, 0); 180 efl_gfx_position_set(d.bg, 0, 0);
181 /* at canvas' origin */ 181 /* at canvas' origin */
182 efl_gfx_size_set(d.bg, WIDTH, HEIGHT); 182 efl_gfx_size_set(d.bg, WIDTH, HEIGHT);
183 /* covers full canvas */ 183 /* covers full canvas */
184 efl_gfx_visible_set(d.bg, EINA_TRUE); 184 efl_gfx_visible_set(d.bg, EINA_TRUE);
185 evas_object_focus_set(d.bg, EINA_TRUE); 185 evas_object_focus_set(d.bg, EINA_TRUE);
186 186
187 evas_object_event_callback_add( 187 evas_object_event_callback_add(
@@ -207,7 +207,7 @@ main(void)
207 efl_gfx_size_set(d.img, WIDTH, HEIGHT); 207 efl_gfx_size_set(d.img, WIDTH, HEIGHT);
208 efl_gfx_visible_set(d.img, EINA_TRUE); 208 efl_gfx_visible_set(d.img, EINA_TRUE);
209 printf("Image object added, class name is: %s\n", 209 printf("Image object added, class name is: %s\n",
210 efl_class_name_get(d.img)); 210 efl_class_name_get(d.img));
211 } 211 }
212 212
213 /* border on the image's clipper, here just to emphasize its position */ 213 /* border on the image's clipper, here just to emphasize its position */
@@ -227,6 +227,7 @@ main(void)
227 efl_gfx_size_set(d.clipper_border, (WIDTH / 2) + 6, (HEIGHT / 2) + 6); 227 efl_gfx_size_set(d.clipper_border, (WIDTH / 2) + 6, (HEIGHT / 2) + 6);
228 efl_gfx_visible_set(d.clipper_border, EINA_TRUE); 228 efl_gfx_visible_set(d.clipper_border, EINA_TRUE);
229 } 229 }
230
230 /* solid white clipper (note that it's the default color for a 231 /* solid white clipper (note that it's the default color for a
231 * rectangle) - it won't change clippees' colors, then (multiplying 232 * rectangle) - it won't change clippees' colors, then (multiplying
232 * by 255) */ 233 * by 255) */
diff --git a/src/examples/evas/evas-object-manipulation.c b/src/examples/evas/evas-object-manipulation.c
index 9f37467..f9e6af3 100644
--- a/src/examples/evas/evas-object-manipulation.c
+++ b/src/examples/evas/evas-object-manipulation.c
@@ -59,10 +59,10 @@ _on_keydown(void *data EINA_UNUSED,
59 if (strcmp(ev->key, "h") == 0) /* print help */ 59 if (strcmp(ev->key, "h") == 0) /* print help */
60 { 60 {
61 printf("commands are:\n" 61 printf("commands are:\n"
62 "\to - change clipper's opacity\n" 62 "\to - change clipper's opacity\n"
63 "\tr - toggle clipper's color between red and white\n" 63 "\tr - toggle clipper's color between red and white\n"
64 "\tc - toggle clipper's clipping function\n" 64 "\tc - toggle clipper's clipping function\n"
65 "\tv - toggle clipper's visibility\n"); 65 "\tv - toggle clipper's visibility\n");
66 return; 66 return;
67 } 67 }
68 68
diff --git a/src/examples/evas/evas-smart-interface.c b/src/examples/evas/evas-smart-interface.c
index b6669c9..2f0d119 100644
--- a/src/examples/evas/evas-smart-interface.c
+++ b/src/examples/evas/evas-smart-interface.c
@@ -55,6 +55,7 @@ struct color_tuple
55{ 55{
56 int r, g, b, a; 56 int r, g, b, a;
57} clipper_colors[4] = {WHITE, RED, GREEN, BLUE}; 57} clipper_colors[4] = {WHITE, RED, GREEN, BLUE};
58
58int cur_color = 0; 59int cur_color = 0;
59 60
60static const char * 61static const char *
@@ -113,7 +114,7 @@ _iface1_del(Evas_Object *obj)
113{ 114{
114 printf("iface1's del()! Data is %s\n", 115 printf("iface1's del()! Data is %s\n",
115 (char *)evas_object_smart_interface_data_get 116 (char *)evas_object_smart_interface_data_get
116 (obj, (Evas_Smart_Interface *)&iface1)); 117 (obj, (Evas_Smart_Interface *)&iface1));
117} 118}
118 119
119static void 120static void
@@ -536,17 +537,17 @@ _on_keydown(void *data EINA_UNUSED,
536 d.rects[0] = rect; 537 d.rects[0] = rect;
537 538
538 printf("Setting smart object's left spot with a new" 539 printf("Setting smart object's left spot with a new"
539 " rectangle.\n"); 540 " rectangle.\n");
540 printf("Checking its new smart object parent: %s\n", 541 printf("Checking its new smart object parent: %s\n",
541 evas_object_smart_parent_get(rect) == d.smt ? "OK!" : 542 evas_object_smart_parent_get(rect) == d.smt ? "OK!" :
542 "Failure!"); 543 "Failure!");
543 if (prev) 544 if (prev)
544 { 545 {
545 int r, g, b; 546 int r, g, b;
546 547
547 evas_object_color_get(prev, &r, &g, &b, NULL); 548 evas_object_color_get(prev, &r, &g, &b, NULL);
548 printf("Deleting previous left child," 549 printf("Deleting previous left child,"
549 " which had colors (%d, %d, %d)\n", r, g, b); 550 " which had colors (%d, %d, %d)\n", r, g, b);
550 evas_object_del(prev); 551 evas_object_del(prev);
551 } 552 }
552 553
@@ -565,17 +566,17 @@ _on_keydown(void *data EINA_UNUSED,
565 d.rects[1] = rect; 566 d.rects[1] = rect;
566 567
567 printf("Setting smart object's right spot with a new" 568 printf("Setting smart object's right spot with a new"
568 " rectangle.\n"); 569 " rectangle.\n");
569 printf("Checking its new smart object parent: %s\n", 570 printf("Checking its new smart object parent: %s\n",
570 evas_object_smart_parent_get(rect) == d.smt ? "OK!" : 571 evas_object_smart_parent_get(rect) == d.smt ? "OK!" :
571 "Failure!"); 572 "Failure!");
572 if (prev) 573 if (prev)
573 { 574 {
574 int r, g, b; 575 int r, g, b;
575 576
576 evas_object_color_get(prev, &r, &g, &b, NULL); 577 evas_object_color_get(prev, &r, &g, &b, NULL);
577 printf("Deleting previous right child," 578 printf("Deleting previous right child,"
578 " which had colors (%d, %d, %d)\n", r, g, b); 579 " which had colors (%d, %d, %d)\n", r, g, b);
579 evas_object_del(prev); 580 evas_object_del(prev);
580 } 581 }
581 582
@@ -667,7 +668,7 @@ _on_example_smart_object_child_num_change(void *data EINA_UNUSED,
667 void *event_info) 668 void *event_info)
668{ 669{
669 printf("Number of child members on our example smart" 670 printf("Number of child members on our example smart"
670 " object changed to %llu\n", (unsigned long long)(uintptr_t)event_info); 671 " object changed to %llu\n", (unsigned long long)(uintptr_t)event_info);
671} 672}
672 673
673int 674int
@@ -721,8 +722,8 @@ main(void)
721 722
722 d.clipper = evas_object_smart_clipped_clipper_get(d.smt); 723 d.clipper = evas_object_smart_clipped_clipper_get(d.smt);
723 printf("Checking if clipped smart object's clipper is a " 724 printf("Checking if clipped smart object's clipper is a "
724 "\"static\" one: %s\n", evas_object_static_clip_get( 725 "\"static\" one: %s\n",
725 d.clipper) ? "yes" : "no"); 726 evas_object_static_clip_get(d.clipper) ? "yes" : "no");
726 727
727 evas_object_color_set( 728 evas_object_color_set(
728 d.clipper, clipper_colors[cur_color].r, clipper_colors[cur_color].g, 729 d.clipper, clipper_colors[cur_color].r, clipper_colors[cur_color].g,
@@ -734,8 +735,8 @@ main(void)
734 for (; *descriptions; descriptions++) 735 for (; *descriptions; descriptions++)
735 { 736 {
736 printf("We've found a smart callback on the smart object!" 737 printf("We've found a smart callback on the smart object!"
737 "\n\tname: %s\n\ttype: %s\n", (*descriptions)->name, 738 "\n\tname: %s\n\ttype: %s\n", (*descriptions)->name,
738 (*descriptions)->type); 739 (*descriptions)->type);
739 740
740 if (strcmp((*descriptions)->type, "i")) continue; 741 if (strcmp((*descriptions)->type, "i")) continue;
741 /* we know we don't have other types of smart callbacks 742 /* we know we don't have other types of smart callbacks
@@ -760,7 +761,7 @@ main(void)
760 char *data; 761 char *data;
761 762
762 printf("We've found a smart interface on the smart object!" 763 printf("We've found a smart interface on the smart object!"
763 "\n\tname: %s\n", iface->base.name); 764 "\n\tname: %s\n", iface->base.name);
764 765
765 printf("Setting its interface data...\n"); 766 printf("Setting its interface data...\n");
766 data = evas_object_smart_interface_data_get 767 data = evas_object_smart_interface_data_get
diff --git a/src/examples/evas/evas-smart-object.c b/src/examples/evas/evas-smart-object.c
index 94f2188..12306de 100644
--- a/src/examples/evas/evas-smart-object.c
+++ b/src/examples/evas/evas-smart-object.c
@@ -58,6 +58,7 @@ struct color_tuple
58{ 58{
59 int r, g, b, a; 59 int r, g, b, a;
60} clipper_colors[4] = {WHITE, RED, GREEN, BLUE}; 60} clipper_colors[4] = {WHITE, RED, GREEN, BLUE};
61
61int cur_color = 0; 62int cur_color = 0;
62int cur_angle = 0; 63int cur_angle = 0;
63 64
@@ -96,6 +97,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
96}; 97};
97 98
98typedef struct _Evas_Smart_Example_Data Evas_Smart_Example_Data; 99typedef struct _Evas_Smart_Example_Data Evas_Smart_Example_Data;
100
99/* 101/*
100 * This structure augments clipped smart object's instance data, 102 * This structure augments clipped smart object's instance data,
101 * providing extra members required by our example smart object's 103 * providing extra members required by our example smart object's
@@ -487,18 +489,17 @@ _on_keydown(void *data EINA_UNUSED,
487 prev = evas_smart_example_set_left(d.smt, rect); 489 prev = evas_smart_example_set_left(d.smt, rect);
488 d.rects[0] = rect; 490 d.rects[0] = rect;
489 491
490 printf("Setting smart object's left spot with a new" 492 printf("Setting smart object's left spot with a new rectangle.\n");
491 " rectangle.\n");
492 printf("Checking its new smart object parent: %s\n", 493 printf("Checking its new smart object parent: %s\n",
493 evas_object_smart_parent_get(rect) == d.smt ? "OK!" : 494 evas_object_smart_parent_get(rect) == d.smt ? "OK!" :
494 "Failure!"); 495 "Failure!");
495 if (prev) 496 if (prev)
496 { 497 {
497 int r, g, b; 498 int r, g, b;
498 499
499 evas_object_color_get(prev, &r, &g, &b, NULL); 500 evas_object_color_get(prev, &r, &g, &b, NULL);
500 printf("Deleting previous left child," 501 printf("Deleting previous left child,"
501 " which had colors (%d, %d, %d)\n", r, g, b); 502 " which had colors (%d, %d, %d)\n", r, g, b);
502 evas_object_del(prev); 503 evas_object_del(prev);
503 } 504 }
504 505
@@ -516,18 +517,17 @@ _on_keydown(void *data EINA_UNUSED,
516 prev = evas_smart_example_set_right(d.smt, rect); 517 prev = evas_smart_example_set_right(d.smt, rect);
517 d.rects[1] = rect; 518 d.rects[1] = rect;
518 519
519 printf("Setting smart object's right spot with a new" 520 printf("Setting smart object's right spot with a new rectangle.\n");
520 " rectangle.\n");
521 printf("Checking its new smart object parent: %s\n", 521 printf("Checking its new smart object parent: %s\n",
522 evas_object_smart_parent_get(rect) == d.smt ? "OK!" : 522 evas_object_smart_parent_get(rect) == d.smt ? "OK!" :
523 "Failure!"); 523 "Failure!");
524 if (prev) 524 if (prev)
525 { 525 {
526 int r, g, b; 526 int r, g, b;
527 527
528 evas_object_color_get(prev, &r, &g, &b, NULL); 528 evas_object_color_get(prev, &r, &g, &b, NULL);
529 printf("Deleting previous right child," 529 printf("Deleting previous right child,"
530 " which had colors (%d, %d, %d)\n", r, g, b); 530 " which had colors (%d, %d, %d)\n", r, g, b);
531 evas_object_del(prev); 531 evas_object_del(prev);
532 } 532 }
533 533
@@ -639,7 +639,7 @@ _on_example_smart_object_child_num_change(void *data EINA_UNUSED,
639 void *event_info) 639 void *event_info)
640{ 640{
641 printf("Number of child members on our example smart" 641 printf("Number of child members on our example smart"
642 " object changed to %llu\n", (unsigned long long)(uintptr_t)event_info); 642 " object changed to %llu\n", (unsigned long long)(uintptr_t)event_info);
643} 643}
644 644
645int 645int
@@ -680,12 +680,12 @@ main(void)
680 680
681 ret = evas_object_smart_type_check(d.smt, _evas_smart_example_type); 681 ret = evas_object_smart_type_check(d.smt, _evas_smart_example_type);
682 printf("Adding smart object of type \"%s\" to the canvas: %s.\n", 682 printf("Adding smart object of type \"%s\" to the canvas: %s.\n",
683 _evas_smart_example_type, ret ? "success" : "failure"); 683 _evas_smart_example_type, ret ? "success" : "failure");
684 684
685 d.clipper = evas_object_smart_clipped_clipper_get(d.smt); 685 d.clipper = evas_object_smart_clipped_clipper_get(d.smt);
686 printf("Checking if clipped smart object's clipper is a " 686 printf("Checking if clipped smart object's clipper is a "
687 "\"static\" one: %s\n", evas_object_static_clip_get( 687 "\"static\" one: %s\n",
688 d.clipper) ? "yes" : "no"); 688 evas_object_static_clip_get(d.clipper) ? "yes" : "no");
689 689
690 evas_object_color_set( 690 evas_object_color_set(
691 d.clipper, clipper_colors[cur_color].r, clipper_colors[cur_color].g, 691 d.clipper, clipper_colors[cur_color].r, clipper_colors[cur_color].g,
@@ -697,8 +697,8 @@ main(void)
697 for (; *descriptions; descriptions++) 697 for (; *descriptions; descriptions++)
698 { 698 {
699 printf("We've found a smart callback on the smart object!" 699 printf("We've found a smart callback on the smart object!"
700 "\n\tname: %s\n\ttype: %s\n", (*descriptions)->name, 700 "\n\tname: %s\n\ttype: %s\n", (*descriptions)->name,
701 (*descriptions)->type); 701 (*descriptions)->type);
702 702
703 if (strcmp((*descriptions)->type, "i")) continue; 703 if (strcmp((*descriptions)->type, "i")) continue;
704 /* we know we don't have other types of smart callbacks 704 /* we know we don't have other types of smart callbacks
diff --git a/src/examples/evas/evas-stacking.c b/src/examples/evas/evas-stacking.c
index 523d44e..50df01d 100644
--- a/src/examples/evas/evas-stacking.c
+++ b/src/examples/evas/evas-stacking.c
@@ -117,10 +117,10 @@ _on_keydown(void *data EINA_UNUSED,
117 printf(".\n"); 117 printf(".\n");
118 118
119 printf("Current target rectangle is %s\n", 119 printf("Current target rectangle is %s\n",
120 _name_get(d.rects[d.cur_rect])); 120 _name_get(d.rects[d.cur_rect]));
121 121
122 printf("Background rectangle's layer is %d\n", 122 printf("Background rectangle's layer is %d\n",
123 evas_object_layer_get(d.bg)); 123 evas_object_layer_get(d.bg));
124 124
125 return; 125 return;
126 } 126 }
@@ -131,7 +131,7 @@ _on_keydown(void *data EINA_UNUSED,
131 evas_object_layer_set(d.bg, d.layers[d.cur_layer]); 131 evas_object_layer_set(d.bg, d.layers[d.cur_layer]);
132 132
133 printf("Changing background rectangle's layer to %d\n", 133 printf("Changing background rectangle's layer to %d\n",
134 d.layers[d.cur_layer]); 134 d.layers[d.cur_layer]);
135 return; 135 return;
136 } 136 }
137 137
@@ -140,7 +140,7 @@ _on_keydown(void *data EINA_UNUSED,
140 d.cur_rect = (d.cur_rect + 1) % 3; 140 d.cur_rect = (d.cur_rect + 1) % 3;
141 141
142 printf("Changing target rectangle to the %s one\n", 142 printf("Changing target rectangle to the %s one\n",
143 _name_get(d.rects[d.cur_rect])); 143 _name_get(d.rects[d.cur_rect]));
144 return; 144 return;
145 } 145 }
146 146
@@ -151,11 +151,11 @@ _on_keydown(void *data EINA_UNUSED,
151 evas_object_raise(d.rects[d.cur_rect]); 151 evas_object_raise(d.rects[d.cur_rect]);
152 152
153 printf("%s rectangle was re-stacked to the top if its layer\n", 153 printf("%s rectangle was re-stacked to the top if its layer\n",
154 name); 154 name);
155 155
156 neighbour = evas_object_below_get(d.rects[d.cur_rect]); 156 neighbour = evas_object_below_get(d.rects[d.cur_rect]);
157 printf("Below of %s rect is %s\n", name, 157 printf("Below of %s rect is %s\n", name,
158 neighbour ? _name_get(neighbour) : "no object"); 158 neighbour ? _name_get(neighbour) : "no object");
159 return; 159 return;
160 } 160 }
161 161
@@ -165,13 +165,12 @@ _on_keydown(void *data EINA_UNUSED,
165 165
166 evas_object_lower(d.rects[d.cur_rect]); 166 evas_object_lower(d.rects[d.cur_rect]);
167 167
168 printf( 168 printf("%s rectangle was re-stacked to the bottom if its layer\n",
169 "%s rectangle was re-stacked to the bottom if its layer\n", 169 name);
170 name);
171 170
172 neighbour = evas_object_below_get(d.rects[d.cur_rect]); 171 neighbour = evas_object_below_get(d.rects[d.cur_rect]);
173 printf("Below of %s rect is %s\n", name, 172 printf("Below of %s rect is %s\n", name,
174 neighbour ? _name_get(neighbour) : "no object"); 173 neighbour ? _name_get(neighbour) : "no object");
175 return; 174 return;
176 } 175 }
177 176
@@ -182,7 +181,7 @@ _on_keydown(void *data EINA_UNUSED,
182 evas_object_pass_events_set(d.rects[d.cur_rect], !pass); 181 evas_object_pass_events_set(d.rects[d.cur_rect], !pass);
183 182
184 printf("%s rectangle is now set to%s pass (ignore) events\n", 183 printf("%s rectangle is now set to%s pass (ignore) events\n",
185 name, pass ? " NOT" : ""); 184 name, pass ? " NOT" : "");
186 185
187 return; 186 return;
188 } 187 }
@@ -194,7 +193,7 @@ _on_keydown(void *data EINA_UNUSED,
194 evas_object_repeat_events_set(d.rects[d.cur_rect], !repeat); 193 evas_object_repeat_events_set(d.rects[d.cur_rect], !repeat);
195 194
196 printf("%s rectangle is now set to%s repeat events\n", 195 printf("%s rectangle is now set to%s repeat events\n",
197 name, repeat ? " NOT" : ""); 196 name, repeat ? " NOT" : "");
198 197
199 return; 198 return;
200 } 199 }
@@ -213,11 +212,11 @@ _on_keydown(void *data EINA_UNUSED,
213 212
214 neighbour = evas_object_above_get(d.rects[d.cur_rect]); 213 neighbour = evas_object_above_get(d.rects[d.cur_rect]);
215 printf("Above of %s rect is %s\n", name, 214 printf("Above of %s rect is %s\n", name,
216 neighbour ? _name_get(neighbour) : "no object"); 215 neighbour ? _name_get(neighbour) : "no object");
217 216
218 neighbour = evas_object_below_get(d.rects[d.cur_rect]); 217 neighbour = evas_object_below_get(d.rects[d.cur_rect]);
219 printf("Below of %s rect is %s\n", name, 218 printf("Below of %s rect is %s\n", name,
220 neighbour ? _name_get(neighbour) : "no object"); 219 neighbour ? _name_get(neighbour) : "no object");
221 return; 220 return;
222 } 221 }
223 222
@@ -235,12 +234,12 @@ _on_keydown(void *data EINA_UNUSED,
235 234
236 neighbour = evas_object_above_get(d.rects[d.cur_rect]); 235 neighbour = evas_object_above_get(d.rects[d.cur_rect]);
237 printf("Above of %s rect is %s\n", name, 236 printf("Above of %s rect is %s\n", name,
238 neighbour ? _name_get(neighbour) : "no object"); 237 neighbour ? _name_get(neighbour) : "no object");
239 238
240 neighbour = evas_object_below_get(d.rects[d.cur_rect]); 239 neighbour = evas_object_below_get(d.rects[d.cur_rect]);
241 240
242 printf("Below of %s rect is %s\n", name, 241 printf("Below of %s rect is %s\n", name,
243 neighbour ? _name_get(neighbour) : "no object"); 242 neighbour ? _name_get(neighbour) : "no object");
244 return; 243 return;
245 } 244 }
246} 245}
diff --git a/src/examples/evas/evas-text.c b/src/examples/evas/evas-text.c
index e88070c..659d5f4 100644
--- a/src/examples/evas/evas-text.c
+++ b/src/examples/evas/evas-text.c
@@ -169,7 +169,7 @@ _on_keydown(void *data EINA_UNUSED,
169 evas_object_text_style_set(d.text, type); 169 evas_object_text_style_set(d.text, type);
170 170
171 printf("Changing text's style to \'%s\'\n", 171 printf("Changing text's style to \'%s\'\n",
172 _text_style_type_to_str(type)); 172 _text_style_type_to_str(type));
173 173
174 return; 174 return;
175 } 175 }
@@ -186,7 +186,8 @@ _on_keydown(void *data EINA_UNUSED,
186 186
187 evas_object_text_font_set(d.text, *d.t_data.font_ptr, sz); 187 evas_object_text_font_set(d.text, *d.t_data.font_ptr, sz);
188 188
189 printf("Changing text's font to %s\n", *d.t_data.font_ptr); 189 printf("Changing text's font to %s\n",
190 *d.t_data.font_ptr);
190 191
191 return; 192 return;
192 } 193 }
@@ -202,8 +203,8 @@ _on_keydown(void *data EINA_UNUSED,
202 d.t_data.text_ptr->b, d.t_data.text_ptr->a); 203 d.t_data.text_ptr->b, d.t_data.text_ptr->a);
203 204
204 printf("Changing base color for text to (%d, %d, %d, %d)\n", 205 printf("Changing base color for text to (%d, %d, %d, %d)\n",
205 d.t_data.text_ptr->r, d.t_data.text_ptr->g, 206 d.t_data.text_ptr->r, d.t_data.text_ptr->g,
206 d.t_data.text_ptr->b, d.t_data.text_ptr->a); 207 d.t_data.text_ptr->b, d.t_data.text_ptr->a);
207 208
208 return; 209 return;
209 } 210 }
@@ -219,8 +220,8 @@ _on_keydown(void *data EINA_UNUSED,
219 d.t_data.glow2_ptr->b, d.t_data.glow2_ptr->a); 220 d.t_data.glow2_ptr->b, d.t_data.glow2_ptr->a);
220 221
221 printf("Changing glow 2 color for text to (%d, %d, %d, %d)\n", 222 printf("Changing glow 2 color for text to (%d, %d, %d, %d)\n",
222 d.t_data.glow2_ptr->r, d.t_data.glow2_ptr->g, 223 d.t_data.glow2_ptr->r, d.t_data.glow2_ptr->g,
223 d.t_data.glow2_ptr->b, d.t_data.glow2_ptr->a); 224 d.t_data.glow2_ptr->b, d.t_data.glow2_ptr->a);
224 225
225 return; 226 return;
226 } 227 }
@@ -236,8 +237,8 @@ _on_keydown(void *data EINA_UNUSED,
236 d.t_data.glow_ptr->b, d.t_data.glow_ptr->a); 237 d.t_data.glow_ptr->b, d.t_data.glow_ptr->a);
237 238
238 printf("Changing glow color for text to (%d, %d, %d, %d)\n", 239 printf("Changing glow color for text to (%d, %d, %d, %d)\n",
239 d.t_data.glow_ptr->r, d.t_data.glow_ptr->g, 240 d.t_data.glow_ptr->r, d.t_data.glow_ptr->g,
240 d.t_data.glow_ptr->b, d.t_data.glow_ptr->a); 241 d.t_data.glow_ptr->b, d.t_data.glow_ptr->a);
241 242
242 return; 243 return;
243 } 244 }
@@ -253,8 +254,8 @@ _on_keydown(void *data EINA_UNUSED,
253 d.t_data.outline_ptr->b, d.t_data.outline_ptr->a); 254 d.t_data.outline_ptr->b, d.t_data.outline_ptr->a);
254 255
255 printf("Changing outline color for text to (%d, %d, %d, %d)\n", 256 printf("Changing outline color for text to (%d, %d, %d, %d)\n",
256 d.t_data.outline_ptr->r, d.t_data.outline_ptr->g, 257 d.t_data.outline_ptr->r, d.t_data.outline_ptr->g,
257 d.t_data.outline_ptr->b, d.t_data.outline_ptr->a); 258 d.t_data.outline_ptr->b, d.t_data.outline_ptr->a);
258 259
259 return; 260 return;
260 } 261 }
@@ -270,8 +271,8 @@ _on_keydown(void *data EINA_UNUSED,
270 d.t_data.shadow_ptr->b, d.t_data.shadow_ptr->a); 271 d.t_data.shadow_ptr->b, d.t_data.shadow_ptr->a);
271 272
272 printf("Changing shadow color for text to (%d, %d, %d, %d)\n", 273 printf("Changing shadow color for text to (%d, %d, %d, %d)\n",
273 d.t_data.shadow_ptr->r, d.t_data.shadow_ptr->g, 274 d.t_data.shadow_ptr->r, d.t_data.shadow_ptr->g,
274 d.t_data.shadow_ptr->b, d.t_data.shadow_ptr->a); 275 d.t_data.shadow_ptr->b, d.t_data.shadow_ptr->a);
275 276
276 return; 277 return;
277 } 278 }
@@ -404,4 +405,3 @@ error:
404 ecore_evas_shutdown(); 405 ecore_evas_shutdown();
405 return -1; 406 return -1;
406} 407}
407
diff --git a/src/examples/evas/evas-textblock-obstacles.c b/src/examples/evas/evas-textblock-obstacles.c
index fa60e0f..9d6e4bf 100644
--- a/src/examples/evas/evas-textblock-obstacles.c
+++ b/src/examples/evas/evas-textblock-obstacles.c
@@ -147,7 +147,7 @@ _on_keydown(void *data EINA_UNUSED,
147 else 147 else
148 evas_object_show(obj); 148 evas_object_show(obj);
149 printf("Show/hide toggle for obstacle %p\n", 149 printf("Show/hide toggle for obstacle %p\n",
150 *d.t_data.obs_ptr); 150 *d.t_data.obs_ptr);
151 evas_object_textblock_obstacles_update(d.text); 151 evas_object_textblock_obstacles_update(d.text);
152 152
153 return; 153 return;
@@ -164,10 +164,12 @@ _on_keydown(void *data EINA_UNUSED,
164 164
165 evas_object_textblock_obstacles_update(d.text); 165 evas_object_textblock_obstacles_update(d.text);
166 166
167 printf("Changing obstacle size to: %d,%d\n", *d.t_data.obs_size_ptr, *d.t_data.obs_size_ptr); 167 printf("Changing obstacle size to: %d,%d\n",
168 *d.t_data.obs_size_ptr, *d.t_data.obs_size_ptr);
168 169
169 return; 170 return;
170 } 171 }
172
171 if (strcmp(ev->key, "p") == 0) /* change obstacle position */ 173 if (strcmp(ev->key, "p") == 0) /* change obstacle position */
172 { 174 {
173 Evas_Coord x, y; 175 Evas_Coord x, y;
@@ -186,11 +188,13 @@ _on_keydown(void *data EINA_UNUSED,
186 188
187 return; 189 return;
188 } 190 }
191
189 if (strcmp(ev->key, "w") == 0) /* change obstacle position */ 192 if (strcmp(ev->key, "w") == 0) /* change obstacle position */
190 { 193 {
191 (d.t_data.wrap_ptr)++; 194 (d.t_data.wrap_ptr)++;
192 POINTER_CYCLE(d.t_data.wrap_ptr, d.t_data.wrap); 195 POINTER_CYCLE(d.t_data.wrap_ptr, d.t_data.wrap);
193 printf("Changing wrap mode to: %s\n", *d.t_data.wrap_ptr); 196 printf("Changing wrap mode to: %s\n",
197 *d.t_data.wrap_ptr);
194 _style_set(*d.t_data.wrap_ptr); 198 _style_set(*d.t_data.wrap_ptr);
195 evas_object_textblock_obstacles_update(d.text); 199 evas_object_textblock_obstacles_update(d.text);
196 200
@@ -308,4 +312,3 @@ error:
308 ecore_evas_shutdown(); 312 ecore_evas_shutdown();
309 return -1; 313 return -1;
310} 314}
311
diff --git a/src/examples/evas/evas-transparent.c b/src/examples/evas/evas-transparent.c
index fccecc2..4ea7486 100644
--- a/src/examples/evas/evas-transparent.c
+++ b/src/examples/evas/evas-transparent.c
@@ -105,4 +105,3 @@ panic:
105 " up to ecore-evas for this example to run properly.\n"); 105 " up to ecore-evas for this example to run properly.\n");
106 return -2; 106 return -2;
107} 107}
108
diff --git a/src/examples/evas/evas-vg-batman.c b/src/examples/evas/evas-vg-batman.c
index b9990a7..105f4aa 100644
--- a/src/examples/evas/evas-vg-batman.c
+++ b/src/examples/evas/evas-vg-batman.c
@@ -79,7 +79,7 @@ _animator(void *data EINA_UNUSED, double pos)
79{ 79{
80 int next = (animation_position + 1) % (sizeof (batmans_path) / sizeof (batmans_path[0])); 80 int next = (animation_position + 1) % (sizeof (batmans_path) / sizeof (batmans_path[0]));
81 81
82 evas_vg_shape_interpolate(batman, 82 evas_vg_shape_interpolate(batman,
83 batmans_vg[animation_position], 83 batmans_vg[animation_position],
84 batmans_vg[next], 84 batmans_vg[next],
85 ecore_animator_pos_map(pos, ECORE_POS_MAP_SINUSOIDAL, 0.0, 0.0)); 85 ecore_animator_pos_map(pos, ECORE_POS_MAP_SINUSOIDAL, 0.0, 0.0));
diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c
index da02ec5..55f9e13 100644
--- a/src/examples/evas/evas-vg-simple.c
+++ b/src/examples/evas/evas-vg-simple.c
@@ -22,20 +22,18 @@
22#define EFL_BETA_API_SUPPORT 1 22#define EFL_BETA_API_SUPPORT 1
23#endif 23#endif
24 24
25#include <math.h>
26
25#include <Eo.h> 27#include <Eo.h>
26#include <Efl.h> 28#include <Efl.h>
27#include <Evas.h> 29#include <Evas.h>
28#include <Ecore.h> 30#include <Ecore.h>
29#include <Ecore_Evas.h> 31#include <Ecore_Evas.h>
30
31
32#include <math.h>
33#include <Eina.h> 32#include <Eina.h>
34 33
35#define PATH_KAPPA 0.5522847498 34#define PATH_KAPPA 0.5522847498
36#define PI 3.1415926535 35#define PI 3.1415926535
37 36
38
39static Efl_VG *beginning = NULL; 37static Efl_VG *beginning = NULL;
40static Efl_VG *end = NULL; 38static Efl_VG *end = NULL;
41static Efl_VG *root = NULL; 39static Efl_VG *root = NULL;