diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/edje/src/bin | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to 'libraries/edje/src/bin')
-rw-r--r-- | libraries/edje/src/bin/Makefile.in | 2 | ||||
-rw-r--r-- | libraries/edje/src/bin/edje_cc.h | 1 | ||||
-rw-r--r-- | libraries/edje/src/bin/edje_cc_handlers.c | 129 | ||||
-rw-r--r-- | libraries/edje/src/bin/edje_cc_out.c | 35 | ||||
-rw-r--r-- | libraries/edje/src/bin/edje_cc_parse.c | 6 | ||||
-rw-r--r-- | libraries/edje/src/bin/edje_decc.c | 3 | ||||
-rw-r--r-- | libraries/edje/src/bin/edje_inspector.c | 202 | ||||
-rw-r--r-- | libraries/edje/src/bin/edje_multisense_convert.c | 2 | ||||
-rw-r--r-- | libraries/edje/src/bin/epp/Makefile.in | 2 | ||||
-rw-r--r-- | libraries/edje/src/bin/epp/cppmain.c | 13 |
10 files changed, 210 insertions, 185 deletions
diff --git a/libraries/edje/src/bin/Makefile.in b/libraries/edje/src/bin/Makefile.in index 877bcb2..07bf025 100644 --- a/libraries/edje/src/bin/Makefile.in +++ b/libraries/edje/src/bin/Makefile.in | |||
@@ -291,8 +291,6 @@ PACKAGE_URL = @PACKAGE_URL@ | |||
291 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 291 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
292 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 292 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
293 | PKG_CONFIG = @PKG_CONFIG@ | 293 | PKG_CONFIG = @PKG_CONFIG@ |
294 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
295 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
296 | PYTHON = @PYTHON@ | 294 | PYTHON = @PYTHON@ |
297 | PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ | 295 | PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ |
298 | PYTHON_PLATFORM = @PYTHON_PLATFORM@ | 296 | PYTHON_PLATFORM = @PYTHON_PLATFORM@ |
diff --git a/libraries/edje/src/bin/edje_cc.h b/libraries/edje/src/bin/edje_cc.h index bcd31a1..d0c6d22 100644 --- a/libraries/edje/src/bin/edje_cc.h +++ b/libraries/edje/src/bin/edje_cc.h | |||
@@ -138,6 +138,7 @@ struct _Edje_Part_Parser | |||
138 | /* global fn calls */ | 138 | /* global fn calls */ |
139 | void data_setup(void); | 139 | void data_setup(void); |
140 | void data_write(void); | 140 | void data_write(void); |
141 | void data_queue_group_lookup(const char *name, Edje_Part *part); | ||
141 | void data_queue_part_lookup(Edje_Part_Collection *pc, const char *name, int *dest); | 142 | void data_queue_part_lookup(Edje_Part_Collection *pc, const char *name, int *dest); |
142 | void data_queue_copied_part_lookup(Edje_Part_Collection *pc, int *src, int *dest); | 143 | void data_queue_copied_part_lookup(Edje_Part_Collection *pc, int *src, int *dest); |
143 | void data_queue_program_lookup(Edje_Part_Collection *pc, const char *name, int *dest); | 144 | void data_queue_program_lookup(Edje_Part_Collection *pc, const char *name, int *dest); |
diff --git a/libraries/edje/src/bin/edje_cc_handlers.c b/libraries/edje/src/bin/edje_cc_handlers.c index 8bfc262..f74fa12 100644 --- a/libraries/edje/src/bin/edje_cc_handlers.c +++ b/libraries/edje/src/bin/edje_cc_handlers.c | |||
@@ -172,6 +172,7 @@ static void st_collections_group_parts_part_description_visible(void); | |||
172 | static void st_collections_group_parts_part_description_align(void); | 172 | static void st_collections_group_parts_part_description_align(void); |
173 | static void st_collections_group_parts_part_description_fixed(void); | 173 | static void st_collections_group_parts_part_description_fixed(void); |
174 | static void st_collections_group_parts_part_description_min(void); | 174 | static void st_collections_group_parts_part_description_min(void); |
175 | static void st_collections_group_parts_part_description_minmul(void); | ||
175 | static void st_collections_group_parts_part_description_max(void); | 176 | static void st_collections_group_parts_part_description_max(void); |
176 | static void st_collections_group_parts_part_description_step(void); | 177 | static void st_collections_group_parts_part_description_step(void); |
177 | static void st_collections_group_parts_part_description_aspect(void); | 178 | static void st_collections_group_parts_part_description_aspect(void); |
@@ -261,12 +262,9 @@ static void st_collections_group_programs_program_after(void); | |||
261 | static void st_collections_group_programs_program_api(void); | 262 | static void st_collections_group_programs_program_api(void); |
262 | 263 | ||
263 | static void ob_collections_group_programs_program_script(void); | 264 | static void ob_collections_group_programs_program_script(void); |
264 | |||
265 | #ifdef ENABLE_MULTISENSE | ||
266 | static void st_collections_group_sound_sample_name(void); | 265 | static void st_collections_group_sound_sample_name(void); |
267 | static void st_collections_group_sound_sample_source(void); | 266 | static void st_collections_group_sound_sample_source(void); |
268 | static void st_collections_group_sound_tone(void); | 267 | static void st_collections_group_sound_tone(void); |
269 | #endif | ||
270 | 268 | ||
271 | /*****/ | 269 | /*****/ |
272 | 270 | ||
@@ -305,14 +303,13 @@ New_Statement_Handler statement_handlers[] = | |||
305 | {"collections.color_classes.color_class.color", st_color_class_color}, /* dup */ | 303 | {"collections.color_classes.color_class.color", st_color_class_color}, /* dup */ |
306 | {"collections.color_classes.color_class.color2", st_color_class_color2}, /* dup */ | 304 | {"collections.color_classes.color_class.color2", st_color_class_color2}, /* dup */ |
307 | {"collections.color_classes.color_class.color3", st_color_class_color3}, /* dup */ | 305 | {"collections.color_classes.color_class.color3", st_color_class_color3}, /* dup */ |
308 | #ifdef ENABLE_MULTISENSE | 306 | |
309 | {"collections.sounds.sample.name", st_collections_group_sound_sample_name}, | 307 | {"collections.sounds.sample.name", st_collections_group_sound_sample_name}, |
310 | {"collections.sounds.sample.source", st_collections_group_sound_sample_source}, | 308 | {"collections.sounds.sample.source", st_collections_group_sound_sample_source}, |
311 | {"collections.group.sounds.sample.name", st_collections_group_sound_sample_name}, /* dup */ | 309 | {"collections.group.sounds.sample.name", st_collections_group_sound_sample_name}, /* dup */ |
312 | {"collections.group.sounds.sample.source", st_collections_group_sound_sample_source}, /* dup */ | 310 | {"collections.group.sounds.sample.source", st_collections_group_sound_sample_source}, /* dup */ |
313 | {"collections.sounds.tone", st_collections_group_sound_tone}, | 311 | {"collections.sounds.tone", st_collections_group_sound_tone}, |
314 | {"collections.group.sounds.tone", st_collections_group_sound_tone}, /* dup */ | 312 | {"collections.group.sounds.tone", st_collections_group_sound_tone}, /* dup */ |
315 | #endif | ||
316 | {"collections.group.name", st_collections_group_name}, | 313 | {"collections.group.name", st_collections_group_name}, |
317 | {"collections.group.inherit", st_collections_group_inherit}, | 314 | {"collections.group.inherit", st_collections_group_inherit}, |
318 | {"collections.group.script_only", st_collections_group_script_only}, | 315 | {"collections.group.script_only", st_collections_group_script_only}, |
@@ -438,6 +435,7 @@ New_Statement_Handler statement_handlers[] = | |||
438 | {"collections.group.parts.part.description.align", st_collections_group_parts_part_description_align}, | 435 | {"collections.group.parts.part.description.align", st_collections_group_parts_part_description_align}, |
439 | {"collections.group.parts.part.description.fixed", st_collections_group_parts_part_description_fixed}, | 436 | {"collections.group.parts.part.description.fixed", st_collections_group_parts_part_description_fixed}, |
440 | {"collections.group.parts.part.description.min", st_collections_group_parts_part_description_min}, | 437 | {"collections.group.parts.part.description.min", st_collections_group_parts_part_description_min}, |
438 | {"collections.group.parts.part.description.minmul", st_collections_group_parts_part_description_minmul}, | ||
441 | {"collections.group.parts.part.description.max", st_collections_group_parts_part_description_max}, | 439 | {"collections.group.parts.part.description.max", st_collections_group_parts_part_description_max}, |
442 | {"collections.group.parts.part.description.step", st_collections_group_parts_part_description_step}, | 440 | {"collections.group.parts.part.description.step", st_collections_group_parts_part_description_step}, |
443 | {"collections.group.parts.part.description.aspect", st_collections_group_parts_part_description_aspect}, | 441 | {"collections.group.parts.part.description.aspect", st_collections_group_parts_part_description_aspect}, |
@@ -677,14 +675,13 @@ New_Object_Handler object_handlers[] = | |||
677 | {"collections.styles.style", ob_styles_style}, /* dup */ | 675 | {"collections.styles.style", ob_styles_style}, /* dup */ |
678 | {"collections.color_classes", NULL}, /* dup */ | 676 | {"collections.color_classes", NULL}, /* dup */ |
679 | {"collections.color_classes.color_class", ob_color_class}, /* dup */ | 677 | {"collections.color_classes.color_class", ob_color_class}, /* dup */ |
680 | #ifdef ENABLE_MULTISENSE | ||
681 | {"collections.sounds", NULL}, | 678 | {"collections.sounds", NULL}, |
682 | {"collections.group.sounds", NULL}, /* dup */ | 679 | {"collections.group.sounds", NULL}, /* dup */ |
683 | {"collections.sounds.sample", NULL}, | 680 | {"collections.sounds.sample", NULL}, |
684 | {"collections.group.sounds.sample", NULL}, /* dup */ | 681 | {"collections.group.sounds.sample", NULL}, /* dup */ |
685 | #endif | ||
686 | {"collections.group", ob_collections_group}, | 682 | {"collections.group", ob_collections_group}, |
687 | {"collections.group.data", NULL}, | 683 | {"collections.group.data", NULL}, |
684 | {"collections.group.limits", NULL}, | ||
688 | {"collections.group.script", ob_collections_group_script}, | 685 | {"collections.group.script", ob_collections_group_script}, |
689 | {"collections.group.lua_script", ob_collections_group_lua_script}, | 686 | {"collections.group.lua_script", ob_collections_group_lua_script}, |
690 | {"collections.group.externals", NULL}, /* dup */ | 687 | {"collections.group.externals", NULL}, /* dup */ |
@@ -1836,12 +1833,6 @@ st_styles_style_tag(void) | |||
1836 | stl->tags = eina_list_append(stl->tags, tag); | 1833 | stl->tags = eina_list_append(stl->tags, tag); |
1837 | } | 1834 | } |
1838 | 1835 | ||
1839 | #ifdef ENABLE_MULTISENSE | ||
1840 | /* add to below doc | ||
1841 | sounds { } | ||
1842 | */ | ||
1843 | #endif | ||
1844 | |||
1845 | /** | 1836 | /** |
1846 | @page edcref | 1837 | @page edcref |
1847 | @block | 1838 | @block |
@@ -1851,6 +1842,7 @@ sounds { } | |||
1851 | .. | 1842 | .. |
1852 | group { } | 1843 | group { } |
1853 | group { } | 1844 | group { } |
1845 | sounds { } | ||
1854 | .. | 1846 | .. |
1855 | } | 1847 | } |
1856 | @description | 1848 | @description |
@@ -1866,8 +1858,7 @@ ob_collections(void) | |||
1866 | edje_file->collection = eina_hash_string_small_new(NULL); | 1858 | edje_file->collection = eina_hash_string_small_new(NULL); |
1867 | } | 1859 | } |
1868 | 1860 | ||
1869 | #ifdef ENABLE_MULTISENSE | 1861 | /** |
1870 | /* * delete space before * | ||
1871 | @page edcref | 1862 | @page edcref |
1872 | @block | 1863 | @block |
1873 | sounds | 1864 | sounds |
@@ -1980,7 +1971,7 @@ st_collections_group_sound_sample_name(void) | |||
1980 | 1971 | ||
1981 | } | 1972 | } |
1982 | 1973 | ||
1983 | /* * delete space before * | 1974 | /** |
1984 | @page edcref | 1975 | @page edcref |
1985 | @property | 1976 | @property |
1986 | source | 1977 | source |
@@ -2016,7 +2007,7 @@ st_collections_group_sound_sample_source(void) | |||
2016 | check_arg_count(1); | 2007 | check_arg_count(1); |
2017 | } | 2008 | } |
2018 | 2009 | ||
2019 | /* * delete space before * | 2010 | /** |
2020 | @page edcref | 2011 | @page edcref |
2021 | @property | 2012 | @property |
2022 | tone | 2013 | tone |
@@ -2079,7 +2070,6 @@ st_collections_group_sound_tone(void) | |||
2079 | tone->value = value; | 2070 | tone->value = value; |
2080 | tone->id = edje_file->sound_dir->tones_count - 1; | 2071 | tone->id = edje_file->sound_dir->tones_count - 1; |
2081 | } | 2072 | } |
2082 | #endif | ||
2083 | 2073 | ||
2084 | /** | 2074 | /** |
2085 | @edcsection{group,Group sub blocks} | 2075 | @edcsection{group,Group sub blocks} |
@@ -2677,14 +2667,14 @@ st_collections_group_orientation(void) | |||
2677 | @block | 2667 | @block |
2678 | limits | 2668 | limits |
2679 | @context | 2669 | @context |
2680 | group { | 2670 | group { |
2681 | limits { | 2671 | limits { |
2682 | vertical: "limit_name" height_barrier; | 2672 | vertical: "limit_name" height_barrier; |
2683 | horizontal: "limit_name" width_barrier; | 2673 | horizontal: "limit_name" width_barrier; |
2684 | .. | 2674 | .. |
2685 | } | 2675 | } |
2686 | .. | 2676 | .. |
2687 | } | 2677 | } |
2688 | .. | 2678 | .. |
2689 | @description | 2679 | @description |
2690 | This block is used to trigger some signal when the Edje object is resized. | 2680 | This block is used to trigger some signal when the Edje object is resized. |
@@ -2696,10 +2686,10 @@ st_collections_group_orientation(void) | |||
2696 | @parameters | 2686 | @parameters |
2697 | [name] [height barrier] | 2687 | [name] [height barrier] |
2698 | @effect | 2688 | @effect |
2699 | It will send a signal: "limit,name,over" when the object is resized and pass | 2689 | It will send a signal: "limit,name,over" when the object is resized and pass |
2700 | the limit by growing over it. And it will send: "limit,name,below" when | 2690 | the limit by growing over it. And it will send: "limit,name,below" when |
2701 | it pass below that limit. | 2691 | it pass below that limit. |
2702 | This limit will be applied on the y absis. | 2692 | This limit will be applied on the y absis and is expressed in pixels. |
2703 | @endproperty | 2693 | @endproperty |
2704 | */ | 2694 | */ |
2705 | static void | 2695 | static void |
@@ -2734,10 +2724,10 @@ st_collections_group_limits_vertical(void) | |||
2734 | @parameters | 2724 | @parameters |
2735 | [name] [width barrier] | 2725 | [name] [width barrier] |
2736 | @effect | 2726 | @effect |
2737 | It will send a signal: "limit,name,over" when the object is resized and pass | 2727 | It will send a signal: "limit,name,over" when the object is resized and pass |
2738 | the limit by growing over it. And it will send: "limit,name,below" when | 2728 | the limit by growing over it. And it will send: "limit,name,below" when |
2739 | it pass below that limit. | 2729 | it pass below that limit. |
2740 | This limit will be applied on the x absis. | 2730 | This limit will be applied on the x absis and is expressed in pixels. |
2741 | @endproperty | 2731 | @endproperty |
2742 | */ | 2732 | */ |
2743 | static void | 2733 | static void |
@@ -3224,6 +3214,7 @@ st_collections_group_parts_part_source(void) | |||
3224 | 3214 | ||
3225 | //FIXME: validate this somehow (need to decide on the format also) | 3215 | //FIXME: validate this somehow (need to decide on the format also) |
3226 | current_part->source = parse_str(0); | 3216 | current_part->source = parse_str(0); |
3217 | data_queue_group_lookup(current_part->source, current_part); | ||
3227 | } | 3218 | } |
3228 | 3219 | ||
3229 | /** | 3220 | /** |
@@ -3245,6 +3236,7 @@ st_collections_group_parts_part_source2(void) | |||
3245 | 3236 | ||
3246 | //FIXME: validate this somehow (need to decide on the format also) | 3237 | //FIXME: validate this somehow (need to decide on the format also) |
3247 | current_part->source2 = parse_str(0); | 3238 | current_part->source2 = parse_str(0); |
3239 | data_queue_group_lookup(current_part->source2, current_part); | ||
3248 | } | 3240 | } |
3249 | 3241 | ||
3250 | /** | 3242 | /** |
@@ -3266,6 +3258,7 @@ st_collections_group_parts_part_source3(void) | |||
3266 | 3258 | ||
3267 | //FIXME: validate this somehow (need to decide on the format also) | 3259 | //FIXME: validate this somehow (need to decide on the format also) |
3268 | current_part->source3 = parse_str(0); | 3260 | current_part->source3 = parse_str(0); |
3261 | data_queue_group_lookup(current_part->source3, current_part); | ||
3269 | } | 3262 | } |
3270 | 3263 | ||
3271 | /** | 3264 | /** |
@@ -3287,6 +3280,7 @@ st_collections_group_parts_part_source4(void) | |||
3287 | 3280 | ||
3288 | //FIXME: validate this somehow (need to decide on the format also) | 3281 | //FIXME: validate this somehow (need to decide on the format also) |
3289 | current_part->source4 = parse_str(0); | 3282 | current_part->source4 = parse_str(0); |
3283 | data_queue_group_lookup(current_part->source4, current_part); | ||
3290 | } | 3284 | } |
3291 | 3285 | ||
3292 | /** | 3286 | /** |
@@ -3308,6 +3302,7 @@ st_collections_group_parts_part_source5(void) | |||
3308 | 3302 | ||
3309 | //FIXME: validate this somehow (need to decide on the format also) | 3303 | //FIXME: validate this somehow (need to decide on the format also) |
3310 | current_part->source5 = parse_str(0); | 3304 | current_part->source5 = parse_str(0); |
3305 | data_queue_group_lookup(current_part->source5, current_part); | ||
3311 | } | 3306 | } |
3312 | 3307 | ||
3313 | /** | 3308 | /** |
@@ -3329,6 +3324,7 @@ st_collections_group_parts_part_source6(void) | |||
3329 | 3324 | ||
3330 | //FIXME: validate this somehow (need to decide on the format also) | 3325 | //FIXME: validate this somehow (need to decide on the format also) |
3331 | current_part->source6 = parse_str(0); | 3326 | current_part->source6 = parse_str(0); |
3327 | data_queue_group_lookup(current_part->source6, current_part); | ||
3332 | } | 3328 | } |
3333 | 3329 | ||
3334 | /** | 3330 | /** |
@@ -3439,10 +3435,9 @@ st_collections_group_parts_part_entry_mode(void) | |||
3439 | [MODE] | 3435 | [MODE] |
3440 | @effect | 3436 | @effect |
3441 | Sets the selection mode for a textblock part to one of: | 3437 | Sets the selection mode for a textblock part to one of: |
3442 | @li DEFAULT | 3438 | @li DEFAULT selection mode is what you would expect on any desktop. Press |
3443 | @li EXPLICIT | 3439 | mouse, drag and release to end. |
3444 | DEFAULT selection mode is what you would expect on any desktop. Press | 3440 | @li EXPLICITmode requires the application |
3445 | mouse, drag and release to end. EXPLICIT mode requires the application | ||
3446 | controlling the edje object has to explicitly begin and end selection | 3441 | controlling the edje object has to explicitly begin and end selection |
3447 | modes, and the selection itself is dragable at both ends. | 3442 | modes, and the selection itself is dragable at both ends. |
3448 | @endproperty | 3443 | @endproperty |
@@ -3466,11 +3461,9 @@ st_collections_group_parts_part_select_mode(void) | |||
3466 | [MODE] | 3461 | [MODE] |
3467 | @effect | 3462 | @effect |
3468 | Sets the cursor mode for a textblock part to one of: | 3463 | Sets the cursor mode for a textblock part to one of: |
3469 | @li UNDER | 3464 | @li UNDER cursor mode means the cursor will draw below the character pointed |
3470 | @li BEFORE | ||
3471 | UNDER cursor mode means the cursor will draw below the character pointed | ||
3472 | at. That's the default. | 3465 | at. That's the default. |
3473 | BEFORE cursor mode means the cursor is drawn as a vertical line before | 3466 | @li BEFORE cursor mode means the cursor is drawn as a vertical line before |
3474 | the current character, just like many other GUI toolkits handle it. | 3467 | the current character, just like many other GUI toolkits handle it. |
3475 | @endproperty | 3468 | @endproperty |
3476 | */ | 3469 | */ |
@@ -3816,6 +3809,7 @@ static void st_collections_group_parts_part_box_items_item_source(void) | |||
3816 | check_arg_count(1); | 3809 | check_arg_count(1); |
3817 | 3810 | ||
3818 | current_item->source = parse_str(0); | 3811 | current_item->source = parse_str(0); |
3812 | data_queue_group_lookup(current_item->source, current_part); | ||
3819 | } | 3813 | } |
3820 | 3814 | ||
3821 | /** | 3815 | /** |
@@ -4140,6 +4134,9 @@ ob_collections_group_parts_part_description(void) | |||
4140 | ed->map.persp_on = 0; | 4134 | ed->map.persp_on = 0; |
4141 | ed->persp.zplane = 0; | 4135 | ed->persp.zplane = 0; |
4142 | ed->persp.focal = 1000; | 4136 | ed->persp.focal = 1000; |
4137 | ed->minmul.have = 1; | ||
4138 | ed->minmul.w = FROM_INT(1); | ||
4139 | ed->minmul.h = FROM_INT(1); | ||
4143 | } | 4140 | } |
4144 | 4141 | ||
4145 | /** | 4142 | /** |
@@ -4558,6 +4555,27 @@ st_collections_group_parts_part_description_min(void) | |||
4558 | /** | 4555 | /** |
4559 | @page edcref | 4556 | @page edcref |
4560 | @property | 4557 | @property |
4558 | minmul | ||
4559 | @parameters | ||
4560 | [width multipler] [height multiplier] | ||
4561 | @effect | ||
4562 | A multiplier FORCIBLY applied to whatever minimum size is only during | ||
4563 | minimum size calculation. | ||
4564 | @endproperty | ||
4565 | @since 1.2 | ||
4566 | */ | ||
4567 | static void | ||
4568 | st_collections_group_parts_part_description_minmul(void) | ||
4569 | { | ||
4570 | check_arg_count(2); | ||
4571 | |||
4572 | current_desc->minmul.w = FROM_DOUBLE(parse_float_range(0, 0, 999999)); | ||
4573 | current_desc->minmul.h = FROM_DOUBLE(parse_float_range(1, 0, 999999)); | ||
4574 | } | ||
4575 | |||
4576 | /** | ||
4577 | @page edcref | ||
4578 | @property | ||
4561 | max | 4579 | max |
4562 | @parameters | 4580 | @parameters |
4563 | [width] [height] | 4581 | [width] [height] |
@@ -4605,7 +4623,7 @@ st_collections_group_parts_part_description_step(void) | |||
4605 | Normally width and height can be resized to any values independently. | 4623 | Normally width and height can be resized to any values independently. |
4606 | The aspect property forces the width to height ratio to be kept between | 4624 | The aspect property forces the width to height ratio to be kept between |
4607 | the minimum and maximum set. For example, "1.0 1.0" will increase the | 4625 | the minimum and maximum set. For example, "1.0 1.0" will increase the |
4608 | width a pixel for every pixel added to heigh. The default value is | 4626 | width a pixel for every pixel added to height. The default value is |
4609 | "0.0 0.0" disabling aspect. | 4627 | "0.0 0.0" disabling aspect. |
4610 | @endproperty | 4628 | @endproperty |
4611 | */ | 4629 | */ |
@@ -4626,7 +4644,7 @@ st_collections_group_parts_part_description_aspect(void) | |||
4626 | [DIMENSION] | 4644 | [DIMENSION] |
4627 | @effect | 4645 | @effect |
4628 | Sets the scope of the "aspect" property to a given dimension. Available | 4646 | Sets the scope of the "aspect" property to a given dimension. Available |
4629 | options are BOTH, VERTICAL, HORIZONTAL and NONE | 4647 | options are BOTH, VERTICAL, HORIZONTAL, SOURCE and NONE |
4630 | @endproperty | 4648 | @endproperty |
4631 | */ | 4649 | */ |
4632 | static void | 4650 | static void |
@@ -4639,6 +4657,7 @@ st_collections_group_parts_part_description_aspect_preference(void) | |||
4639 | "VERTICAL", EDJE_ASPECT_PREFER_VERTICAL, | 4657 | "VERTICAL", EDJE_ASPECT_PREFER_VERTICAL, |
4640 | "HORIZONTAL", EDJE_ASPECT_PREFER_HORIZONTAL, | 4658 | "HORIZONTAL", EDJE_ASPECT_PREFER_HORIZONTAL, |
4641 | "BOTH", EDJE_ASPECT_PREFER_BOTH, | 4659 | "BOTH", EDJE_ASPECT_PREFER_BOTH, |
4660 | "SOURCE", EDJE_ASPECT_PREFER_SOURCE, | ||
4642 | NULL); | 4661 | NULL); |
4643 | } | 4662 | } |
4644 | 4663 | ||
@@ -7236,15 +7255,6 @@ st_collections_group_programs_program_in(void) | |||
7236 | current_program->in.range = parse_float_range(1, 0.0, 999999999.0); | 7255 | current_program->in.range = parse_float_range(1, 0.0, 999999999.0); |
7237 | } | 7256 | } |
7238 | 7257 | ||
7239 | #ifdef ENABLE_MULTISENSE | ||
7240 | /* add to docs below | ||
7241 | , PLAY_SAMPLE, PLAY_TONE | ||
7242 | |||
7243 | action: PLAY_SAMPLE "sample name";\n | ||
7244 | action: PLAY_TONE "tone name" duration in seconds ( Range 0.1 to 10.0 );\n | ||
7245 | */ | ||
7246 | #endif | ||
7247 | |||
7248 | /** | 7258 | /** |
7249 | @page edcref | 7259 | @page edcref |
7250 | @property | 7260 | @property |
@@ -7254,7 +7264,7 @@ st_collections_group_programs_program_in(void) | |||
7254 | @effect | 7264 | @effect |
7255 | Action to be performed by the program. Valid actions are: STATE_SET, | 7265 | Action to be performed by the program. Valid actions are: STATE_SET, |
7256 | ACTION_STOP, SIGNAL_EMIT, DRAG_VAL_SET, DRAG_VAL_STEP, DRAG_VAL_PAGE, | 7266 | ACTION_STOP, SIGNAL_EMIT, DRAG_VAL_SET, DRAG_VAL_STEP, DRAG_VAL_PAGE, |
7257 | FOCUS_SET, PARAM_COPY, PARAM_SET | 7267 | FOCUS_SET, PARAM_COPY, PARAM_SET, PLAY_SAMPLE, PLAY_TONE |
7258 | Only one action can be specified per program. Examples:\n | 7268 | Only one action can be specified per program. Examples:\n |
7259 | action: STATE_SET "statename" 0.5;\n | 7269 | action: STATE_SET "statename" 0.5;\n |
7260 | action: ACTION_STOP;\n | 7270 | action: ACTION_STOP;\n |
@@ -7266,6 +7276,8 @@ st_collections_group_programs_program_in(void) | |||
7266 | action: FOCUS_OBJECT;\n | 7276 | action: FOCUS_OBJECT;\n |
7267 | action: PARAM_COPY "src_part" "src_param" "dst_part" "dst_param";\n | 7277 | action: PARAM_COPY "src_part" "src_param" "dst_part" "dst_param";\n |
7268 | action: PARAM_SET "part" "param" "value";\n | 7278 | action: PARAM_SET "part" "param" "value";\n |
7279 | action: PLAY_SAMPLE "sample name";\n | ||
7280 | action: PLAY_TONE "tone name" duration in seconds ( Range 0.1 to 10.0 );\n | ||
7269 | @endproperty | 7281 | @endproperty |
7270 | */ | 7282 | */ |
7271 | static void | 7283 | static void |
@@ -7273,6 +7285,7 @@ st_collections_group_programs_program_action(void) | |||
7273 | { | 7285 | { |
7274 | Edje_Part_Collection *pc; | 7286 | Edje_Part_Collection *pc; |
7275 | Edje_Program *ep; | 7287 | Edje_Program *ep; |
7288 | int i; | ||
7276 | 7289 | ||
7277 | pc = eina_list_data_get(eina_list_last(edje_collections)); | 7290 | pc = eina_list_data_get(eina_list_last(edje_collections)); |
7278 | ep = current_program; | 7291 | ep = current_program; |
@@ -7288,10 +7301,8 @@ st_collections_group_programs_program_action(void) | |||
7288 | "FOCUS_OBJECT", EDJE_ACTION_TYPE_FOCUS_OBJECT, | 7301 | "FOCUS_OBJECT", EDJE_ACTION_TYPE_FOCUS_OBJECT, |
7289 | "PARAM_COPY", EDJE_ACTION_TYPE_PARAM_COPY, | 7302 | "PARAM_COPY", EDJE_ACTION_TYPE_PARAM_COPY, |
7290 | "PARAM_SET", EDJE_ACTION_TYPE_PARAM_SET, | 7303 | "PARAM_SET", EDJE_ACTION_TYPE_PARAM_SET, |
7291 | #ifdef ENABLE_MULTISENSE | ||
7292 | "PLAY_SAMPLE", EDJE_ACTION_TYPE_SOUND_SAMPLE, | 7304 | "PLAY_SAMPLE", EDJE_ACTION_TYPE_SOUND_SAMPLE, |
7293 | "PLAY_TONE", EDJE_ACTION_TYPE_SOUND_TONE, | 7305 | "PLAY_TONE", EDJE_ACTION_TYPE_SOUND_TONE, |
7294 | #endif | ||
7295 | NULL); | 7306 | NULL); |
7296 | if (ep->action == EDJE_ACTION_TYPE_STATE_SET) | 7307 | if (ep->action == EDJE_ACTION_TYPE_STATE_SET) |
7297 | { | 7308 | { |
@@ -7303,11 +7314,8 @@ st_collections_group_programs_program_action(void) | |||
7303 | ep->state = parse_str(1); | 7314 | ep->state = parse_str(1); |
7304 | ep->state2 = parse_str(2); | 7315 | ep->state2 = parse_str(2); |
7305 | } | 7316 | } |
7306 | #ifdef ENABLE_MULTISENSE | ||
7307 | else if (ep->action == EDJE_ACTION_TYPE_SOUND_SAMPLE) | 7317 | else if (ep->action == EDJE_ACTION_TYPE_SOUND_SAMPLE) |
7308 | { | 7318 | { |
7309 | int i; | ||
7310 | |||
7311 | ep->sample_name = parse_str(1); | 7319 | ep->sample_name = parse_str(1); |
7312 | for (i = 0; i < (int)edje_file->sound_dir->samples_count; i++) | 7320 | for (i = 0; i < (int)edje_file->sound_dir->samples_count; i++) |
7313 | { | 7321 | { |
@@ -7324,8 +7332,6 @@ st_collections_group_programs_program_action(void) | |||
7324 | } | 7332 | } |
7325 | else if (ep->action == EDJE_ACTION_TYPE_SOUND_TONE) | 7333 | else if (ep->action == EDJE_ACTION_TYPE_SOUND_TONE) |
7326 | { | 7334 | { |
7327 | int i; | ||
7328 | |||
7329 | ep->tone_name = parse_str(1); | 7335 | ep->tone_name = parse_str(1); |
7330 | for (i = 0; i < (int)edje_file->sound_dir->tones_count; i++) | 7336 | for (i = 0; i < (int)edje_file->sound_dir->tones_count; i++) |
7331 | { | 7337 | { |
@@ -7340,7 +7346,6 @@ st_collections_group_programs_program_action(void) | |||
7340 | } | 7346 | } |
7341 | ep->duration = parse_float_range(2, 0.1, 10.0); | 7347 | ep->duration = parse_float_range(2, 0.1, 10.0); |
7342 | } | 7348 | } |
7343 | #endif | ||
7344 | else if (ep->action == EDJE_ACTION_TYPE_DRAG_VAL_SET) | 7349 | else if (ep->action == EDJE_ACTION_TYPE_DRAG_VAL_SET) |
7345 | { | 7350 | { |
7346 | ep->value = parse_float(1); | 7351 | ep->value = parse_float(1); |
@@ -7402,14 +7407,12 @@ st_collections_group_programs_program_action(void) | |||
7402 | case EDJE_ACTION_TYPE_PARAM_SET: | 7407 | case EDJE_ACTION_TYPE_PARAM_SET: |
7403 | check_arg_count(4); | 7408 | check_arg_count(4); |
7404 | break; | 7409 | break; |
7405 | #ifdef ENABLE_MULTISENSE | ||
7406 | case EDJE_ACTION_TYPE_SOUND_SAMPLE: | 7410 | case EDJE_ACTION_TYPE_SOUND_SAMPLE: |
7407 | check_arg_count(3); | 7411 | check_arg_count(3); |
7408 | break; | 7412 | break; |
7409 | case EDJE_ACTION_TYPE_SOUND_TONE: | 7413 | case EDJE_ACTION_TYPE_SOUND_TONE: |
7410 | check_arg_count(3); | 7414 | check_arg_count(3); |
7411 | break; | 7415 | break; |
7412 | #endif | ||
7413 | default: | 7416 | default: |
7414 | check_arg_count(3); | 7417 | check_arg_count(3); |
7415 | } | 7418 | } |
diff --git a/libraries/edje/src/bin/edje_cc_out.c b/libraries/edje/src/bin/edje_cc_out.c index 443a702..5050ad4 100644 --- a/libraries/edje/src/bin/edje_cc_out.c +++ b/libraries/edje/src/bin/edje_cc_out.c | |||
@@ -72,6 +72,7 @@ struct _Program_Lookup | |||
72 | struct _Group_Lookup | 72 | struct _Group_Lookup |
73 | { | 73 | { |
74 | char *name; | 74 | char *name; |
75 | Edje_Part *part; | ||
75 | }; | 76 | }; |
76 | 77 | ||
77 | struct _String_Lookup | 78 | struct _String_Lookup |
@@ -808,8 +809,8 @@ data_write_groups(Eet_File *ef, int *collection_num) | |||
808 | 809 | ||
809 | if (verbose) | 810 | if (verbose) |
810 | { | 811 | { |
811 | printf("%s: Wrote %9i bytes (%4iKb) for \"%s\" collection entry\n", | 812 | printf("%s: Wrote %9i bytes (%4iKb) for \"%s\" aka \"%s\" collection entry\n", |
812 | progname, bytes, (bytes + 512) / 1024, buf); | 813 | progname, bytes, (bytes + 512) / 1024, buf, pc->part); |
813 | } | 814 | } |
814 | } | 815 | } |
815 | 816 | ||
@@ -1371,13 +1372,16 @@ reorder_parts(void) | |||
1371 | } | 1372 | } |
1372 | 1373 | ||
1373 | void | 1374 | void |
1374 | data_queue_group_lookup(char *name) | 1375 | data_queue_group_lookup(const char *name, Edje_Part *part) |
1375 | { | 1376 | { |
1376 | Group_Lookup *gl; | 1377 | Group_Lookup *gl; |
1377 | 1378 | ||
1379 | if (!name || !name[0]) return; | ||
1380 | |||
1378 | gl = mem_alloc(SZ(Group_Lookup)); | 1381 | gl = mem_alloc(SZ(Group_Lookup)); |
1379 | group_lookups = eina_list_append(group_lookups, gl); | 1382 | group_lookups = eina_list_append(group_lookups, gl); |
1380 | gl->name = mem_strdup(name); | 1383 | gl->name = mem_strdup(name); |
1384 | gl->part = part; | ||
1381 | } | 1385 | } |
1382 | 1386 | ||
1383 | void | 1387 | void |
@@ -1698,15 +1702,38 @@ data_process_lookups(void) | |||
1698 | { | 1702 | { |
1699 | Edje_Part_Collection_Directory_Entry *de; | 1703 | Edje_Part_Collection_Directory_Entry *de; |
1700 | 1704 | ||
1705 | if (group->part) | ||
1706 | { | ||
1707 | if (group->part->type != EDJE_PART_TYPE_GROUP | ||
1708 | && group->part->type != EDJE_PART_TYPE_TEXTBLOCK | ||
1709 | && group->part->type != EDJE_PART_TYPE_BOX | ||
1710 | && group->part->type != EDJE_PART_TYPE_TABLE) | ||
1711 | goto free_group; | ||
1712 | } | ||
1713 | |||
1701 | de = eina_hash_find(edje_file->collection, group->name); | 1714 | de = eina_hash_find(edje_file->collection, group->name); |
1702 | 1715 | ||
1703 | if (!de) | 1716 | if (!de) |
1717 | { | ||
1718 | Eina_Bool found = EINA_FALSE; | ||
1719 | |||
1720 | EINA_LIST_FOREACH(aliases, l, de) | ||
1721 | if (strcmp(de->entry, group->name) == 0) | ||
1722 | { | ||
1723 | found = EINA_TRUE; | ||
1724 | break; | ||
1725 | } | ||
1726 | if (!found) de = NULL; | ||
1727 | } | ||
1728 | |||
1729 | if (!de) | ||
1704 | { | 1730 | { |
1705 | ERR("%s: Error. Unable to find group name \"%s\".", | 1731 | ERR("%s: Error. Unable to find group name \"%s\".", |
1706 | progname, group->name); | 1732 | progname, group->name); |
1707 | exit(-1); | 1733 | exit(-1); |
1708 | } | 1734 | } |
1709 | 1735 | ||
1736 | free_group: | ||
1710 | free(group->name); | 1737 | free(group->name); |
1711 | free(group); | 1738 | free(group); |
1712 | } | 1739 | } |
@@ -1914,7 +1941,7 @@ _data_queue_program_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int | |||
1914 | static void | 1941 | static void |
1915 | _data_queue_group_lookup(Edje_Part_Collection *pc __UNUSED__, char *name, char *ptr __UNUSED__, int len __UNUSED__) | 1942 | _data_queue_group_lookup(Edje_Part_Collection *pc __UNUSED__, char *name, char *ptr __UNUSED__, int len __UNUSED__) |
1916 | { | 1943 | { |
1917 | data_queue_group_lookup(name); | 1944 | data_queue_group_lookup(name, NULL); |
1918 | } | 1945 | } |
1919 | static void | 1946 | static void |
1920 | _data_queue_image_pc_lookup(Edje_Part_Collection *pc __UNUSED__, char *name, char *ptr, int len) | 1947 | _data_queue_image_pc_lookup(Edje_Part_Collection *pc __UNUSED__, char *name, char *ptr, int len) |
diff --git a/libraries/edje/src/bin/edje_cc_parse.c b/libraries/edje/src/bin/edje_cc_parse.c index ae68e00..adc08d3 100644 --- a/libraries/edje/src/bin/edje_cc_parse.c +++ b/libraries/edje/src/bin/edje_cc_parse.c | |||
@@ -238,8 +238,6 @@ next_token(char *p, char *end, char **new_p, int *delim) | |||
238 | int in_comment_sa = 0; | 238 | int in_comment_sa = 0; |
239 | int had_quote = 0; | 239 | int had_quote = 0; |
240 | int is_escaped = 0; | 240 | int is_escaped = 0; |
241 | char *cpp_token_line = NULL; | ||
242 | char *cpp_token_file = NULL; | ||
243 | 241 | ||
244 | *delim = 0; | 242 | *delim = 0; |
245 | if (p >= end) return NULL; | 243 | if (p >= end) return NULL; |
@@ -249,8 +247,6 @@ next_token(char *p, char *end, char **new_p, int *delim) | |||
249 | { | 247 | { |
250 | in_comment_ss = 0; | 248 | in_comment_ss = 0; |
251 | in_comment_cpp = 0; | 249 | in_comment_cpp = 0; |
252 | cpp_token_line = NULL; | ||
253 | cpp_token_file = NULL; | ||
254 | line++; | 250 | line++; |
255 | } | 251 | } |
256 | if ((!in_comment_ss) && (!in_comment_sa)) | 252 | if ((!in_comment_ss) && (!in_comment_sa)) |
@@ -275,8 +271,6 @@ next_token(char *p, char *end, char **new_p, int *delim) | |||
275 | /* their line format is | 271 | /* their line format is |
276 | * #line <line no. of next line> <filename from next line on> [??] | 272 | * #line <line no. of next line> <filename from next line on> [??] |
277 | */ | 273 | */ |
278 | cpp_token_line = NULL; | ||
279 | cpp_token_file = NULL; | ||
280 | 274 | ||
281 | pp = p; | 275 | pp = p; |
282 | while ((pp < end) && (*pp != '\n')) | 276 | while ((pp < end) && (*pp != '\n')) |
diff --git a/libraries/edje/src/bin/edje_decc.c b/libraries/edje/src/bin/edje_decc.c index 1b79e13..ac776e9 100644 --- a/libraries/edje/src/bin/edje_decc.c +++ b/libraries/edje/src/bin/edje_decc.c | |||
@@ -69,7 +69,6 @@ main(int argc, char **argv) | |||
69 | eina_shutdown(); | 69 | eina_shutdown(); |
70 | exit(-1); | 70 | exit(-1); |
71 | } | 71 | } |
72 | eina_log_level_set(EINA_LOG_LEVEL_INFO); | ||
73 | progname = argv[0]; | 72 | progname = argv[0]; |
74 | for (i = 1; i < argc; i++) | 73 | for (i = 1; i < argc; i++) |
75 | { | 74 | { |
@@ -104,7 +103,7 @@ main(int argc, char **argv) | |||
104 | if (!decomp()) return -1; | 103 | if (!decomp()) return -1; |
105 | output(); | 104 | output(); |
106 | 105 | ||
107 | printf("WARNING! If any Image or audio data was encoded in a LOSSY way, then\n" | 106 | fprintf(stderr, "WARNING! If any Image or audio data was encoded in a LOSSY way, then\n" |
108 | "re-encoding will drop quality even more. You need access to the original\n" | 107 | "re-encoding will drop quality even more. You need access to the original\n" |
109 | "data to ensure no loss of quality.\n"); | 108 | "data to ensure no loss of quality.\n"); |
110 | eet_close(ef); | 109 | eet_close(ef); |
diff --git a/libraries/edje/src/bin/edje_inspector.c b/libraries/edje/src/bin/edje_inspector.c index ed3baaf..093de86 100644 --- a/libraries/edje/src/bin/edje_inspector.c +++ b/libraries/edje/src/bin/edje_inspector.c | |||
@@ -263,20 +263,20 @@ border_fill_name_get(int id) | |||
263 | } | 263 | } |
264 | 264 | ||
265 | static void | 265 | static void |
266 | state_details(Evas_Object *ed, const char *part, const char *state, double value) | 266 | state_details(Evas_Object *ed, const char *ppart, const char *state, double value) |
267 | { | 267 | { |
268 | Edje_Part_Type t = edje_edit_part_type_get(ed, part); | 268 | Edje_Part_Type t = edje_edit_part_type_get(ed, ppart); |
269 | double dx, dy; | 269 | double dx, dy; |
270 | const char *str, *str2; | 270 | const char *str, *str2; |
271 | int x, y, r, g, b, a; | 271 | int x, y, r, g, b, a; |
272 | 272 | ||
273 | if (detail < 1) return; | 273 | if (detail < 1) return; |
274 | 274 | ||
275 | b = edje_edit_state_visible_get(ed, part, state, value); | 275 | b = edje_edit_state_visible_get(ed, ppart, state, value); |
276 | if (machine) printf("VISIBLE: %d\n", b); | 276 | if (machine) printf("VISIBLE: %d\n", b); |
277 | else if (!b) puts(INDENT4 "visible: 0;"); | 277 | else if (!b) puts(INDENT4 "visible: 0;"); |
278 | 278 | ||
279 | edje_edit_state_color_get(ed, part, state, value, &r, &g, &b, &a); | 279 | edje_edit_state_color_get(ed, ppart, state, value, &r, &g, &b, &a); |
280 | if (machine) | 280 | if (machine) |
281 | printf("COLOR-R: %d\nCOLOR-G: %d\nCOLOR-B: %d\nCOLOR-A: %d\n", r, g, b, a); | 281 | printf("COLOR-R: %d\nCOLOR-G: %d\nCOLOR-B: %d\nCOLOR-A: %d\n", r, g, b, a); |
282 | else if ((r != 255) || (g != 255) || (b != 255) || (a != 255)) | 282 | else if ((r != 255) || (g != 255) || (b != 255) || (a != 255)) |
@@ -284,14 +284,14 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value | |||
284 | 284 | ||
285 | if (detail > 1) | 285 | if (detail > 1) |
286 | { | 286 | { |
287 | edje_edit_state_color2_get(ed, part, state, value, &r, &g, &b, &a); | 287 | edje_edit_state_color2_get(ed, ppart, state, value, &r, &g, &b, &a); |
288 | if (machine) | 288 | if (machine) |
289 | printf("COLOR2-R: %d\nCOLOR2-G: %d\nCOLOR2-B: %d\nCOLOR2-A: %d\n", | 289 | printf("COLOR2-R: %d\nCOLOR2-G: %d\nCOLOR2-B: %d\nCOLOR2-A: %d\n", |
290 | r, g, b, a); | 290 | r, g, b, a); |
291 | else if ((r != 255) || (g != 255) || (b != 255) || (a != 255)) | 291 | else if ((r != 255) || (g != 255) || (b != 255) || (a != 255)) |
292 | printf(INDENT4 "color2: %d %d %d %d;\n", r, g, b, a); | 292 | printf(INDENT4 "color2: %d %d %d %d;\n", r, g, b, a); |
293 | 293 | ||
294 | edje_edit_state_color3_get(ed, part, state, value, &r, &g, &b, &a); | 294 | edje_edit_state_color3_get(ed, ppart, state, value, &r, &g, &b, &a); |
295 | if (machine) | 295 | if (machine) |
296 | printf("COLOR3-R: %d\nCOLOR3-G: %d\nCOLOR3-B: %d\nCOLOR3-A: %d\n", | 296 | printf("COLOR3-R: %d\nCOLOR3-G: %d\nCOLOR3-B: %d\nCOLOR3-A: %d\n", |
297 | r, g, b, a); | 297 | r, g, b, a); |
@@ -299,19 +299,19 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value | |||
299 | printf(INDENT4 "color3: %d %d %d %d;\n", r, g, b, a); | 299 | printf(INDENT4 "color3: %d %d %d %d;\n", r, g, b, a); |
300 | } | 300 | } |
301 | 301 | ||
302 | dx = edje_edit_state_align_x_get(ed, part, state, value); | 302 | dx = edje_edit_state_align_x_get(ed, ppart, state, value); |
303 | dy = edje_edit_state_align_y_get(ed, part, state, value); | 303 | dy = edje_edit_state_align_y_get(ed, ppart, state, value); |
304 | if (machine) printf("ALIGN-X: %g\nALIGN-Y: %g\n", dx, dy); | 304 | if (machine) printf("ALIGN-X: %g\nALIGN-Y: %g\n", dx, dy); |
305 | else if (FDIFF(dx, 0.5) || FDIFF(dy, 0.5)) | 305 | else if (FDIFF(dx, 0.5) || FDIFF(dy, 0.5)) |
306 | printf(INDENT4 "align: %g %g;\n", dx, dy); | 306 | printf(INDENT4 "align: %g %g;\n", dx, dy); |
307 | 307 | ||
308 | x = edje_edit_state_min_w_get(ed, part, state, value); | 308 | x = edje_edit_state_min_w_get(ed, ppart, state, value); |
309 | y = edje_edit_state_min_h_get(ed, part, state, value); | 309 | y = edje_edit_state_min_h_get(ed, ppart, state, value); |
310 | if (machine) printf("MIN-W: %d\nMIN-H: %d\n", x, y); | 310 | if (machine) printf("MIN-W: %d\nMIN-H: %d\n", x, y); |
311 | else if ((x) || (y)) printf(INDENT4 "min: %d %d;\n", x, y); | 311 | else if ((x) || (y)) printf(INDENT4 "min: %d %d;\n", x, y); |
312 | 312 | ||
313 | x = edje_edit_state_max_w_get(ed, part, state, value); | 313 | x = edje_edit_state_max_w_get(ed, ppart, state, value); |
314 | y = edje_edit_state_max_h_get(ed, part, state, value); | 314 | y = edje_edit_state_max_h_get(ed, ppart, state, value); |
315 | if (machine) printf("MAX-W: %d\nMAX-H: %d\n", x, y); | 315 | if (machine) printf("MAX-W: %d\nMAX-H: %d\n", x, y); |
316 | else if ((x != -1) || (y != -1)) printf(INDENT4 "max: %d %d;\n", x, y); | 316 | else if ((x != -1) || (y != -1)) printf(INDENT4 "max: %d %d;\n", x, y); |
317 | 317 | ||
@@ -320,30 +320,30 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value | |||
320 | 320 | ||
321 | if (detail > 1) | 321 | if (detail > 1) |
322 | { | 322 | { |
323 | dx = edje_edit_state_aspect_min_get(ed, part, state, value); | 323 | dx = edje_edit_state_aspect_min_get(ed, ppart, state, value); |
324 | dy = edje_edit_state_aspect_max_get(ed, part, state, value); | 324 | dy = edje_edit_state_aspect_max_get(ed, ppart, state, value); |
325 | if (machine) printf("ASPECT-MIN: %g\nASPECT-MAX: %g\n", dx, dy); | 325 | if (machine) printf("ASPECT-MIN: %g\nASPECT-MAX: %g\n", dx, dy); |
326 | else if (FDIFF(dx, 0.0) || FDIFF(dy, 0.0)) | 326 | else if (FDIFF(dx, 0.0) || FDIFF(dy, 0.0)) |
327 | printf(INDENT4 "aspect: %g %g;\n", dx, dy); | 327 | printf(INDENT4 "aspect: %g %g;\n", dx, dy); |
328 | 328 | ||
329 | x = edje_edit_state_aspect_pref_get(ed, part, state, value); | 329 | x = edje_edit_state_aspect_pref_get(ed, ppart, state, value); |
330 | str = aspect_pref_name_get(x); | 330 | str = aspect_pref_name_get(x); |
331 | if (machine) printf("ASPECT-PREFERENCE: %s\n", str); | 331 | if (machine) printf("ASPECT-PREFERENCE: %s\n", str); |
332 | else if (x) printf(INDENT4 "aspect_preference: %s;\n", str); | 332 | else if (x) printf(INDENT4 "aspect_preference: %s;\n", str); |
333 | /* do not free this str! */ | 333 | /* do not free this str! */ |
334 | 334 | ||
335 | str = edje_edit_state_color_class_get(ed, part, state, value); | 335 | str = edje_edit_state_color_class_get(ed, ppart, state, value); |
336 | if (machine) printf("COLOR_CLASS: %s\n", str ? str : ""); | 336 | if (machine) printf("COLOR_CLASS: %s\n", str ? str : ""); |
337 | else if (str) printf(INDENT4 "color_class: \"%s\";\n", str); | 337 | else if (str) printf(INDENT4 "color_class: \"%s\";\n", str); |
338 | edje_edit_string_free(str); | 338 | edje_edit_string_free(str); |
339 | } | 339 | } |
340 | 340 | ||
341 | dx = edje_edit_state_rel1_relative_x_get(ed, part, state, value); | 341 | dx = edje_edit_state_rel1_relative_x_get(ed, ppart, state, value); |
342 | dy = edje_edit_state_rel1_relative_y_get(ed, part, state, value); | 342 | dy = edje_edit_state_rel1_relative_y_get(ed, ppart, state, value); |
343 | x = edje_edit_state_rel1_offset_x_get(ed, part, state, value); | 343 | x = edje_edit_state_rel1_offset_x_get(ed, ppart, state, value); |
344 | y = edje_edit_state_rel1_offset_y_get(ed, part, state, value); | 344 | y = edje_edit_state_rel1_offset_y_get(ed, ppart, state, value); |
345 | str = edje_edit_state_rel1_to_x_get(ed, part, state, value); | 345 | str = edje_edit_state_rel1_to_x_get(ed, ppart, state, value); |
346 | str2 = edje_edit_state_rel1_to_y_get(ed, part, state, value); | 346 | str2 = edje_edit_state_rel1_to_y_get(ed, ppart, state, value); |
347 | if (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y) || (str) || (str2)) | 347 | if (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y) || (str) || (str2)) |
348 | { | 348 | { |
349 | if (machine) puts("REL1-BEGIN"); | 349 | if (machine) puts("REL1-BEGIN"); |
@@ -372,12 +372,12 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value | |||
372 | edje_edit_string_free(str); | 372 | edje_edit_string_free(str); |
373 | edje_edit_string_free(str2); | 373 | edje_edit_string_free(str2); |
374 | 374 | ||
375 | dx = edje_edit_state_rel2_relative_x_get(ed, part, state, value); | 375 | dx = edje_edit_state_rel2_relative_x_get(ed, ppart, state, value); |
376 | dy = edje_edit_state_rel2_relative_y_get(ed, part, state, value); | 376 | dy = edje_edit_state_rel2_relative_y_get(ed, ppart, state, value); |
377 | x = edje_edit_state_rel2_offset_x_get(ed, part, state, value); | 377 | x = edje_edit_state_rel2_offset_x_get(ed, ppart, state, value); |
378 | y = edje_edit_state_rel2_offset_y_get(ed, part, state, value); | 378 | y = edje_edit_state_rel2_offset_y_get(ed, ppart, state, value); |
379 | str = edje_edit_state_rel2_to_x_get(ed, part, state, value); | 379 | str = edje_edit_state_rel2_to_x_get(ed, ppart, state, value); |
380 | str2 = edje_edit_state_rel2_to_y_get(ed, part, state, value); | 380 | str2 = edje_edit_state_rel2_to_y_get(ed, ppart, state, value); |
381 | if (FDIFF(dx, 1.0) || FDIFF(dy, 1.0) || (x != -1) || (y != -1) || | 381 | if (FDIFF(dx, 1.0) || FDIFF(dy, 1.0) || (x != -1) || (y != -1) || |
382 | (str) || (str2)) | 382 | (str) || (str2)) |
383 | { | 383 | { |
@@ -410,7 +410,7 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value | |||
410 | 410 | ||
411 | if (t == EDJE_PART_TYPE_IMAGE) | 411 | if (t == EDJE_PART_TYPE_IMAGE) |
412 | { | 412 | { |
413 | str = edje_edit_state_image_get(ed, part, state, value); | 413 | str = edje_edit_state_image_get(ed, ppart, state, value); |
414 | 414 | ||
415 | if (machine) printf("IMAGE-BEGIN\nNORMAL: %s\n", str ? str : ""); | 415 | if (machine) printf("IMAGE-BEGIN\nNORMAL: %s\n", str ? str : ""); |
416 | else if (detail > 1) | 416 | else if (detail > 1) |
@@ -429,7 +429,7 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value | |||
429 | double dx2, dy2; | 429 | double dx2, dy2; |
430 | Eina_Bool has_orgin, has_size; | 430 | Eina_Bool has_orgin, has_size; |
431 | 431 | ||
432 | tweens = edje_edit_state_tweens_list_get(ed, part, state, value); | 432 | tweens = edje_edit_state_tweens_list_get(ed, ppart, state, value); |
433 | EINA_LIST_FOREACH(tweens, l, str) | 433 | EINA_LIST_FOREACH(tweens, l, str) |
434 | { | 434 | { |
435 | if (machine) printf("TWEEN: %s\n", str); | 435 | if (machine) printf("TWEEN: %s\n", str); |
@@ -438,14 +438,14 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value | |||
438 | edje_edit_string_list_free(tweens); | 438 | edje_edit_string_list_free(tweens); |
439 | 439 | ||
440 | edje_edit_state_image_border_get | 440 | edje_edit_state_image_border_get |
441 | (ed, part, state, value, &bl, &br, &bt, &bb); | 441 | (ed, ppart, state, value, &bl, &br, &bt, &bb); |
442 | if (machine) | 442 | if (machine) |
443 | printf("BORDER-LEFT: %d\nBORDER-RIGHT: %d\n" | 443 | printf("BORDER-LEFT: %d\nBORDER-RIGHT: %d\n" |
444 | "BORDER-TOP: %d\nBORDER-BOTTOM: %d\n", bl, br, bt, bb); | 444 | "BORDER-TOP: %d\nBORDER-BOTTOM: %d\n", bl, br, bt, bb); |
445 | else if ((bl) || (br) || (bt) || (bb)) | 445 | else if ((bl) || (br) || (bt) || (bb)) |
446 | printf(INDENT5 "border: %d %d %d %d;\n", bl, br, bt, bb); | 446 | printf(INDENT5 "border: %d %d %d %d;\n", bl, br, bt, bb); |
447 | 447 | ||
448 | x = edje_edit_state_image_border_fill_get(ed, part, state, value); | 448 | x = edje_edit_state_image_border_fill_get(ed, ppart, state, value); |
449 | str = border_fill_name_get(x); | 449 | str = border_fill_name_get(x); |
450 | if (machine) printf("BORDER-FILL: %s\n", str); | 450 | if (machine) printf("BORDER-FILL: %s\n", str); |
451 | else if (x != 1) printf(INDENT5 "middle: %s;\n", str); | 451 | else if (x != 1) printf(INDENT5 "middle: %s;\n", str); |
@@ -454,22 +454,22 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value | |||
454 | // TODO support image.fill.smooth | 454 | // TODO support image.fill.smooth |
455 | 455 | ||
456 | dx = edje_edit_state_fill_origin_relative_x_get | 456 | dx = edje_edit_state_fill_origin_relative_x_get |
457 | (ed, part, state, value); | 457 | (ed, ppart, state, value); |
458 | dy = edje_edit_state_fill_origin_relative_y_get | 458 | dy = edje_edit_state_fill_origin_relative_y_get |
459 | (ed, part, state, value); | 459 | (ed, ppart, state, value); |
460 | x = edje_edit_state_fill_origin_offset_x_get | 460 | x = edje_edit_state_fill_origin_offset_x_get |
461 | (ed, part, state, value); | 461 | (ed, ppart, state, value); |
462 | y = edje_edit_state_fill_origin_offset_y_get | 462 | y = edje_edit_state_fill_origin_offset_y_get |
463 | (ed, part, state, value); | 463 | (ed, ppart, state, value); |
464 | 464 | ||
465 | dx2 = edje_edit_state_fill_size_relative_x_get | 465 | dx2 = edje_edit_state_fill_size_relative_x_get |
466 | (ed, part, state, value); | 466 | (ed, ppart, state, value); |
467 | dy2 = edje_edit_state_fill_size_relative_y_get | 467 | dy2 = edje_edit_state_fill_size_relative_y_get |
468 | (ed, part, state, value); | 468 | (ed, ppart, state, value); |
469 | x2 = edje_edit_state_fill_size_offset_x_get | 469 | x2 = edje_edit_state_fill_size_offset_x_get |
470 | (ed, part, state, value); | 470 | (ed, ppart, state, value); |
471 | y2 = edje_edit_state_fill_size_offset_y_get | 471 | y2 = edje_edit_state_fill_size_offset_y_get |
472 | (ed, part, state, value); | 472 | (ed, ppart, state, value); |
473 | 473 | ||
474 | has_orgin = (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y)); | 474 | has_orgin = (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y)); |
475 | has_size = (FDIFF(dx2, 1.0) || FDIFF(dy2, 1.0) || (x2) || (y2)); | 475 | has_size = (FDIFF(dx2, 1.0) || FDIFF(dy2, 1.0) || (x2) || (y2)); |
@@ -531,22 +531,22 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value | |||
531 | // TODO support proxy.fill.smooth | 531 | // TODO support proxy.fill.smooth |
532 | 532 | ||
533 | dx = edje_edit_state_fill_origin_relative_x_get | 533 | dx = edje_edit_state_fill_origin_relative_x_get |
534 | (ed, part, state, value); | 534 | (ed, ppart, state, value); |
535 | dy = edje_edit_state_fill_origin_relative_y_get | 535 | dy = edje_edit_state_fill_origin_relative_y_get |
536 | (ed, part, state, value); | 536 | (ed, ppart, state, value); |
537 | x = edje_edit_state_fill_origin_offset_x_get | 537 | x = edje_edit_state_fill_origin_offset_x_get |
538 | (ed, part, state, value); | 538 | (ed, ppart, state, value); |
539 | y = edje_edit_state_fill_origin_offset_y_get | 539 | y = edje_edit_state_fill_origin_offset_y_get |
540 | (ed, part, state, value); | 540 | (ed, ppart, state, value); |
541 | 541 | ||
542 | dx2 = edje_edit_state_fill_size_relative_x_get | 542 | dx2 = edje_edit_state_fill_size_relative_x_get |
543 | (ed, part, state, value); | 543 | (ed, ppart, state, value); |
544 | dy2 = edje_edit_state_fill_size_relative_y_get | 544 | dy2 = edje_edit_state_fill_size_relative_y_get |
545 | (ed, part, state, value); | 545 | (ed, ppart, state, value); |
546 | x2 = edje_edit_state_fill_size_offset_x_get | 546 | x2 = edje_edit_state_fill_size_offset_x_get |
547 | (ed, part, state, value); | 547 | (ed, ppart, state, value); |
548 | y2 = edje_edit_state_fill_size_offset_y_get | 548 | y2 = edje_edit_state_fill_size_offset_y_get |
549 | (ed, part, state, value); | 549 | (ed, ppart, state, value); |
550 | 550 | ||
551 | has_orgin = (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y)); | 551 | has_orgin = (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y)); |
552 | has_size = (FDIFF(dx2, 1.0) || FDIFF(dy2, 1.0) || (x2) || (y2)); | 552 | has_size = (FDIFF(dx2, 1.0) || FDIFF(dy2, 1.0) || (x2) || (y2)); |
@@ -600,34 +600,34 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value | |||
600 | if (machine) puts("TEXT-BEGIN"); | 600 | if (machine) puts("TEXT-BEGIN"); |
601 | else puts(INDENT4 "text {"); | 601 | else puts(INDENT4 "text {"); |
602 | 602 | ||
603 | str = edje_edit_state_text_get(ed, part, state, value); | 603 | str = edje_edit_state_text_get(ed, ppart, state, value); |
604 | if (machine) printf("TEXT: %s\n", str ? str : ""); | 604 | if (machine) printf("TEXT: %s\n", str ? str : ""); |
605 | else if (str) printf(INDENT5 "text: \"%s\";\n", str); | 605 | else if (str) printf(INDENT5 "text: \"%s\";\n", str); |
606 | edje_edit_string_free(str); | 606 | edje_edit_string_free(str); |
607 | 607 | ||
608 | str = edje_edit_state_font_get(ed, part, state, value); | 608 | str = edje_edit_state_font_get(ed, ppart, state, value); |
609 | if (machine) printf("FONT: %s\n", str ? str : ""); | 609 | if (machine) printf("FONT: %s\n", str ? str : ""); |
610 | else if (str) printf(INDENT5 "font: \"%s\";\n", str); | 610 | else if (str) printf(INDENT5 "font: \"%s\";\n", str); |
611 | edje_edit_string_free(str); | 611 | edje_edit_string_free(str); |
612 | 612 | ||
613 | x = edje_edit_state_text_size_get(ed, part, state, value); | 613 | x = edje_edit_state_text_size_get(ed, ppart, state, value); |
614 | if (machine) printf("SIZE: %d\n", x); | 614 | if (machine) printf("SIZE: %d\n", x); |
615 | else if (x > 0) printf(INDENT5 "size: %d;\n", x); | 615 | else if (x > 0) printf(INDENT5 "size: %d;\n", x); |
616 | 616 | ||
617 | // TODO text_class | 617 | // TODO text_class |
618 | 618 | ||
619 | dx = edje_edit_state_text_align_x_get(ed, part, state, value); | 619 | dx = edje_edit_state_text_align_x_get(ed, ppart, state, value); |
620 | dy = edje_edit_state_text_align_y_get(ed, part, state, value); | 620 | dy = edje_edit_state_text_align_y_get(ed, ppart, state, value); |
621 | if (machine) printf("TEXT-ALIGN-X: %g\nTEXT-ALIGN-Y: %g\n", dx, dy); | 621 | if (machine) printf("TEXT-ALIGN-X: %g\nTEXT-ALIGN-Y: %g\n", dx, dy); |
622 | else if (FDIFF(dx, 0.5) || FDIFF(dy, 0.5)) | 622 | else if (FDIFF(dx, 0.5) || FDIFF(dy, 0.5)) |
623 | printf(INDENT5 "align: %g %g;\n", dx, dy); | 623 | printf(INDENT5 "align: %g %g;\n", dx, dy); |
624 | 624 | ||
625 | x = edje_edit_state_text_fit_x_get(ed, part, state, value); | 625 | x = edje_edit_state_text_fit_x_get(ed, ppart, state, value); |
626 | y = edje_edit_state_text_fit_y_get(ed, part, state, value); | 626 | y = edje_edit_state_text_fit_y_get(ed, ppart, state, value); |
627 | if (machine) printf("TEXT-FIT-X: %d\nTEXT-FIT-Y: %d\n", x, y); | 627 | if (machine) printf("TEXT-FIT-X: %d\nTEXT-FIT-Y: %d\n", x, y); |
628 | else if ((x) || (y)) printf(INDENT5 "fit: %d %d;\n", x, y); | 628 | else if ((x) || (y)) printf(INDENT5 "fit: %d %d;\n", x, y); |
629 | 629 | ||
630 | dx = edje_edit_state_text_elipsis_get(ed, part, state, value); | 630 | dx = edje_edit_state_text_elipsis_get(ed, ppart, state, value); |
631 | if (machine) printf("TEXT-ELIPSIS: %g\n", dx); | 631 | if (machine) printf("TEXT-ELIPSIS: %g\n", dx); |
632 | else if (FDIFF(dx, 0.5)) printf(INDENT5 "elipsis: %g;\n", dx); | 632 | else if (FDIFF(dx, 0.5)) printf(INDENT5 "elipsis: %g;\n", dx); |
633 | 633 | ||
@@ -640,7 +640,7 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value | |||
640 | const Edje_External_Param *p; | 640 | const Edje_External_Param *p; |
641 | 641 | ||
642 | params = edje_edit_state_external_params_list_get | 642 | params = edje_edit_state_external_params_list_get |
643 | (ed, part, state, value); | 643 | (ed, ppart, state, value); |
644 | 644 | ||
645 | if (params) | 645 | if (params) |
646 | { | 646 | { |
@@ -766,16 +766,16 @@ _api_name_fix(const char *orig) | |||
766 | } | 766 | } |
767 | 767 | ||
768 | static char * | 768 | static char * |
769 | _part_api_name_get(Evas_Object *ed, const char *part) | 769 | _part_api_name_get(Evas_Object *ed, const char *ppart) |
770 | { | 770 | { |
771 | const char *orig = edje_edit_part_api_name_get(ed, part); | 771 | const char *orig = edje_edit_part_api_name_get(ed, ppart); |
772 | char *fix = _api_name_fix(orig); | 772 | char *fix = _api_name_fix(orig); |
773 | edje_edit_string_free(orig); | 773 | edje_edit_string_free(orig); |
774 | return fix; | 774 | return fix; |
775 | } | 775 | } |
776 | 776 | ||
777 | static void | 777 | static void |
778 | part_details(Evas_Object *ed, const char *part) | 778 | part_details(Evas_Object *ed, const char *ppart) |
779 | { | 779 | { |
780 | Eina_List *states, *l; | 780 | Eina_List *states, *l; |
781 | Eina_Bool b; | 781 | Eina_Bool b; |
@@ -786,8 +786,8 @@ part_details(Evas_Object *ed, const char *part) | |||
786 | 786 | ||
787 | if (machine) puts("PART-DETAILS-BEGIN"); | 787 | if (machine) puts("PART-DETAILS-BEGIN"); |
788 | 788 | ||
789 | str = api =_part_api_name_get(ed, part); | 789 | str = api =_part_api_name_get(ed, ppart); |
790 | str2 = edje_edit_part_api_description_get(ed, part); | 790 | str2 = edje_edit_part_api_description_get(ed, ppart); |
791 | if (machine) | 791 | if (machine) |
792 | { | 792 | { |
793 | printf("API-NAME: %s\n", str ? str : ""); | 793 | printf("API-NAME: %s\n", str ? str : ""); |
@@ -798,67 +798,67 @@ part_details(Evas_Object *ed, const char *part) | |||
798 | free(api); | 798 | free(api); |
799 | edje_edit_string_free(str2); | 799 | edje_edit_string_free(str2); |
800 | 800 | ||
801 | b = edje_edit_part_mouse_events_get(ed, part); | 801 | b = edje_edit_part_mouse_events_get(ed, ppart); |
802 | if (machine) printf("MOUSE_EVENTS: %d\n", b); | 802 | if (machine) printf("MOUSE_EVENTS: %d\n", b); |
803 | else if (!b) puts(INDENT3 "mouse_events: 0;"); | 803 | else if (!b) puts(INDENT3 "mouse_events: 0;"); |
804 | 804 | ||
805 | if (detail > 1) | 805 | if (detail > 1) |
806 | { | 806 | { |
807 | b = edje_edit_part_repeat_events_get(ed, part); | 807 | b = edje_edit_part_repeat_events_get(ed, ppart); |
808 | if (machine) printf("REPEAT_EVENTS: %d\n", b); | 808 | if (machine) printf("REPEAT_EVENTS: %d\n", b); |
809 | else if (b) puts(INDENT3 "repeat_events: 1;"); | 809 | else if (b) puts(INDENT3 "repeat_events: 1;"); |
810 | 810 | ||
811 | b = edje_edit_part_scale_get(ed, part); | 811 | b = edje_edit_part_scale_get(ed, ppart); |
812 | if (machine) printf("SCALE: %d\n", b); | 812 | if (machine) printf("SCALE: %d\n", b); |
813 | else if (b) puts(INDENT3 "scale: 1;"); | 813 | else if (b) puts(INDENT3 "scale: 1;"); |
814 | } | 814 | } |
815 | 815 | ||
816 | str = edje_edit_part_clip_to_get(ed, part); | 816 | str = edje_edit_part_clip_to_get(ed, ppart); |
817 | if (machine) printf("CLIP_TO: %s\n", str ? str : ""); | 817 | if (machine) printf("CLIP_TO: %s\n", str ? str : ""); |
818 | else if (str) printf(INDENT3 "clip_to: \"%s\";\n", str); | 818 | else if (str) printf(INDENT3 "clip_to: \"%s\";\n", str); |
819 | edje_edit_string_free(str); | 819 | edje_edit_string_free(str); |
820 | 820 | ||
821 | str = edje_edit_part_source_get(ed, part); | 821 | str = edje_edit_part_source_get(ed, ppart); |
822 | if (machine) printf("SOURCE: %s\n", str ? str : ""); | 822 | if (machine) printf("SOURCE: %s\n", str ? str : ""); |
823 | else if (str) printf(INDENT3 "source: \"%s\";\n", str); | 823 | else if (str) printf(INDENT3 "source: \"%s\";\n", str); |
824 | edje_edit_string_free(str); | 824 | edje_edit_string_free(str); |
825 | 825 | ||
826 | if (detail > 1) | 826 | if (detail > 1) |
827 | { | 827 | { |
828 | if (edje_edit_part_type_get(ed, part) == EDJE_PART_TYPE_TEXT) | 828 | if (edje_edit_part_type_get(ed, ppart) == EDJE_PART_TYPE_TEXT) |
829 | { | 829 | { |
830 | str = text_effect_name_get(edje_edit_part_effect_get(ed, part)); | 830 | str = text_effect_name_get(edje_edit_part_effect_get(ed, ppart)); |
831 | if (machine) printf("EFFECT: %s\n", str ? str : ""); | 831 | if (machine) printf("EFFECT: %s\n", str ? str : ""); |
832 | else if (str) printf(INDENT3 "effect: %s;\n", str); | 832 | else if (str) printf(INDENT3 "effect: %s;\n", str); |
833 | /* do not free this str! */ | 833 | /* do not free this str! */ |
834 | } | 834 | } |
835 | 835 | ||
836 | if (edje_edit_part_drag_x_get(ed, part) || | 836 | if (edje_edit_part_drag_x_get(ed, ppart) || |
837 | edje_edit_part_drag_y_get(ed, part)) | 837 | edje_edit_part_drag_y_get(ed, ppart)) |
838 | { | 838 | { |
839 | int dir, step, count; | 839 | int dir, step, count; |
840 | 840 | ||
841 | if (machine) puts("DRAGABLE-BEGIN"); | 841 | if (machine) puts("DRAGABLE-BEGIN"); |
842 | else puts(INDENT3 "dragable {"); | 842 | else puts(INDENT3 "dragable {"); |
843 | 843 | ||
844 | dir = edje_edit_part_drag_x_get(ed, part); | 844 | dir = edje_edit_part_drag_x_get(ed, ppart); |
845 | step = edje_edit_part_drag_step_x_get(ed, part); | 845 | step = edje_edit_part_drag_step_x_get(ed, ppart); |
846 | count = edje_edit_part_drag_count_x_get(ed, part); | 846 | count = edje_edit_part_drag_count_x_get(ed, ppart); |
847 | if (machine) printf("DRAG-X: %d %d %d\n", dir, step, count); | 847 | if (machine) printf("DRAG-X: %d %d %d\n", dir, step, count); |
848 | else printf(INDENT4 "x: %d %d %d;\n", dir, step, count); | 848 | else printf(INDENT4 "x: %d %d %d;\n", dir, step, count); |
849 | 849 | ||
850 | dir = edje_edit_part_drag_y_get(ed, part); | 850 | dir = edje_edit_part_drag_y_get(ed, ppart); |
851 | step = edje_edit_part_drag_step_y_get(ed, part); | 851 | step = edje_edit_part_drag_step_y_get(ed, ppart); |
852 | count = edje_edit_part_drag_count_y_get(ed, part); | 852 | count = edje_edit_part_drag_count_y_get(ed, ppart); |
853 | if (machine) printf("DRAG-Y: %d %d %d\n", dir, step, count); | 853 | if (machine) printf("DRAG-Y: %d %d %d\n", dir, step, count); |
854 | else printf(INDENT4 "y: %d %d %d;\n", dir, step, count); | 854 | else printf(INDENT4 "y: %d %d %d;\n", dir, step, count); |
855 | 855 | ||
856 | str = edje_edit_part_drag_confine_get(ed, part); | 856 | str = edje_edit_part_drag_confine_get(ed, ppart); |
857 | if (machine) printf("DRAG-CONFINE: %s\n", str ? str : ""); | 857 | if (machine) printf("DRAG-CONFINE: %s\n", str ? str : ""); |
858 | else if (str) printf(INDENT4 "confine: \"%s\";\n", str); | 858 | else if (str) printf(INDENT4 "confine: \"%s\";\n", str); |
859 | edje_edit_string_free(str); | 859 | edje_edit_string_free(str); |
860 | 860 | ||
861 | str = edje_edit_part_drag_event_get(ed, part); | 861 | str = edje_edit_part_drag_event_get(ed, ppart); |
862 | if (machine) printf("DRAG-EVENTS: %s\n", str ? str : ""); | 862 | if (machine) printf("DRAG-EVENTS: %s\n", str ? str : ""); |
863 | else if (str) printf(INDENT4 "events: \"%s\";\n", str); | 863 | else if (str) printf(INDENT4 "events: \"%s\";\n", str); |
864 | edje_edit_string_free(str); | 864 | edje_edit_string_free(str); |
@@ -868,7 +868,7 @@ part_details(Evas_Object *ed, const char *part) | |||
868 | } | 868 | } |
869 | } | 869 | } |
870 | 870 | ||
871 | states = edje_edit_part_states_list_get(ed, part); | 871 | states = edje_edit_part_states_list_get(ed, ppart); |
872 | EINA_LIST_FOREACH(states, l, str) | 872 | EINA_LIST_FOREACH(states, l, str) |
873 | { | 873 | { |
874 | char state[512], *delim; | 874 | char state[512], *delim; |
@@ -879,7 +879,7 @@ part_details(Evas_Object *ed, const char *part) | |||
879 | delim++; | 879 | delim++; |
880 | value = strtod(delim, NULL); | 880 | value = strtod(delim, NULL); |
881 | state_begin(state, value); | 881 | state_begin(state, value); |
882 | state_details(ed, part, state, value); | 882 | state_details(ed, ppart, state, value); |
883 | state_end(); | 883 | state_end(); |
884 | } | 884 | } |
885 | edje_edit_string_list_free(states); | 885 | edje_edit_string_list_free(states); |
@@ -1047,9 +1047,9 @@ program_end(void) | |||
1047 | 1047 | ||
1048 | 1048 | ||
1049 | static char * | 1049 | static char * |
1050 | _program_api_name_get(Evas_Object *ed, const char *program) | 1050 | _program_api_name_get(Evas_Object *ed, const char *pprogram) |
1051 | { | 1051 | { |
1052 | const char *orig = edje_edit_program_api_name_get(ed, program); | 1052 | const char *orig = edje_edit_program_api_name_get(ed, pprogram); |
1053 | char *fix = _api_name_fix(orig); | 1053 | char *fix = _api_name_fix(orig); |
1054 | edje_edit_string_free(orig); | 1054 | edje_edit_string_free(orig); |
1055 | return fix; | 1055 | return fix; |
@@ -1071,7 +1071,7 @@ _transition_name_get(Edje_Tween_Mode mode) | |||
1071 | } | 1071 | } |
1072 | 1072 | ||
1073 | static void | 1073 | static void |
1074 | program_details(Evas_Object *ed, const char *program) | 1074 | program_details(Evas_Object *ed, const char *pprogram) |
1075 | { | 1075 | { |
1076 | const char *str, *str2; | 1076 | const char *str, *str2; |
1077 | char *api; | 1077 | char *api; |
@@ -1080,8 +1080,8 @@ program_details(Evas_Object *ed, const char *program) | |||
1080 | 1080 | ||
1081 | if (machine) puts("PROGRAM-DETAILS-BEGIN"); | 1081 | if (machine) puts("PROGRAM-DETAILS-BEGIN"); |
1082 | 1082 | ||
1083 | str = api =_program_api_name_get(ed, program); | 1083 | str = api =_program_api_name_get(ed, pprogram); |
1084 | str2 = edje_edit_program_api_description_get(ed, program); | 1084 | str2 = edje_edit_program_api_description_get(ed, pprogram); |
1085 | if (machine) | 1085 | if (machine) |
1086 | { | 1086 | { |
1087 | printf("API-NAME: %s\n", str ? str : ""); | 1087 | printf("API-NAME: %s\n", str ? str : ""); |
@@ -1092,12 +1092,12 @@ program_details(Evas_Object *ed, const char *program) | |||
1092 | free(api); | 1092 | free(api); |
1093 | edje_edit_string_free(str2); | 1093 | edje_edit_string_free(str2); |
1094 | 1094 | ||
1095 | str = edje_edit_program_signal_get(ed, program); | 1095 | str = edje_edit_program_signal_get(ed, pprogram); |
1096 | if (machine) printf("SIGNAL: %s\n", str ? str : ""); | 1096 | if (machine) printf("SIGNAL: %s\n", str ? str : ""); |
1097 | else if (str) printf(INDENT3 "signal: \"%s\";\n", str); | 1097 | else if (str) printf(INDENT3 "signal: \"%s\";\n", str); |
1098 | edje_edit_string_free(str); | 1098 | edje_edit_string_free(str); |
1099 | 1099 | ||
1100 | str = edje_edit_program_source_get(ed, program); | 1100 | str = edje_edit_program_source_get(ed, pprogram); |
1101 | if (machine) printf("SOURCE: %s\n", str ? str : ""); | 1101 | if (machine) printf("SOURCE: %s\n", str ? str : ""); |
1102 | else if (str) printf(INDENT3 "source: \"%s\";\n", str); | 1102 | else if (str) printf(INDENT3 "source: \"%s\";\n", str); |
1103 | edje_edit_string_free(str); | 1103 | edje_edit_string_free(str); |
@@ -1105,7 +1105,7 @@ program_details(Evas_Object *ed, const char *program) | |||
1105 | if (detail >= 1) | 1105 | if (detail >= 1) |
1106 | { | 1106 | { |
1107 | Eina_List *lst, *l; | 1107 | Eina_List *lst, *l; |
1108 | Edje_Action_Type type = edje_edit_program_action_get(ed, program); | 1108 | Edje_Action_Type type = edje_edit_program_action_get(ed, pprogram); |
1109 | switch (type) | 1109 | switch (type) |
1110 | { | 1110 | { |
1111 | case EDJE_ACTION_TYPE_ACTION_STOP: | 1111 | case EDJE_ACTION_TYPE_ACTION_STOP: |
@@ -1113,18 +1113,18 @@ program_details(Evas_Object *ed, const char *program) | |||
1113 | else puts(INDENT3 "action: ACTION_STOP;"); | 1113 | else puts(INDENT3 "action: ACTION_STOP;"); |
1114 | break; | 1114 | break; |
1115 | case EDJE_ACTION_TYPE_STATE_SET: | 1115 | case EDJE_ACTION_TYPE_STATE_SET: |
1116 | str = edje_edit_program_state_get(ed, program); | 1116 | str = edje_edit_program_state_get(ed, pprogram); |
1117 | if (machine) | 1117 | if (machine) |
1118 | printf("ACTION: STATE_SET\nACTION-STATE: %s %g\n", | 1118 | printf("ACTION: STATE_SET\nACTION-STATE: %s %g\n", |
1119 | str, edje_edit_program_value_get(ed, program)); | 1119 | str, edje_edit_program_value_get(ed, pprogram)); |
1120 | else | 1120 | else |
1121 | printf(INDENT3 "action: STATE_SET \"%s\" %2.1f;\n", | 1121 | printf(INDENT3 "action: STATE_SET \"%s\" %2.1f;\n", |
1122 | str, edje_edit_program_value_get(ed, program)); | 1122 | str, edje_edit_program_value_get(ed, pprogram)); |
1123 | edje_edit_string_free(str); | 1123 | edje_edit_string_free(str); |
1124 | break; | 1124 | break; |
1125 | case EDJE_ACTION_TYPE_SIGNAL_EMIT: | 1125 | case EDJE_ACTION_TYPE_SIGNAL_EMIT: |
1126 | str = edje_edit_program_state_get(ed, program); | 1126 | str = edje_edit_program_state_get(ed, pprogram); |
1127 | str2 = edje_edit_program_state2_get(ed, program); | 1127 | str2 = edje_edit_program_state2_get(ed, pprogram); |
1128 | if (machine) | 1128 | if (machine) |
1129 | printf("ACTION: SIGNAL_EMIT\nACTION-SIGNAL: %s\n" | 1129 | printf("ACTION: SIGNAL_EMIT\nACTION-SIGNAL: %s\n" |
1130 | "ACTION-SOURCE: %s\n", | 1130 | "ACTION-SOURCE: %s\n", |
@@ -1146,7 +1146,7 @@ program_details(Evas_Object *ed, const char *program) | |||
1146 | //~ eina_strbuf_append(buf, I4"action: DRAG_VAL_PAGE TODO;\n"); | 1146 | //~ eina_strbuf_append(buf, I4"action: DRAG_VAL_PAGE TODO;\n"); |
1147 | //~ break; | 1147 | //~ break; |
1148 | default: | 1148 | default: |
1149 | ERR("Unhandled program action type %d", type); | 1149 | ERR("Unhandled pprogram action type %d", type); |
1150 | break; | 1150 | break; |
1151 | } | 1151 | } |
1152 | 1152 | ||
@@ -1154,11 +1154,11 @@ program_details(Evas_Object *ed, const char *program) | |||
1154 | { | 1154 | { |
1155 | double from, range; | 1155 | double from, range; |
1156 | 1156 | ||
1157 | from = edje_edit_program_transition_time_get(ed, program); | 1157 | from = edje_edit_program_transition_time_get(ed, pprogram); |
1158 | if (from > 0.0) | 1158 | if (from > 0.0) |
1159 | { | 1159 | { |
1160 | str = _transition_name_get | 1160 | str = _transition_name_get |
1161 | (edje_edit_program_transition_get(ed, program)); | 1161 | (edje_edit_program_transition_get(ed, pprogram)); |
1162 | if (machine) | 1162 | if (machine) |
1163 | printf("TRANSITION-NAME: %s\nTRANSITION-DURATION: %g\n", | 1163 | printf("TRANSITION-NAME: %s\nTRANSITION-DURATION: %g\n", |
1164 | str, from); | 1164 | str, from); |
@@ -1166,8 +1166,8 @@ program_details(Evas_Object *ed, const char *program) | |||
1166 | /* do not free str! */ | 1166 | /* do not free str! */ |
1167 | } | 1167 | } |
1168 | 1168 | ||
1169 | from = edje_edit_program_in_from_get(ed, program); | 1169 | from = edje_edit_program_in_from_get(ed, pprogram); |
1170 | range = edje_edit_program_in_range_get(ed, program); | 1170 | range = edje_edit_program_in_range_get(ed, pprogram); |
1171 | if (FDIFF(from, 0.0) || FDIFF(range, 0.0)) | 1171 | if (FDIFF(from, 0.0) || FDIFF(range, 0.0)) |
1172 | { | 1172 | { |
1173 | if (machine) | 1173 | if (machine) |
@@ -1176,13 +1176,13 @@ program_details(Evas_Object *ed, const char *program) | |||
1176 | } | 1176 | } |
1177 | } | 1177 | } |
1178 | 1178 | ||
1179 | lst = edje_edit_program_targets_get(ed, program); | 1179 | lst = edje_edit_program_targets_get(ed, pprogram); |
1180 | EINA_LIST_FOREACH(lst, l, str) | 1180 | EINA_LIST_FOREACH(lst, l, str) |
1181 | if (machine) printf("TARGET: %s\n", str); | 1181 | if (machine) printf("TARGET: %s\n", str); |
1182 | else printf(INDENT3 "target: \"%s\";\n", str); | 1182 | else printf(INDENT3 "target: \"%s\";\n", str); |
1183 | edje_edit_string_list_free(lst); | 1183 | edje_edit_string_list_free(lst); |
1184 | 1184 | ||
1185 | lst = edje_edit_program_afters_get(ed, program); | 1185 | lst = edje_edit_program_afters_get(ed, pprogram); |
1186 | EINA_LIST_FOREACH(lst, l, str) | 1186 | EINA_LIST_FOREACH(lst, l, str) |
1187 | if (machine) printf("AFTER: %s\n", str); | 1187 | if (machine) printf("AFTER: %s\n", str); |
1188 | else printf(INDENT3 "after: \"%s\";\n", str); | 1188 | else printf(INDENT3 "after: \"%s\";\n", str); |
diff --git a/libraries/edje/src/bin/edje_multisense_convert.c b/libraries/edje/src/bin/edje_multisense_convert.c index d37d218..62c2f67 100644 --- a/libraries/edje/src/bin/edje_multisense_convert.c +++ b/libraries/edje/src/bin/edje_multisense_convert.c | |||
@@ -12,7 +12,7 @@ | |||
12 | # endif | 12 | # endif |
13 | 13 | ||
14 | Edje_Sound_Encode * | 14 | Edje_Sound_Encode * |
15 | _edje_multisense_encode(const char *filename, Edje_Sound_Sample *sample, double quality) | 15 | _edje_multisense_encode(const char *filename, Edje_Sound_Sample *sample, double quality __UNUSED__) |
16 | { | 16 | { |
17 | SF_INFO sfinfo; | 17 | SF_INFO sfinfo; |
18 | SNDFILE* sfile; | 18 | SNDFILE* sfile; |
diff --git a/libraries/edje/src/bin/epp/Makefile.in b/libraries/edje/src/bin/epp/Makefile.in index 2ef2e56..c1a8ee5 100644 --- a/libraries/edje/src/bin/epp/Makefile.in +++ b/libraries/edje/src/bin/epp/Makefile.in | |||
@@ -225,8 +225,6 @@ PACKAGE_URL = @PACKAGE_URL@ | |||
225 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 225 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
226 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 226 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
227 | PKG_CONFIG = @PKG_CONFIG@ | 227 | PKG_CONFIG = @PKG_CONFIG@ |
228 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
229 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
230 | PYTHON = @PYTHON@ | 228 | PYTHON = @PYTHON@ |
231 | PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ | 229 | PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ |
232 | PYTHON_PLATFORM = @PYTHON_PLATFORM@ | 230 | PYTHON_PLATFORM = @PYTHON_PLATFORM@ |
diff --git a/libraries/edje/src/bin/epp/cppmain.c b/libraries/edje/src/bin/epp/cppmain.c index 45b67b5..ea0a0b2 100644 --- a/libraries/edje/src/bin/epp/cppmain.c +++ b/libraries/edje/src/bin/epp/cppmain.c | |||
@@ -44,7 +44,9 @@ main(int argc, char **argv) | |||
44 | int argi = 1; /* Next argument to handle. */ | 44 | int argi = 1; /* Next argument to handle. */ |
45 | struct cpp_options *opts = &options; | 45 | struct cpp_options *opts = &options; |
46 | enum cpp_token kind; | 46 | enum cpp_token kind; |
47 | int got_text; | 47 | #if EPP_DEBUG |
48 | int got_text = 0; | ||
49 | #endif | ||
48 | 50 | ||
49 | p = argv[0] + strlen(argv[0]); | 51 | p = argv[0] + strlen(argv[0]); |
50 | #ifndef __EMX__ | 52 | #ifndef __EMX__ |
@@ -76,7 +78,6 @@ main(int argc, char **argv) | |||
76 | else if (!freopen(opts->out_fname, "w", stdout)) | 78 | else if (!freopen(opts->out_fname, "w", stdout)) |
77 | cpp_pfatal_with_name(&parse_in, opts->out_fname); | 79 | cpp_pfatal_with_name(&parse_in, opts->out_fname); |
78 | 80 | ||
79 | got_text = 0; | ||
80 | for (i = 0;; i++) | 81 | for (i = 0;; i++) |
81 | { | 82 | { |
82 | kind = cpp_get_token(&parse_in); | 83 | kind = cpp_get_token(&parse_in); |
@@ -108,7 +109,9 @@ main(int argc, char **argv) | |||
108 | case CPP_COMMA: | 109 | case CPP_COMMA: |
109 | case CPP_SEMICOLON: | 110 | case CPP_SEMICOLON: |
110 | case CPP_3DOTS: | 111 | case CPP_3DOTS: |
111 | got_text = 1; | 112 | #if EPP_DEBUG |
113 | got_text = 1; | ||
114 | #endif | ||
112 | continue; | 115 | continue; |
113 | 116 | ||
114 | case CPP_COMMENT: | 117 | case CPP_COMMENT: |
@@ -130,7 +133,9 @@ main(int argc, char **argv) | |||
130 | exit(FATAL_EXIT_CODE); | 133 | exit(FATAL_EXIT_CODE); |
131 | } | 134 | } |
132 | parse_in.limit = parse_in.token_buffer; | 135 | parse_in.limit = parse_in.token_buffer; |
133 | got_text = 0; | 136 | #if EPP_DEBUG |
137 | got_text = 0; | ||
138 | #endif | ||
134 | } | 139 | } |
135 | 140 | ||
136 | done: | 141 | done: |