diff --git a/doc/images.mk b/doc/images.mk index 68289ad7d4..35836e6a03 100644 --- a/doc/images.mk +++ b/doc/images.mk @@ -1 +1 @@ -EXTRA_DIST += img/01_hash-table.eps img/01_hash-table.png img/alignment-hints.eps img/alignment-hints.png img/any-policy.eps img/any-policy.png img/aspect-control-both.eps img/aspect-control-both.png img/aspect-control-horizontal.eps img/aspect-control-horizontal.png img/aspect-control-none-neither.eps img/aspect-control-none-neither.png img/basic2final.eps img/basic2final.png img/border-effect.eps img/border-effect.png img/bouncing_ball.eps img/bouncing_ball.png img/bouncing_text.eps img/bouncing_text.png img/camera.eps img/camera.png img/camera_track.eps img/camera_track.png img/clipping.eps img/clipping.png img/collision_detection.eps img/collision_detection.png img/collision_filter.eps img/collision_filter.png img/diagram_ephysics.eps img/diagram_ephysics.png img/ecore_con-client-server.eps img/ecore_con-client-server-example2.eps img/ecore_con-client-server-example2.png img/ecore_con-client-server-example.eps img/ecore_con-client-server-example.png img/ecore_con-client-server.png img/ecore-pos-map.eps img/ecore-pos-map.png img/ecore_thread.eps img/ecore_thread_feedback.eps img/ecore_thread_feedback.png img/ecore_thread.png img/edje-animations2.eps img/edje-animations2.png img/edje-animations.eps img/edje-animations.png img/edje-basics-example.eps img/edje-basics-example.png img/edje-box2-example.eps img/edje-box2-example.png img/edje-box-example.eps img/edje-box-example.png img/edje-color-class-example2.eps img/edje-color-class-example2.png img/edje-color-class-example.eps img/edje-color-class-example.png img/edje-drag-example.eps img/edje-drag-example.png img/edje-perspective-example.eps img/edje-perspective-example.png img/edje-signals-messages-example.eps img/edje-signals-messages-example.png img/edje-table-example.eps img/edje-table-example.png img/edje-text.eps img/edje-text.png img/edoxy.css img/eina_array-growth.eps img/eina_array-growth.png img/eina_inlist-node_eg1-inlist.eps img/eina_inlist-node_eg1-inlist.png img/eina_inlist-node_eg1-my-struct.eps img/eina_inlist-node_eg1-my-struct.png img/eina_inlist-node_eg2-list-inlist.eps img/eina_inlist-node_eg2-list-inlist.png img/eina_inlist-node_eg2-my-struct.eps img/eina_inlist-node_eg2-my-struct.png img/eina_inlist-node_eg3-my-struct.eps img/eina_inlist-node_eg3-my-struct.png img/eina_inlist-node_eg3-two-inlists.eps img/eina_inlist-node_eg3-two-inlists.png img/eina_inlist-node.eps img/eina_inlist-node.png img/eina_list.eps img/eina_list_example_01_a.eps img/eina_list_example_01_a.png img/eina_list_example_01_b.eps img/eina_list_example_01_b.png img/eina-list-foreach.eps img/eina-list-foreach.png img/eina-list-foreach-safe.eps img/eina-list-foreach-safe.png img/eina-list-free.eps img/eina-list-free.png img/eina_list.png img/eina-list-reverse-foreach.eps img/eina-list-reverse-foreach.png img/eina-list-reverse-foreach-safe.eps img/eina-list-reverse-foreach-safe.png img/eina_stringshare.eps img/eina_stringshare.png img/emotion_ratio.eps img/emotion_ratio.png img/e.png img/evas-box-example-00.eps img/evas-box-example-00.png img/evas-box-example-01.eps img/evas-box-example-01.png img/evas-box-example-02.eps img/evas-box-example-02.png img/evas-box-example-03.eps img/evas-box-example-03.png img/evas-box-example-04.eps img/evas-box-example-04.png img/evas-box-example-05.eps img/evas-box-example-05.png img/evas-callbacks.eps img/evas-callbacks.png img/evas-stacking-example-00.eps img/evas-stacking-example-00.png img/evas-stacking-example-01.eps img/evas-stacking-example-01.png img/evas-stacking-example-02.eps img/evas-stacking-example-02.png img/evas-stacking-example-03.eps img/evas-stacking-example-03.png img/evas-stacking-example-04.eps img/evas-stacking-example-04.png img/evas-stacking-example-05.eps img/evas-stacking-example-05.png img/evas-stacking-example-06.eps img/evas-stacking-example-06.png img/evas-stacking-example-07.eps img/evas-stacking-example-07.png img/foot_bg.png img/forces.eps img/forces.png img/growing_balls.eps img/growing_balls.png img/head_bg.png img/header_menu_background_last.png img/header_menu_background.png img/header_menu_current_background.png img/header_menu_unselected_background.png img/image-borders.eps img/image-borders.png img/image-fill.eps img/image-fill.png img/logo.png img/map-3d-basic-1.eps img/map-3d-basic-1.png img/map-3d-basic-2.eps img/map-3d-basic-2.png img/map-3d-basic-3.eps img/map-3d-basic-3.png img/map-light2.eps img/map-light2.png img/map-light3.eps img/map-light3.png img/map-light4.eps img/map-light4.png img/map-light5.eps img/map-light5.png img/map-light6.eps img/map-light6.png img/map-light7.eps img/map-light7.png img/map-light8.eps img/map-light8.png img/map-light.eps img/map-light.png img/map-point-order-back.eps img/map-point-order-back.png img/map-point-order-face.eps img/map-point-order-face.png img/map-rotation-2d-1.eps img/map-rotation-2d-1.png img/map-rotation-2d-2.eps img/map-rotation-2d-2.png img/map-rotation-2d-3.eps img/map-rotation-2d-3.png img/map-rotation-2d-4.eps img/map-rotation-2d-4.png img/map-set-map-points-1.eps img/map-set-map-points-1.png img/map-set-map-points-2.eps img/map-set-map-points-2.png img/map-set-map-points-3.eps img/map-set-map-points-3.png img/map-uv-mapping-1.eps img/map-uv-mapping-1.png img/map-uv-mapping-2.eps img/map-uv-mapping-2.png img/map-uv-mapping-3.eps img/map-uv-mapping-3.png img/map-uv-mapping-4.eps img/map-uv-mapping-4.png img/menu_bg_current.png img/menu_bg_hover.png img/menu_bg_last.png img/menu_bg.png img/menu_bg_unsel.png img/no_gravity.eps img/no_gravity.png img/padding-hints.eps img/padding-hints.png img/prog_flow.eps img/prog_flow.png img/shapes.eps img/shapes.png img/signal2final.eps img/signal2final.png img/slider.eps img/slider.png img/.svn/entries img/.svn/prop-base/01_hash-table.png.svn-base img/.svn/prop-base/bouncing_ball.png.svn-base img/.svn/prop-base/bouncing_text.png.svn-base img/.svn/prop-base/camera.png.svn-base img/.svn/prop-base/camera_track.png.svn-base img/.svn/prop-base/collision_detection.png.svn-base img/.svn/prop-base/collision_filter.png.svn-base img/.svn/prop-base/diagram_ephysics.png.svn-base img/.svn/prop-base/edje-animations2.png.svn-base img/.svn/prop-base/edje-animations.png.svn-base img/.svn/prop-base/edje-basics-example.png.svn-base img/.svn/prop-base/edje-box2-example.png.svn-base img/.svn/prop-base/edje-box-example.png.svn-base img/.svn/prop-base/edje-color-class-example2.png.svn-base img/.svn/prop-base/edje-color-class-example.png.svn-base img/.svn/prop-base/edje-drag-example.png.svn-base img/.svn/prop-base/edje-perspective-example.png.svn-base img/.svn/prop-base/edje-signals-messages-example.png.svn-base img/.svn/prop-base/edje-table-example.png.svn-base img/.svn/prop-base/edje-text.png.svn-base img/.svn/prop-base/eina_array-growth.png.svn-base img/.svn/prop-base/eina_inlist-node_eg1-inlist.png.svn-base img/.svn/prop-base/eina_inlist-node_eg1-my-struct.png.svn-base img/.svn/prop-base/eina_inlist-node_eg2-list-inlist.png.svn-base img/.svn/prop-base/eina_inlist-node_eg2-my-struct.png.svn-base img/.svn/prop-base/eina_inlist-node_eg3-my-struct.png.svn-base img/.svn/prop-base/eina_inlist-node_eg3-two-inlists.png.svn-base img/.svn/prop-base/eina_inlist-node.png.svn-base img/.svn/prop-base/eina_list_example_01_a.png.svn-base img/.svn/prop-base/eina_list_example_01_b.png.svn-base img/.svn/prop-base/eina-list-foreach.png.svn-base img/.svn/prop-base/eina-list-foreach-safe.png.svn-base img/.svn/prop-base/eina-list-free.png.svn-base img/.svn/prop-base/eina_list.png.svn-base img/.svn/prop-base/eina-list-reverse-foreach.png.svn-base img/.svn/prop-base/eina-list-reverse-foreach-safe.png.svn-base img/.svn/prop-base/eina_stringshare.png.svn-base img/.svn/prop-base/e.png.svn-base img/.svn/prop-base/foot_bg.png.svn-base img/.svn/prop-base/forces.png.svn-base img/.svn/prop-base/growing_balls.png.svn-base img/.svn/prop-base/head_bg.png.svn-base img/.svn/prop-base/header_menu_background_last.png.svn-base img/.svn/prop-base/header_menu_background.png.svn-base img/.svn/prop-base/header_menu_current_background.png.svn-base img/.svn/prop-base/header_menu_unselected_background.png.svn-base img/.svn/prop-base/logo.png.svn-base img/.svn/prop-base/menu_bg_current.png.svn-base img/.svn/prop-base/menu_bg_hover.png.svn-base img/.svn/prop-base/menu_bg_last.png.svn-base img/.svn/prop-base/menu_bg.png.svn-base img/.svn/prop-base/menu_bg_unsel.png.svn-base img/.svn/prop-base/no_gravity.png.svn-base img/.svn/prop-base/shapes.png.svn-base img/.svn/prop-base/slider.png.svn-base img/.svn/text-base/01_hash-table.eps.svn-base img/.svn/text-base/01_hash-table.png.svn-base img/.svn/text-base/alignment-hints.eps.svn-base img/.svn/text-base/alignment-hints.png.svn-base img/.svn/text-base/any-policy.eps.svn-base img/.svn/text-base/any-policy.png.svn-base img/.svn/text-base/aspect-control-both.eps.svn-base img/.svn/text-base/aspect-control-both.png.svn-base img/.svn/text-base/aspect-control-horizontal.eps.svn-base img/.svn/text-base/aspect-control-horizontal.png.svn-base img/.svn/text-base/aspect-control-none-neither.eps.svn-base img/.svn/text-base/aspect-control-none-neither.png.svn-base img/.svn/text-base/basic2final.eps.svn-base img/.svn/text-base/basic2final.png.svn-base img/.svn/text-base/border-effect.eps.svn-base img/.svn/text-base/border-effect.png.svn-base img/.svn/text-base/bouncing_ball.eps.svn-base img/.svn/text-base/bouncing_ball.png.svn-base img/.svn/text-base/bouncing_text.eps.svn-base img/.svn/text-base/bouncing_text.png.svn-base img/.svn/text-base/camera.eps.svn-base img/.svn/text-base/camera.png.svn-base img/.svn/text-base/camera_track.eps.svn-base img/.svn/text-base/camera_track.png.svn-base img/.svn/text-base/clipping.eps.svn-base img/.svn/text-base/clipping.png.svn-base img/.svn/text-base/collision_detection.eps.svn-base img/.svn/text-base/collision_detection.png.svn-base img/.svn/text-base/collision_filter.eps.svn-base img/.svn/text-base/collision_filter.png.svn-base img/.svn/text-base/diagram_ephysics.eps.svn-base img/.svn/text-base/diagram_ephysics.png.svn-base img/.svn/text-base/ecore_con-client-server.eps.svn-base img/.svn/text-base/ecore_con-client-server-example2.eps.svn-base img/.svn/text-base/ecore_con-client-server-example2.png.svn-base img/.svn/text-base/ecore_con-client-server-example.eps.svn-base img/.svn/text-base/ecore_con-client-server-example.png.svn-base img/.svn/text-base/ecore_con-client-server.png.svn-base img/.svn/text-base/ecore-pos-map.eps.svn-base img/.svn/text-base/ecore-pos-map.png.svn-base img/.svn/text-base/ecore_thread.eps.svn-base img/.svn/text-base/ecore_thread_feedback.eps.svn-base img/.svn/text-base/ecore_thread_feedback.png.svn-base img/.svn/text-base/ecore_thread.png.svn-base img/.svn/text-base/edje-animations2.eps.svn-base img/.svn/text-base/edje-animations2.png.svn-base img/.svn/text-base/edje-animations.eps.svn-base img/.svn/text-base/edje-animations.png.svn-base img/.svn/text-base/edje-basics-example.eps.svn-base img/.svn/text-base/edje-basics-example.png.svn-base img/.svn/text-base/edje-box2-example.eps.svn-base img/.svn/text-base/edje-box2-example.png.svn-base img/.svn/text-base/edje-box-example.eps.svn-base img/.svn/text-base/edje-box-example.png.svn-base img/.svn/text-base/edje-color-class-example2.eps.svn-base img/.svn/text-base/edje-color-class-example2.png.svn-base img/.svn/text-base/edje-color-class-example.eps.svn-base img/.svn/text-base/edje-color-class-example.png.svn-base img/.svn/text-base/edje-drag-example.eps.svn-base img/.svn/text-base/edje-drag-example.png.svn-base img/.svn/text-base/edje-perspective-example.eps.svn-base img/.svn/text-base/edje-perspective-example.png.svn-base img/.svn/text-base/edje-signals-messages-example.eps.svn-base img/.svn/text-base/edje-signals-messages-example.png.svn-base img/.svn/text-base/edje-table-example.eps.svn-base img/.svn/text-base/edje-table-example.png.svn-base img/.svn/text-base/edje-text.eps.svn-base img/.svn/text-base/edje-text.png.svn-base img/.svn/text-base/edoxy.css.svn-base img/.svn/text-base/eina_array-growth.eps.svn-base img/.svn/text-base/eina_array-growth.png.svn-base img/.svn/text-base/eina_inlist-node_eg1-inlist.eps.svn-base img/.svn/text-base/eina_inlist-node_eg1-inlist.png.svn-base img/.svn/text-base/eina_inlist-node_eg1-my-struct.eps.svn-base img/.svn/text-base/eina_inlist-node_eg1-my-struct.png.svn-base img/.svn/text-base/eina_inlist-node_eg2-list-inlist.eps.svn-base img/.svn/text-base/eina_inlist-node_eg2-list-inlist.png.svn-base img/.svn/text-base/eina_inlist-node_eg2-my-struct.eps.svn-base img/.svn/text-base/eina_inlist-node_eg2-my-struct.png.svn-base img/.svn/text-base/eina_inlist-node_eg3-my-struct.eps.svn-base img/.svn/text-base/eina_inlist-node_eg3-my-struct.png.svn-base img/.svn/text-base/eina_inlist-node_eg3-two-inlists.eps.svn-base img/.svn/text-base/eina_inlist-node_eg3-two-inlists.png.svn-base img/.svn/text-base/eina_inlist-node.eps.svn-base img/.svn/text-base/eina_inlist-node.png.svn-base img/.svn/text-base/eina_list.eps.svn-base img/.svn/text-base/eina_list_example_01_a.eps.svn-base img/.svn/text-base/eina_list_example_01_a.png.svn-base img/.svn/text-base/eina_list_example_01_b.eps.svn-base img/.svn/text-base/eina_list_example_01_b.png.svn-base img/.svn/text-base/eina-list-foreach.eps.svn-base img/.svn/text-base/eina-list-foreach.png.svn-base img/.svn/text-base/eina-list-foreach-safe.eps.svn-base img/.svn/text-base/eina-list-foreach-safe.png.svn-base img/.svn/text-base/eina-list-free.eps.svn-base img/.svn/text-base/eina-list-free.png.svn-base img/.svn/text-base/eina_list.png.svn-base img/.svn/text-base/eina-list-reverse-foreach.eps.svn-base img/.svn/text-base/eina-list-reverse-foreach.png.svn-base img/.svn/text-base/eina-list-reverse-foreach-safe.eps.svn-base img/.svn/text-base/eina-list-reverse-foreach-safe.png.svn-base img/.svn/text-base/eina_stringshare.eps.svn-base img/.svn/text-base/eina_stringshare.png.svn-base img/.svn/text-base/emotion_ratio.eps.svn-base img/.svn/text-base/emotion_ratio.png.svn-base img/.svn/text-base/e.png.svn-base img/.svn/text-base/evas-box-example-00.eps.svn-base img/.svn/text-base/evas-box-example-00.png.svn-base img/.svn/text-base/evas-box-example-01.eps.svn-base img/.svn/text-base/evas-box-example-01.png.svn-base img/.svn/text-base/evas-box-example-02.eps.svn-base img/.svn/text-base/evas-box-example-02.png.svn-base img/.svn/text-base/evas-box-example-03.eps.svn-base img/.svn/text-base/evas-box-example-03.png.svn-base img/.svn/text-base/evas-box-example-04.eps.svn-base img/.svn/text-base/evas-box-example-04.png.svn-base img/.svn/text-base/evas-box-example-05.eps.svn-base img/.svn/text-base/evas-box-example-05.png.svn-base img/.svn/text-base/evas-callbacks.eps.svn-base img/.svn/text-base/evas-callbacks.png.svn-base img/.svn/text-base/evas-stacking-example-00.eps.svn-base img/.svn/text-base/evas-stacking-example-00.png.svn-base img/.svn/text-base/evas-stacking-example-01.eps.svn-base img/.svn/text-base/evas-stacking-example-01.png.svn-base img/.svn/text-base/evas-stacking-example-02.eps.svn-base img/.svn/text-base/evas-stacking-example-02.png.svn-base img/.svn/text-base/evas-stacking-example-03.eps.svn-base img/.svn/text-base/evas-stacking-example-03.png.svn-base img/.svn/text-base/evas-stacking-example-04.eps.svn-base img/.svn/text-base/evas-stacking-example-04.png.svn-base img/.svn/text-base/evas-stacking-example-05.eps.svn-base img/.svn/text-base/evas-stacking-example-05.png.svn-base img/.svn/text-base/evas-stacking-example-06.eps.svn-base img/.svn/text-base/evas-stacking-example-06.png.svn-base img/.svn/text-base/evas-stacking-example-07.eps.svn-base img/.svn/text-base/evas-stacking-example-07.png.svn-base img/.svn/text-base/foot_bg.png.svn-base img/.svn/text-base/forces.eps.svn-base img/.svn/text-base/forces.png.svn-base img/.svn/text-base/growing_balls.eps.svn-base img/.svn/text-base/growing_balls.png.svn-base img/.svn/text-base/head_bg.png.svn-base img/.svn/text-base/header_menu_background_last.png.svn-base img/.svn/text-base/header_menu_background.png.svn-base img/.svn/text-base/header_menu_current_background.png.svn-base img/.svn/text-base/header_menu_unselected_background.png.svn-base img/.svn/text-base/image-borders.eps.svn-base img/.svn/text-base/image-borders.png.svn-base img/.svn/text-base/image-fill.eps.svn-base img/.svn/text-base/image-fill.png.svn-base img/.svn/text-base/logo.png.svn-base img/.svn/text-base/map-3d-basic-1.eps.svn-base img/.svn/text-base/map-3d-basic-1.png.svn-base img/.svn/text-base/map-3d-basic-2.eps.svn-base img/.svn/text-base/map-3d-basic-2.png.svn-base img/.svn/text-base/map-3d-basic-3.eps.svn-base img/.svn/text-base/map-3d-basic-3.png.svn-base img/.svn/text-base/map-light2.eps.svn-base img/.svn/text-base/map-light2.png.svn-base img/.svn/text-base/map-light3.eps.svn-base img/.svn/text-base/map-light3.png.svn-base img/.svn/text-base/map-light4.eps.svn-base img/.svn/text-base/map-light4.png.svn-base img/.svn/text-base/map-light5.eps.svn-base img/.svn/text-base/map-light5.png.svn-base img/.svn/text-base/map-light6.eps.svn-base img/.svn/text-base/map-light6.png.svn-base img/.svn/text-base/map-light7.eps.svn-base img/.svn/text-base/map-light7.png.svn-base img/.svn/text-base/map-light8.eps.svn-base img/.svn/text-base/map-light8.png.svn-base img/.svn/text-base/map-light.eps.svn-base img/.svn/text-base/map-light.png.svn-base img/.svn/text-base/map-point-order-back.eps.svn-base img/.svn/text-base/map-point-order-back.png.svn-base img/.svn/text-base/map-point-order-face.eps.svn-base img/.svn/text-base/map-point-order-face.png.svn-base img/.svn/text-base/map-rotation-2d-1.eps.svn-base img/.svn/text-base/map-rotation-2d-1.png.svn-base img/.svn/text-base/map-rotation-2d-2.eps.svn-base img/.svn/text-base/map-rotation-2d-2.png.svn-base img/.svn/text-base/map-rotation-2d-3.eps.svn-base img/.svn/text-base/map-rotation-2d-3.png.svn-base img/.svn/text-base/map-rotation-2d-4.eps.svn-base img/.svn/text-base/map-rotation-2d-4.png.svn-base img/.svn/text-base/map-set-map-points-1.eps.svn-base img/.svn/text-base/map-set-map-points-1.png.svn-base img/.svn/text-base/map-set-map-points-2.eps.svn-base img/.svn/text-base/map-set-map-points-2.png.svn-base img/.svn/text-base/map-set-map-points-3.eps.svn-base img/.svn/text-base/map-set-map-points-3.png.svn-base img/.svn/text-base/map-uv-mapping-1.eps.svn-base img/.svn/text-base/map-uv-mapping-1.png.svn-base img/.svn/text-base/map-uv-mapping-2.eps.svn-base img/.svn/text-base/map-uv-mapping-2.png.svn-base img/.svn/text-base/map-uv-mapping-3.eps.svn-base img/.svn/text-base/map-uv-mapping-3.png.svn-base img/.svn/text-base/map-uv-mapping-4.eps.svn-base img/.svn/text-base/map-uv-mapping-4.png.svn-base img/.svn/text-base/menu_bg_current.png.svn-base img/.svn/text-base/menu_bg_hover.png.svn-base img/.svn/text-base/menu_bg_last.png.svn-base img/.svn/text-base/menu_bg.png.svn-base img/.svn/text-base/menu_bg_unsel.png.svn-base img/.svn/text-base/no_gravity.eps.svn-base img/.svn/text-base/no_gravity.png.svn-base img/.svn/text-base/padding-hints.eps.svn-base img/.svn/text-base/padding-hints.png.svn-base img/.svn/text-base/prog_flow.eps.svn-base img/.svn/text-base/prog_flow.png.svn-base img/.svn/text-base/shapes.eps.svn-base img/.svn/text-base/shapes.png.svn-base img/.svn/text-base/signal2final.eps.svn-base img/.svn/text-base/signal2final.png.svn-base img/.svn/text-base/slider.eps.svn-base img/.svn/text-base/slider.png.svn-base img/.svn/text-base/swallow2final.eps.svn-base img/.svn/text-base/swallow2final.png.svn-base img/.svn/text-base/text-styles.eps.svn-base img/.svn/text-base/text-styles.png.svn-base img/swallow2final.eps img/swallow2final.png img/text-styles.eps img/text-styles.png +EXTRA_DIST += img/01_hash-table.eps img/01_hash-table.png img/alignment-hints.eps img/alignment-hints.png img/any-policy.eps img/any-policy.png img/aspect-control-both.eps img/aspect-control-both.png img/aspect-control-horizontal.eps img/aspect-control-horizontal.png img/aspect-control-none-neither.eps img/aspect-control-none-neither.png img/basic2final.eps img/basic2final.png img/border-effect.eps img/border-effect.png img/bouncing_ball.eps img/bouncing_ball.png img/bouncing_text.eps img/bouncing_text.png img/camera.eps img/camera.png img/camera_track.eps img/camera_track.png img/clipping.eps img/clipping.png img/collision_detection.eps img/collision_detection.png img/collision_filter.eps img/collision_filter.png img/diagram_ephysics.eps img/diagram_ephysics.png img/ecore_con-client-server.eps img/ecore_con-client-server-example2.eps img/ecore_con-client-server-example2.png img/ecore_con-client-server-example.eps img/ecore_con-client-server-example.png img/ecore_con-client-server.png img/ecore-pos-map.eps img/ecore-pos-map.png img/ecore_thread.eps img/ecore_thread_feedback.eps img/ecore_thread_feedback.png img/ecore_thread.png img/edje-animations2.eps img/edje-animations2.png img/edje-animations.eps img/edje-animations.png img/edje-basics-example.eps img/edje-basics-example.png img/edje-box2-example.eps img/edje-box2-example.png img/edje-box-example.eps img/edje-box-example.png img/edje-color-class-example2.eps img/edje-color-class-example2.png img/edje-color-class-example.eps img/edje-color-class-example.png img/edje-drag-example.eps img/edje-drag-example.png img/edje-perspective-example.eps img/edje-perspective-example.png img/edje-signals-messages-example.eps img/edje-signals-messages-example.png img/edje-table-example.eps img/edje-table-example.png img/edje-text.eps img/edje-text.png img/edoxy.css img/eina_array-growth.eps img/eina_array-growth.png img/eina_inlist-node_eg1-inlist.eps img/eina_inlist-node_eg1-inlist.png img/eina_inlist-node_eg1-my-struct.eps img/eina_inlist-node_eg1-my-struct.png img/eina_inlist-node_eg2-list-inlist.eps img/eina_inlist-node_eg2-list-inlist.png img/eina_inlist-node_eg2-my-struct.eps img/eina_inlist-node_eg2-my-struct.png img/eina_inlist-node_eg3-my-struct.eps img/eina_inlist-node_eg3-my-struct.png img/eina_inlist-node_eg3-two-inlists.eps img/eina_inlist-node_eg3-two-inlists.png img/eina_inlist-node.eps img/eina_inlist-node.png img/eina_list.eps img/eina_list_example_01_a.eps img/eina_list_example_01_a.png img/eina_list_example_01_b.eps img/eina_list_example_01_b.png img/eina-list-foreach.eps img/eina-list-foreach.png img/eina-list-foreach-safe.eps img/eina-list-foreach-safe.png img/eina-list-free.eps img/eina-list-free.png img/eina_list.png img/eina-list-reverse-foreach.eps img/eina-list-reverse-foreach.png img/eina-list-reverse-foreach-safe.eps img/eina-list-reverse-foreach-safe.png img/eina_stringshare.eps img/eina_stringshare.png img/emotion_ratio.eps img/emotion_ratio.png img/e.png img/evas-box-example-00.eps img/evas-box-example-00.png img/evas-box-example-01.eps img/evas-box-example-01.png img/evas-box-example-02.eps img/evas-box-example-02.png img/evas-box-example-03.eps img/evas-box-example-03.png img/evas-box-example-04.eps img/evas-box-example-04.png img/evas-box-example-05.eps img/evas-box-example-05.png img/evas-callbacks.eps img/evas-callbacks.png img/evas-stacking-example-00.eps img/evas-stacking-example-00.png img/evas-stacking-example-01.eps img/evas-stacking-example-01.png img/evas-stacking-example-02.eps img/evas-stacking-example-02.png img/evas-stacking-example-03.eps img/evas-stacking-example-03.png img/evas-stacking-example-04.eps img/evas-stacking-example-04.png img/evas-stacking-example-05.eps img/evas-stacking-example-05.png img/evas-stacking-example-06.eps img/evas-stacking-example-06.png img/evas-stacking-example-07.eps img/evas-stacking-example-07.png img/foot_bg.png img/forces.eps img/forces.png img/growing_balls.eps img/growing_balls.png img/head_bg.png img/header_menu_background_last.png img/header_menu_background.png img/header_menu_current_background.png img/header_menu_unselected_background.png img/image-borders.eps img/image-borders.png img/image-fill.eps img/image-fill.png img/logo.png img/map-3d-basic-1.eps img/map-3d-basic-1.png img/map-3d-basic-2.eps img/map-3d-basic-2.png img/map-3d-basic-3.eps img/map-3d-basic-3.png img/map-light2.eps img/map-light2.png img/map-light3.eps img/map-light3.png img/map-light4.eps img/map-light4.png img/map-light5.eps img/map-light5.png img/map-light6.eps img/map-light6.png img/map-light7.eps img/map-light7.png img/map-light8.eps img/map-light8.png img/map-light.eps img/map-light.png img/map-point-order-back.eps img/map-point-order-back.png img/map-point-order-face.eps img/map-point-order-face.png img/map-rotation-2d-1.eps img/map-rotation-2d-1.png img/map-rotation-2d-2.eps img/map-rotation-2d-2.png img/map-rotation-2d-3.eps img/map-rotation-2d-3.png img/map-rotation-2d-4.eps img/map-rotation-2d-4.png img/map-set-map-points-1.eps img/map-set-map-points-1.png img/map-set-map-points-2.eps img/map-set-map-points-2.png img/map-set-map-points-3.eps img/map-set-map-points-3.png img/map-uv-mapping-1.eps img/map-uv-mapping-1.png img/map-uv-mapping-2.eps img/map-uv-mapping-2.png img/map-uv-mapping-3.eps img/map-uv-mapping-3.png img/map-uv-mapping-4.eps img/map-uv-mapping-4.png img/menu_bg_current.png img/menu_bg_hover.png img/menu_bg_last.png img/menu_bg.png img/menu_bg_unsel.png img/no_gravity.eps img/no_gravity.png img/padding-hints.eps img/padding-hints.png img/prog_flow.eps img/prog_flow.png img/shapes.eps img/shapes.png img/signal2final.eps img/signal2final.png img/slider.eps img/slider.png img/swallow2final.eps img/swallow2final.png img/text-styles.eps img/text-styles.png diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index 5dfa0f00e0..24224dca06 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c @@ -45,14 +45,14 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) const char *file, *edje_group; eo_do(eo_obj, edje_obj_file_get(&file, &edje_group)); - EO_DBG_INFO_TEXT_APPEND(group, "File", file); - EO_DBG_INFO_TEXT_APPEND(group, "Group", edje_group); + EO_DBG_INFO_APPEND(group, "File", EINA_VALUE_TYPE_STRING, file); + EO_DBG_INFO_APPEND(group, "Group", EINA_VALUE_TYPE_STRING, edje_group); Edje_Load_Error error; eo_do(eo_obj, edje_obj_load_error_get(&error)); if (error != EDJE_LOAD_ERROR_NONE) { - EO_DBG_INFO_TEXT_APPEND(group, "Error", + EO_DBG_INFO_APPEND(group, "Error", EINA_VALUE_TYPE_STRING, edje_load_error_str(error)); } } diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 95ec675e83..16257f8bf2 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -63,138 +63,6 @@ enum _Eo_Op_Type */ typedef enum _Eo_Op_Type Eo_Op_Type; -/* START - Eo Debug support */ -/** - * @var Eo_Dbg_Info_Type - * #Eo_Dbg_Info_Type - tells what type of info in union. - */ -enum _Eo_Dbg_Info_Type -{ /* Public */ - EO_DBG_INFO_TYPE_UNKNOWN, - EO_DBG_INFO_TYPE_STRING, /**< info is string */ - EO_DBG_INFO_TYPE_INT, /**< Single int, enum */ - EO_DBG_INFO_TYPE_BOOL, /**< Single Eina_Bool */ - EO_DBG_INFO_TYPE_PTR, /**< Single PTR value */ - EO_DBG_INFO_TYPE_DOUBLE, /**< Single DBL value */ - EO_DBG_INFO_TYPE_LIST /**< Eina_List * of structs */ -}; -typedef enum _Eo_Dbg_Info_Type Eo_Dbg_Info_Type; - -union _Eo_Dbg_Info_Union -{ - const char *text; - int i; - Eina_Bool b; - void *ptr; - double dbl; - Eina_List *list; /* Sub-List of (Eo_Dbg_Info *) if needed */ -}; -typedef union _Eo_Dbg_Info_Union Eo_Dbg_Info_Union; - -/* Private */ -typedef struct _Eo_Dbg_Info Eo_Dbg_Info; - -/** - * @def EO_DBG_INFO_TEXT_APPEND - * Append a parameter into debug info list. - * @param[in] LIST list where to append - * @param[in] NAME name of the parameter - * @param[in] VALUE text - * - */ -#define EO_DBG_INFO_TEXT_APPEND(LIST, NAME, VALUE) \ - do { \ - Eo_Dbg_Info_Union *un = EO_DBG_INFO_APPEND(LIST, NAME, EO_DBG_INFO_TYPE_STRING); \ - un->text = VALUE; \ - } while (0); - -/** - * @def EO_DBG_INFO_INTEGER_APPEND - * Append a parameter into debug info list. - * @param[in] LIST list where to append - * @param[in] NAME name of the parameter - * @param[in] VALUE integer - * - */ -#define EO_DBG_INFO_INTEGER_APPEND(LIST, NAME, VALUE) \ - do { \ - Eo_Dbg_Info_Union *un = EO_DBG_INFO_APPEND(LIST, NAME, EO_DBG_INFO_TYPE_INT); \ - un->i = VALUE; \ - } while (0); - -/** - * @def EO_DBG_INFO_BOOLEAN_APPEND - * Append a parameter into debug info list. - * @param[in] LIST list where to append - * @param[in] NAME name of the parameter - * @param[in] VALUE boolean - * - */ -#define EO_DBG_INFO_BOOLEAN_APPEND(LIST, NAME, VALUE) \ - do { \ - Eo_Dbg_Info_Union *un = EO_DBG_INFO_APPEND(LIST, NAME, EO_DBG_INFO_TYPE_BOOL); \ - un->b = VALUE; \ - } while (0); - -/** - * @def EO_DBG_INFO_PTR_APPEND - * Append a parameter into debug info list. - * @param[in] LIST list where to append - * @param[in] NAME name of the parameter - * @param[in] VALUE pointer - * - */ -#define EO_DBG_INFO_PTR_APPEND(LIST, NAME, VALUE) \ - do { \ - Eo_Dbg_Info_Union *un = EO_DBG_INFO_APPEND(LIST, NAME, EO_DBG_INFO_TYPE_PTR); \ - un->ptr = VALUE; \ - } while (0); - -/** - * @def EO_DBG_INFO_DOUBLE_APPEND - * Append a parameter into debug info list. - * @param[in] LIST list where to append - * @param[in] NAME name of the parameter - * @param[in] VALUE double - * - */ -#define EO_DBG_INFO_DOUBLE_APPEND(LIST, NAME, VALUE) \ - do { \ - Eo_Dbg_Info_Union *un = EO_DBG_INFO_APPEND(LIST, NAME, EO_DBG_INFO_TYPE_DOUBLE); \ - un->dbl = VALUE; \ - } while (0); - -/** - * @def EO_DBG_INFO_DOUBLE_APPEND - * Creates a list inside debug info list. - * @param[in] LIST list where to append - * @param[in] NAME name of the list - * @return the new list - * - */ -#define EO_DBG_INFO_LIST_APPEND(LIST, NAME) \ - ( \ - eo_dbg_info_append(LIST, NAME, EO_DBG_INFO_TYPE_LIST) \ - ) - -/** - * @def EO_DBG_INFO_APPEND - * Creates a new debug info into a list - * @param[in] LIST list where to append - * @param[in] NAME name of the parameter - * @param[in] TYPE type of the parameter - * @return a pointer to the debug info union where to store the value - * @return the new list - * - */ -#define EO_DBG_INFO_APPEND(LIST, NAME, TYPE) \ - ({ \ - Eo_Dbg_Info *_node = eo_dbg_info_append(LIST, NAME, TYPE); \ - eo_dbg_union_get(_node); }) - -/* END - Eo Debug support */ - - /** * @page eo_main Eo * @@ -255,6 +123,84 @@ typedef struct _Eo_Dbg_Info Eo_Dbg_Info; * @{ */ +/** + * @addtogroup Eo_Debug_Information Eo's Debug information helper. + * @{ + */ + +/** + * @struct _Eo_Dbg_Info + * The structure for the debug info used by Eo. + */ +struct _Eo_Dbg_Info +{ + Eina_Stringshare *name; /**< The name of the part (stringshare). */ + Eina_Value value; /**< The value. */ +}; + +/** + * @var EO_DBG_INFO_TYPE + * The Eina_Value_Type for the debug info. + */ +EAPI extern const Eina_Value_Type *EO_DBG_INFO_TYPE; + +/** + * @typedef Eo_Dbg_Info + * A convenience typedef for #_Eo_Dbg_Info + */ +typedef struct _Eo_Dbg_Info Eo_Dbg_Info; + +/** + * @def EO_DBG_INFO_LIST_APPEND + * Creates a list inside debug info list. + * @param[in] LIST list where to append + * @param[in] NAME name of the list + * @return the new list + */ +#define EO_DBG_INFO_LIST_APPEND(LIST, NAME) \ +({ \ + Eo_Dbg_Info *List = LIST; \ + Eo_Dbg_Info *Tmp = calloc(1, sizeof(*Tmp)); \ + Tmp->name = eina_stringshare_add(NAME); \ + eina_value_list_setup(&(Tmp->value), EO_DBG_INFO_TYPE); \ + if (List) \ + { \ + eina_value_list_pappend(&(List->value), Tmp); \ + } \ + Tmp; \ +}) + +/** + * @def EO_DBG_INFO_APPEND + * Creates a new debug info into a list + * @param[in] LIST list where to append (Eo_Dbg_Info *) + * @param[in] NAME name of the parameter (const char *) + * @param[in] TYPE type of the parameter (Eina_Value_Type *) + * @param[in] VALUE value of the parameter + */ +#define EO_DBG_INFO_APPEND(LIST, NAME, TYPE, VALUE) \ +do { \ + Eo_Dbg_Info *List = LIST; \ + Eo_Dbg_Info *Tmp = calloc(1, sizeof(*Tmp)); \ + Tmp->name = eina_stringshare_add(NAME); \ + eina_value_setup(&(Tmp->value), TYPE); \ + eina_value_set(&(Tmp->value), VALUE); \ + if (List) \ + { \ + eina_value_list_pappend(&(List->value), Tmp); \ + } \ +} while (0) + +/** + * Frees the Eo_Dbg_Info tree. (The whole tree recursively). + * @param[in] info The tree to delete. + */ +EAPI void eo_dbg_info_free(Eo_Dbg_Info *info); + +/** + * @} + */ + /** * @def EO_TYPECHECK(type, x) * @@ -976,57 +922,6 @@ EAPI void eo_composite_detach(Eo *comp_obj, Eo *parent); */ EAPI Eina_Bool eo_composite_is(const Eo *comp_obj); -/** - * @brief Allocates Eo_Dbg_Info node - * @param root - tree to where we append allocated node. - * @param name - Name (title) of info. - * @param type - type of info. - * Use this function to allocate Eo_Dbg_Info node. - * Use dbg_info_free to free this node. - * - * @return a pointer to the newly allocated Eo_Dbg_Info. - * @see eo_dbg_info_free, eo_dbg_type_get, eo_dbg_information_get - */ -EAPI Eo_Dbg_Info *eo_dbg_info_append(Eo_Dbg_Info *root, const char *name, Eo_Dbg_Info_Type type); - -/** - * @brief Free list of Eo_Dbg_Info node (including children) - * @param node - node to free. - * - * @see eo_dbg_type_get, eo_dbg_information_get - */ -EAPI void eo_dbg_info_free(Eo_Dbg_Info *node); - -/** - * @brief Get a pointer to Eo_Dbg_Info union - * @param node - pointer to Eo_Dbg_Info node - * - * @return Pointer to struct union (public data). - * @see eo_dbg_info_free, eo_dbg_type_get, eo_dbg_information_get - */ -EAPI Eo_Dbg_Info_Union *eo_dbg_union_get(Eo_Dbg_Info *node); - -/** - * @brief Returns name of dbg-info. - * @param node - pointer to info struct. - * Use this function to retrieve the name field of debug info. - * - * @see eo_dbg_info_free - * @see eo_dbg_type_get, eo_dbg_information_get - */ -EAPI const char *eo_dbg_name_get(Eo_Dbg_Info *node); - -/** - * @brief Returns type of dbg-info. - * @param node - pointer to info struct. - * Use this function to retrieve the type field of debug info. - * - * @return name (title) of info. - * @see eo_dbg_info_free - * @see eo_dbg_name_get, eo_dbg_information_get - */ -EAPI Eo_Dbg_Info_Type eo_dbg_type_get(Eo_Dbg_Info *node); - /** * @} */ @@ -1114,9 +1009,8 @@ enum { /** * @def eo_dbg_info_get(root_node) - * Get generic data from object. + * Get dbg information from the object. * @param[in] root node of the tree - * */ #define eo_dbg_info_get(root_node) EO_BASE_ID(EO_BASE_SUB_ID_DBG_INFO_GET), EO_TYPECHECK(Eo_Dbg_Info *, root_node) diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index 64f04d9c86..994eb5cda6 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c @@ -55,16 +55,6 @@ struct _Eo { Eina_Bool manual_free:1; }; -/* START - EO Debug structs */ -struct _Eo_Dbg_Info -{ /* Debug info composed of a list of Eo_Dbg_Info */ - const char *name; - Eo_Dbg_Info_Type type; - Eo_Dbg_Info_Union un_dbg_info; -}; -/* END - EO Debug structs */ - - /* Start of Dich */ /* How we search and store the implementations in classes. */ @@ -1592,51 +1582,73 @@ eo_manual_free(Eo *obj) _eo_free(obj); } -EAPI Eo_Dbg_Info * -eo_dbg_info_append(Eo_Dbg_Info *root, const char *name, Eo_Dbg_Info_Type type) -{ - if (root && EO_DBG_INFO_TYPE_LIST != root->type) - return NULL; - - Eo_Dbg_Info *st = calloc(1, sizeof(Eo_Dbg_Info)); - if (!st) return NULL; - - st->name = name; - st->type = type; - - if (root) - root->un_dbg_info.list = eina_list_append(root->un_dbg_info.list, st); - - return st; -} - +/* Eo_Dbg */ EAPI void -eo_dbg_info_free(Eo_Dbg_Info *root) +eo_dbg_info_free(Eo_Dbg_Info *info) { - if (EO_DBG_INFO_TYPE_LIST == root->type) - { - Eo_Dbg_Info *eo; - EINA_LIST_FREE(root->un_dbg_info.list, eo) - eo_dbg_info_free(eo); - } - free(root); + eina_value_flush(&(info->value)); + free(info); } -EAPI const char * -eo_dbg_name_get(Eo_Dbg_Info *node) +static Eina_Bool +_eo_dbg_info_setup(const Eina_Value_Type *type, void *mem) { - return ((node) ? node->name : NULL); + memset(mem, 0, type->value_size); + return EINA_TRUE; } -EAPI Eo_Dbg_Info_Union * -eo_dbg_union_get(Eo_Dbg_Info *node) +static Eina_Bool +_eo_dbg_info_flush(const Eina_Value_Type *type EINA_UNUSED, void *_mem) { - return ((node) ? &node->un_dbg_info : NULL); + Eo_Dbg_Info *mem = *(Eo_Dbg_Info **) _mem; + eina_stringshare_del(mem->name); + eina_value_flush(&(mem->value)); + free(mem); + return EINA_TRUE; } -EAPI Eo_Dbg_Info_Type -eo_dbg_type_get(Eo_Dbg_Info *node) +static Eina_Bool +_eo_dbg_info_copy(const Eina_Value_Type *type EINA_UNUSED, const void *_src, void *_dst) { - return ((node) ? node->type : EO_DBG_INFO_TYPE_UNKNOWN); + const Eo_Dbg_Info **src = (const Eo_Dbg_Info **) _src; + Eo_Dbg_Info **dst = _dst; + *dst = calloc(1, sizeof(*dst)); + (*dst)->name = eina_stringshare_ref((*src)->name); + eina_value_copy(&((*src)->value), &((*dst)->value)); + return EINA_TRUE; } +static Eina_Bool +_eo_dbg_info_pset(const Eina_Value_Type *type EINA_UNUSED, void *_mem, const void *_ptr) +{ + Eo_Dbg_Info **mem = _mem; + if (*mem) + free(*mem); + *mem = (void *) _ptr; + return EINA_TRUE; +} + +static Eina_Bool +_eo_dbg_info_pget(const Eina_Value_Type *type EINA_UNUSED, const void *_mem, void *_ptr) +{ + Eo_Dbg_Info **ptr = _ptr; + *ptr = (void *) _mem; + return EINA_TRUE; +} + +static const Eina_Value_Type _EO_DBG_INFO_TYPE = { + EINA_VALUE_TYPE_VERSION, + sizeof(Eo_Dbg_Info *), + "Eo_Dbg_Info_Ptr", + _eo_dbg_info_setup, + _eo_dbg_info_flush, + _eo_dbg_info_copy, + NULL, + NULL, + NULL, + NULL, + _eo_dbg_info_pset, + _eo_dbg_info_pget +}; + +EAPI const Eina_Value_Type *EO_DBG_INFO_TYPE = &_EO_DBG_INFO_TYPE; diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index e1abe2407f..7699b61524 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -775,16 +775,16 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) const char *file, *key; eo_do(eo_obj, evas_obj_image_file_get(&file, &key)); - EO_DBG_INFO_TEXT_APPEND(group, "Image File", file); - EO_DBG_INFO_TEXT_APPEND(group, "Key", key); - EO_DBG_INFO_PTR_APPEND(group, "Source", - (void *) evas_object_image_source_get(eo_obj)); + EO_DBG_INFO_APPEND(group, "Image File", EINA_VALUE_TYPE_STRING, file); + EO_DBG_INFO_APPEND(group, "Key", EINA_VALUE_TYPE_STRING, key); + EO_DBG_INFO_APPEND(group, "Source", EINA_VALUE_TYPE_UINT64, + (uint64_t) (uintptr_t *) evas_object_image_source_get(eo_obj)); if (evas_object_image_load_error_get(eo_obj) != EVAS_LOAD_ERROR_NONE) { Evas_Load_Error error; eo_do(eo_obj, evas_obj_image_load_error_get(&error)); - EO_DBG_INFO_TEXT_APPEND(group, "Load Error", + EO_DBG_INFO_APPEND(group, "Load Error", EINA_VALUE_TYPE_STRING, evas_load_error_str(error)); } } diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index f1745f1797..8dcfae4293 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -1867,66 +1867,66 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) Eina_Bool visible; eo_do(eo_obj, evas_obj_visibility_get(&visible)); - EO_DBG_INFO_BOOLEAN_APPEND(group, "Visibility", visible); + EO_DBG_INFO_APPEND(group, "Visibility", EINA_VALUE_TYPE_CHAR, visible); short layer; eo_do(eo_obj, evas_obj_layer_get(&layer)); - EO_DBG_INFO_INTEGER_APPEND(group, "Layer", layer); + EO_DBG_INFO_APPEND(group, "Layer", EINA_VALUE_TYPE_INT, layer); int x, y; eo_do(eo_obj, evas_obj_position_get(&x, &y)); node = EO_DBG_INFO_LIST_APPEND(group, "Position"); - EO_DBG_INFO_INTEGER_APPEND(node, "x", x); - EO_DBG_INFO_INTEGER_APPEND(node, "y", y); + EO_DBG_INFO_APPEND(node, "x", EINA_VALUE_TYPE_INT, x); + EO_DBG_INFO_APPEND(node, "y", EINA_VALUE_TYPE_INT, y); int w, h; eo_do(eo_obj, evas_obj_size_get(&w, &h)); node = EO_DBG_INFO_LIST_APPEND(group, "Size"); - EO_DBG_INFO_INTEGER_APPEND(node, "w", w); - EO_DBG_INFO_INTEGER_APPEND(node, "h", h); + EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w); + EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h); double scale; eo_do(eo_obj, evas_obj_scale_get(&scale)); - EO_DBG_INFO_DOUBLE_APPEND(group, "Scale", scale); + EO_DBG_INFO_APPEND(group, "Scale", EINA_VALUE_TYPE_DOUBLE, scale); eo_do(eo_obj, evas_obj_size_hint_min_get(&w, &h)); node = EO_DBG_INFO_LIST_APPEND(group, "Min size"); - EO_DBG_INFO_INTEGER_APPEND(node, "w", w); - EO_DBG_INFO_INTEGER_APPEND(node, "h", h); + EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w); + EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h); eo_do(eo_obj, evas_obj_size_hint_max_get(&w, &h)); node = EO_DBG_INFO_LIST_APPEND(group, "Max size"); - EO_DBG_INFO_INTEGER_APPEND(node, "w", w); - EO_DBG_INFO_INTEGER_APPEND(node, "h", h); + EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w); + EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h); eo_do(eo_obj, evas_obj_size_hint_request_get(&w, &h)); node = EO_DBG_INFO_LIST_APPEND(group, "Request size"); - EO_DBG_INFO_INTEGER_APPEND(node, "w", w); - EO_DBG_INFO_INTEGER_APPEND(node, "h", h); + EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w); + EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h); double dblx, dbly; eo_do(eo_obj, evas_obj_size_hint_align_get(&dblx, &dbly)); node = EO_DBG_INFO_LIST_APPEND(group, "Align"); - EO_DBG_INFO_INTEGER_APPEND(node, "x", dblx); - EO_DBG_INFO_INTEGER_APPEND(node, "y", dbly); + EO_DBG_INFO_APPEND(node, "x", EINA_VALUE_TYPE_INT, dblx); + EO_DBG_INFO_APPEND(node, "y", EINA_VALUE_TYPE_INT, dbly); double dblw, dblh; eo_do(eo_obj, evas_obj_size_hint_weight_get(&dblw, &dblh)); node = EO_DBG_INFO_LIST_APPEND(group, "Weight"); - EO_DBG_INFO_INTEGER_APPEND(node, "w", dblw); - EO_DBG_INFO_INTEGER_APPEND(node, "h", dblh); + EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, dblw); + EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, dblh); int r, g, b, a; eo_do(eo_obj, evas_obj_color_get(&r, &g, &b, &a)); node = EO_DBG_INFO_LIST_APPEND(group, "Color"); - EO_DBG_INFO_INTEGER_APPEND(node, "r", r); - EO_DBG_INFO_INTEGER_APPEND(node, "g", g); - EO_DBG_INFO_INTEGER_APPEND(node, "b", b); - EO_DBG_INFO_INTEGER_APPEND(node, "a", a); + EO_DBG_INFO_APPEND(node, "r", EINA_VALUE_TYPE_INT, r); + EO_DBG_INFO_APPEND(node, "g", EINA_VALUE_TYPE_INT, g); + EO_DBG_INFO_APPEND(node, "b", EINA_VALUE_TYPE_INT, b); + EO_DBG_INFO_APPEND(node, "a", EINA_VALUE_TYPE_INT, a); Eina_Bool focus; eo_do(eo_obj, evas_obj_focus_get(&focus)); - EO_DBG_INFO_BOOLEAN_APPEND(group, "Has focus", focus); + EO_DBG_INFO_APPEND(group, "Has focus", EINA_VALUE_TYPE_CHAR, focus); unsigned int m; eo_do(eo_obj, evas_obj_pointer_mode_get(&m)); @@ -1939,21 +1939,21 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) text = "EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN"; if (text) - EO_DBG_INFO_TEXT_APPEND(group, "Pointer Mode", text); + EO_DBG_INFO_APPEND(group, "Pointer Mode", EINA_VALUE_TYPE_STRING, text); Eina_Bool event; eo_do(eo_obj, evas_obj_pass_events_get(&event)); - EO_DBG_INFO_BOOLEAN_APPEND(group, "Pass Events", event); + EO_DBG_INFO_APPEND(group, "Pass Events", EINA_VALUE_TYPE_CHAR, event); eo_do(eo_obj, evas_obj_repeat_events_get(&event)); - EO_DBG_INFO_BOOLEAN_APPEND(group, "Repeat Events", event); + EO_DBG_INFO_APPEND(group, "Repeat Events", EINA_VALUE_TYPE_CHAR, event); eo_do(eo_obj, evas_obj_propagate_events_get(&event)); - EO_DBG_INFO_BOOLEAN_APPEND(group, "Propagate Events", event); + EO_DBG_INFO_APPEND(group, "Propagate Events", EINA_VALUE_TYPE_CHAR, event); const Eina_List *clipees; eo_do(eo_obj, evas_obj_clipees_get(&clipees)); - EO_DBG_INFO_BOOLEAN_APPEND(group, "Has clipees", (Eina_Bool) (!!clipees)); + EO_DBG_INFO_APPEND(group, "Has clipees", EINA_VALUE_TYPE_CHAR, (Eina_Bool) (!!clipees)); const Evas_Map *map = evas_object_map_get(eo_obj); if (map) @@ -1965,9 +1965,9 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) Evas_Coord px, py, pz; evas_map_point_coord_get(map, i, &px, &py, &pz); Eo_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(node, "Coords"); - EO_DBG_INFO_INTEGER_APPEND(point, "x", px); - EO_DBG_INFO_INTEGER_APPEND(point, "y", py); - EO_DBG_INFO_INTEGER_APPEND(point, "z", pz); + EO_DBG_INFO_APPEND(point, "x", EINA_VALUE_TYPE_INT, px); + EO_DBG_INFO_APPEND(point, "y", EINA_VALUE_TYPE_INT, py); + EO_DBG_INFO_APPEND(point, "z", EINA_VALUE_TYPE_INT, pz); } } } diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index a0394e80d7..4806c9795d 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -953,14 +953,14 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) const char *text; int size; eo_do(eo_obj, evas_obj_text_font_get(&text, &size)); - EO_DBG_INFO_TEXT_APPEND(group, "Font", text); - EO_DBG_INFO_INTEGER_APPEND(group, "Text size", size); + EO_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text); + EO_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size); eo_do(eo_obj, evas_obj_text_font_source_get(&text)); - EO_DBG_INFO_TEXT_APPEND(group, "Font source", text); + EO_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text); eo_do(eo_obj, evas_obj_text_text_get(&text)); - EO_DBG_INFO_TEXT_APPEND(group, "Text", text); + EO_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, text); } EAPI void diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 64d333c49d..6ca1c2b3cf 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -10038,8 +10038,8 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) if (shorttext[37]) strcpy(shorttext + 37, "\xe2\x80\xa6"); /* HORIZONTAL ELLIPSIS */ - EO_DBG_INFO_TEXT_APPEND(group, "Style", style); - EO_DBG_INFO_TEXT_APPEND(group, "Text", shorttext); + EO_DBG_INFO_APPEND(group, "Style", EINA_VALUE_TYPE_STRING, style); + EO_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, shorttext); } /** @internal