[EGIT] [core/elementary] master 01/01: test/scroller: apply coding style.
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=bfff1b9f9ac4ff820a5df5cf7a2876c699a55392
commit bfff1b9f9ac4ff820a5df5cf7a2876c699a55392
Author: Daniel Zaoui daniel.za...@samsung.com
Date: Wed May 20 09:09:46 2015 +0300
test/scroller: apply coding style.
---
src/bin/test_scroller.c | 148
1 file changed, 74 insertions(+), 74 deletions(-)
diff --git a/src/bin/test_scroller.c b/src/bin/test_scroller.c
index 470a1f4..23b2e32 100644
--- a/src/bin/test_scroller.c
+++ b/src/bin/test_scroller.c
@@ -3,32 +3,32 @@
#endif
#include Elementary.h
-void
-my_bt_go_300_300(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+_my_bt_go_300_300(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
elm_scroller_region_bring_in((Evas_Object *)data, 300, 300, 318, 318);
}
-void
-my_bt_go_900_300(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+_my_bt_go_900_300(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
elm_scroller_region_bring_in((Evas_Object *)data, 900, 300, 318, 318);
}
-void
-my_bt_go_300_900(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+_my_bt_go_300_900(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
elm_scroller_region_bring_in((Evas_Object *)data, 300, 900, 318, 318);
}
-void
-my_bt_go_900_900(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+_my_bt_go_900_900(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
elm_scroller_region_bring_in((Evas_Object *)data, 900, 900, 318, 318);
}
-void
-my_bt_freeze_toggle(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
+static void
+_my_bt_freeze_toggle(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
{
if (elm_check_state_get(obj))
elm_object_scroll_freeze_push((Evas_Object *)data);
@@ -36,8 +36,8 @@ my_bt_freeze_toggle(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
elm_object_scroll_freeze_pop((Evas_Object *)data);
}
-void
-my_bt_hold_toggle(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
+static void
+_my_bt_hold_toggle(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
{
if (elm_check_state_get(obj))
elm_object_scroll_hold_push((Evas_Object *)data);
@@ -45,8 +45,8 @@ my_bt_hold_toggle(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
elm_object_scroll_hold_pop((Evas_Object *)data);
}
-void
-my_bt_block_movements_x_axis(void *data, Evas_Object *obj,
+static void
+_my_bt_block_movements_x_axis(void *data, Evas_Object *obj,
void *event_info EINA_UNUSED)
{
Elm_Scroller_Movement_Block block;
@@ -71,8 +71,8 @@ my_bt_block_movements_x_axis(void *data, Evas_Object *obj,
}
}
-void
-my_bt_snap_to_pages(void *data,
+static void
+_my_bt_snap_to_pages(void *data,
Evas_Object *obj,
void *event_info EINA_UNUSED)
{
@@ -86,8 +86,8 @@ my_bt_snap_to_pages(void *data,
}
}
-void
-my_bt_block_movements_y_axis(void *data, Evas_Object *obj,
+static void
+_my_bt_block_movements_y_axis(void *data, Evas_Object *obj,
void *event_info EINA_UNUSED)
{
Elm_Scroller_Movement_Block block;
@@ -112,8 +112,8 @@ my_bt_block_movements_y_axis(void *data, Evas_Object *obj,
}
}
-void
-my_bt_loop_x_axis(void *data, Evas_Object *obj EINA_UNUSED,
+static void
+_my_bt_loop_x_axis(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Eina_Bool loop_h, loop_v;
@@ -123,8 +123,8 @@ my_bt_loop_x_axis(void *data, Evas_Object *obj EINA_UNUSED,
elm_scroller_loop_set(scroller, !loop_h, loop_v);
}
-void
-my_bt_loop_y_axis(void *data, Evas_Object *obj EINA_UNUSED,
+static void
+_my_bt_loop_y_axis(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Eina_Bool loop_h, loop_v;
@@ -134,8 +134,8 @@ my_bt_loop_y_axis(void *data, Evas_Object *obj EINA_UNUSED,
elm_scroller_loop_set(scroller, loop_h, !loop_v);
}
-void
-page_change_cb(void *data EINA_UNUSED,
+static void
+_page_change_cb(void *data EINA_UNUSED,
Evas_Object *obj,
void *event_info EINA_UNUSED)
{
@@ -146,7 +146,7 @@ page_change_cb(void *data EINA_UNUSED,
printf(Page changed to %d, %d\n, page_x, page_y);
}
-void
+static void
_sc_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void
*event_info EINA_UNUSED)
{
Evas_Coord x = 0, y = 0;
@@ -154,7 +154,7 @@ _sc_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object
*obj, void *event_info
evas_object_move(data, x, y);
}
-void
+static void
_sc_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void
*event_info
[EGIT] [core/efl] master 01/01: Eolian/Generator: support eot files
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e41d1f2cb4bac7a7e33b3f2d5b5abac0222498b8
commit e41d1f2cb4bac7a7e33b3f2d5b5abac0222498b8
Author: Daniel Zaoui daniel.za...@samsung.com
Date: Wed May 20 10:34:58 2015 +0300
Eolian/Generator: support eot files
---
src/bin/eolian/main.c| 18 --
src/tests/eolian/data/import_types_ref.h | 17 +
src/tests/eolian/eolian_generation.c | 18 ++
3 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c
index e45d2a7..b198a23 100644
--- a/src/bin/eolian/main.c
+++ b/src/bin/eolian/main.c
@@ -304,6 +304,9 @@ static int gen_opt = NO_WAY_GEN;
static int eo_needed = 0;
static int legacy_support = 0;
+#define EO_SUFFIX .eo
+#define EOT_SUFFIX .eot
+
int main(int argc, char **argv)
{
int ret = 1;
@@ -311,6 +314,7 @@ int main(int argc, char **argv)
const char *eo_filename = NULL;
char *output_filename = NULL; /* if NULL, have to generate, otherwise use
the name stored there */
char *eo_filename_copy = NULL, *eo_file_basename;
+ Eina_Bool is_eo = EINA_FALSE;
eina_init();
eolian_init();
@@ -391,7 +395,16 @@ int main(int argc, char **argv)
goto end;
}
- if (!eolian_eo_file_parse(eo_filename))
+ is_eo = eina_str_has_suffix(eo_filename, EO_SUFFIX);
+
+ if (!is_eo !eina_str_has_suffix(eo_filename, EOT_SUFFIX))
+ {
+ERR(The input file %s doesn't have a correct extension
(.eo/.eot).\n, eo_filename);
+goto end;
+ }
+
+ if ((is_eo !eolian_eo_file_parse(eo_filename)) ||
+ (!is_eo !eolian_eot_file_parse(eo_filename)))
{
ERR(Error during parsing file %s\n, eo_filename);
goto end;
@@ -411,7 +424,8 @@ int main(int argc, char **argv)
if (class) eolian_show_class(class);
}
- if (!eo_needed !(gen_opt == H_GEN legacy_support))
+ /* Only needed for .eo files */
+ if (is_eo !eo_needed !(gen_opt == H_GEN legacy_support))
{
ERR(Eo flag is not specified (use --eo). Aborting eo generation.\n);
goto end;
diff --git a/src/tests/eolian/data/import_types_ref.h
b/src/tests/eolian/data/import_types_ref.h
new file mode 100644
index 000..9dcb3cd
--- /dev/null
+++ b/src/tests/eolian/data/import_types_ref.h
@@ -0,0 +1,17 @@
+#ifndef _EOLIAN_IMPORT_TYPES_H_
+#define _EOLIAN_IMPORT_TYPES_H_
+
+#ifndef _IMPORT_TYPES_EOT_TYPES
+#define _IMPORT_TYPES_EOT_TYPES
+
+typedef int Imported;
+
+typedef struct _Imported_Struct
+{
+ float foo;
+} Imported_Struct;
+
+
+#endif
+
+#endif
diff --git a/src/tests/eolian/eolian_generation.c
b/src/tests/eolian/eolian_generation.c
index 40ddb74..7c35565 100644
--- a/src/tests/eolian/eolian_generation.c
+++ b/src/tests/eolian/eolian_generation.c
@@ -175,6 +175,23 @@ START_TEST(eolian_functions_descriptions)
}
END_TEST
+START_TEST(eolian_import)
+{
+ char output_filepath[PATH_MAX] = ;
+ snprintf(output_filepath, PATH_MAX, %s/eolian_import_types.h,
+#ifdef HAVE_EVIL
+ (char *)evil_tmpdir_get()
+#else
+ /tmp
+#endif
+ );
+ remove(output_filepath);
+ fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR/data/import_types.eot,
--gh, output_filepath));
+ fail_if(!_files_compare(PACKAGE_DATA_DIR/data/import_types_ref.h,
output_filepath));
+ remove(output_filepath);
+}
+END_TEST
+
void eolian_generation_test(TCase *tc)
{
tcase_add_test(tc, eolian_types_generation);
@@ -182,5 +199,6 @@ void eolian_generation_test(TCase *tc)
tcase_add_test(tc, eolian_override_generation);
tcase_add_test(tc, eolian_dev_impl_code);
tcase_add_test(tc, eolian_functions_descriptions);
+ tcase_add_test(tc, eolian_import);
}
--
[EGIT] [core/elementary] master 01/01: Adjust usage of eo_constructor() according to recent changes.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=a96fb467a291a59e7b78ccb4126654a664f01ee4
commit a96fb467a291a59e7b78ccb4126654a664f01ee4
Author: Tom Hacohen t...@stosb.com
Date: Tue May 19 13:34:07 2015 +0100
Adjust usage of eo_constructor() according to recent changes.
---
src/lib/elc_ctxpopup.c | 12
src/lib/elc_fileselector.c | 6 --
src/lib/elc_fileselector_button.c | 6 --
src/lib/elc_fileselector_entry.c| 6 --
src/lib/elc_hoversel.c | 12
src/lib/elc_multibuttonentry.c | 12
src/lib/elc_naviframe.c | 12
src/lib/elc_player.c| 6 --
src/lib/elc_popup.c | 12
src/lib/elm_access.c| 6 --
src/lib/elm_actionslider.c | 6 --
src/lib/elm_app_client_view.c | 4 +++-
src/lib/elm_app_server_view.c | 4 +++-
src/lib/elm_bg.c| 6 --
src/lib/elm_box.c | 6 --
src/lib/elm_bubble.c| 6 --
src/lib/elm_button.c| 6 --
src/lib/elm_calendar.c | 6 --
src/lib/elm_check.c | 6 --
src/lib/elm_clipper.c | 6 --
src/lib/elm_clock.c | 6 --
src/lib/elm_colorselector.c | 12
src/lib/elm_conform.c | 6 --
src/lib/elm_datetime.c | 6 --
src/lib/elm_dayselector.c | 12
src/lib/elm_diskselector.c | 12
src/lib/elm_entry.c | 6 --
src/lib/elm_flip.c | 6 --
src/lib/elm_flipselector.c | 12
src/lib/elm_frame.c | 6 --
src/lib/elm_gengrid.c | 12
src/lib/elm_genlist.c | 12
src/lib/elm_gesture_layer.c | 6 --
src/lib/elm_glview.c| 6 --
src/lib/elm_glview.eo | 1 -
src/lib/elm_grid.c | 6 --
src/lib/elm_hover.c | 6 --
src/lib/elm_icon.c | 6 --
src/lib/elm_image.c | 6 --
src/lib/elm_index.c | 12
src/lib/elm_interface_scrollable.c | 12
src/lib/elm_interface_scrollable.eo | 1 -
src/lib/elm_inwin.c | 8 +---
src/lib/elm_label.c | 6 --
src/lib/elm_layout.c| 6 --
src/lib/elm_list.c | 12
src/lib/elm_map.c | 6 --
src/lib/elm_mapbuf.c| 6 --
src/lib/elm_menu.c | 12
src/lib/elm_notify.c| 6 --
src/lib/elm_panel.c | 6 --
src/lib/elm_panes.c | 6 --
src/lib/elm_photo.c | 6 --
src/lib/elm_photocam.c | 6 --
src/lib/elm_plug.c | 6 --
src/lib/elm_prefs.c | 6 --
src/lib/elm_progressbar.c | 6 --
src/lib/elm_radio.c | 6 --
src/lib/elm_route.c | 6 --
src/lib/elm_scroller.c | 6 --
src/lib/elm_segment_control.c | 12
src/lib/elm_separator.c | 6 --
src/lib/elm_slider.c| 6 --
src/lib/elm_slideshow.c | 12
src/lib/elm_spinner.c | 6 --
src/lib/elm_table.c | 6 --
src/lib/elm_thumb.c | 6 --
src/lib/elm_toolbar.c | 12
src/lib/elm_video.c | 6 --
src/lib/elm_web2.c | 6 --
src/lib/elm_widget.c| 14 +-
src/lib/elm_win.c | 16 ++--
72 files changed, 354 insertions(+), 192 deletions(-)
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index f84cc0f..f5e6740 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1180,14 +1180,16 @@ elm_ctxpopup_add(Evas_Object *parent)
return obj;
}
-EOLIAN static void
+EOLIAN static Eo *
_elm_ctxpopup_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED)
{
- eo_do_super(obj, MY_CLASS, eo_constructor());
+ obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME_LEGACY),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_POPUP_MENU));
+
+ return obj;
}
EOLIAN static void
@@ -1259,11 +1261,13 @@ _item_wrap_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UN
item-wcb.org_func_cb((void *)item-wcb.org_data, item-wcb.cobj,
EO_OBJ(item));
}
-EOLIAN static void
+EOLIAN static Eo *
[EGIT] [core/efl] master 02/02: Eo: Add a return value to eo_constructor().
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6efbfe22724eda7bcb7df916d4daf0a74400 commit 6efbfe22724eda7bcb7df916d4daf0a74400 Author: Tom Hacohen t...@stosb.com Date: Tue May 19 11:41:27 2015 +0100 Eo: Add a return value to eo_constructor(). From now on, constructors should return a value, usually the object being worked on, or NULL (if the constructor failed). This can also be used for implementing singletons, by just always returning the same object from the constructor. This is one of the final steps towards stabilizing Eo. @feature --- src/examples/eolian_cxx/colourable.c | 4 ++-- src/examples/eolian_cxx/colourable_cxx.cc| 4 ++-- src/examples/eolian_cxx/colourable_stub.h| 2 +- src/lib/ecore_audio/ecore_audio_obj.c| 5 ++--- src/lib/ecore_audio/ecore_audio_obj_in.c | 6 -- src/lib/ecore_audio/ecore_audio_obj_in_tone.c| 6 -- src/lib/ecore_audio/ecore_audio_obj_out.c| 6 -- src/lib/ecore_audio/ecore_audio_obj_out_pulse.c | 6 -- src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c| 5 +++-- src/lib/ecore_con/ecore_con.c| 6 -- src/lib/ecore_con/ecore_con_url.c| 9 + src/lib/ector/cairo/ector_cairo_surface.c| 6 -- src/lib/ector/cairo/ector_renderer_cairo_base.c | 8 +--- src/lib/ector/cairo/ector_renderer_cairo_shape.c | 6 -- .../ector/software/ector_renderer_software_gradient_linear.c | 6 -- .../ector/software/ector_renderer_software_gradient_radial.c | 6 -- src/lib/ector/software/ector_renderer_software_shape.c | 6 -- src/lib/ector/software/ector_software_surface.c | 6 -- src/lib/edje/edje_edit.c | 4 ++-- src/lib/edje/edje_smart.c| 6 -- src/lib/eio/eio_model.c | 8 +--- src/lib/emotion/emotion_smart.c | 6 -- src/lib/eo/Eo.h | 4 ++-- src/lib/eo/eo.c | 12 src/lib/eo/eo_base.eo| 1 + src/lib/eo/eo_base_class.c | 4 +++- src/lib/evas/canvas/evas_3d_camera.c | 6 -- src/lib/evas/canvas/evas_3d_light.c | 6 -- src/lib/evas/canvas/evas_3d_material.c | 6 -- src/lib/evas/canvas/evas_3d_mesh.c | 6 -- src/lib/evas/canvas/evas_3d_object.c | 6 -- src/lib/evas/canvas/evas_3d_scene.c | 6 -- src/lib/evas/canvas/evas_3d_texture.c| 6 -- src/lib/evas/canvas/evas_main.c | 6 -- src/lib/evas/canvas/evas_object_box.c| 6 -- src/lib/evas/canvas/evas_object_grid.c | 5 +++-- src/lib/evas/canvas/evas_object_image.c | 8 +--- src/lib/evas/canvas/evas_object_line.c | 6 -- src/lib/evas/canvas/evas_object_main.c | 8 +--- src/lib/evas/canvas/evas_object_polygon.c| 6 -- src/lib/evas/canvas/evas_object_rectangle.c | 6 -- src/lib/evas/canvas/evas_object_smart.c | 6 -- src/lib/evas/canvas/evas_object_smart_clipped.c | 6 +++--- src/lib/evas/canvas/evas_object_table.c | 6 -- src/lib/evas/canvas/evas_object_text.c | 6 -- src/lib/evas/canvas/evas_object_textblock.c | 6 -- src/lib/evas/canvas/evas_object_textgrid.c | 6 -- src/lib/evas/canvas/evas_object_vg.c | 6 -- src/lib/evas/canvas/evas_out.c | 8 +--- src/lib/evas/canvas/evas_vg_container.c | 6 -- src/lib/evas/canvas/evas_vg_gradient_linear.c| 6 -- src/lib/evas/canvas/evas_vg_gradient_radial.c| 6 -- src/lib/evas/canvas/evas_vg_node.c | 6 -- src/lib/evas/canvas/evas_vg_root_node.c | 6 -- src/lib/evas/canvas/evas_vg_shape.c | 6 -- src/tests/eo/composite_objects/composite_objects_comp.c | 6 -- src/tests/eo/constructors/constructors_mixin.c | 6 +++--- src/tests/eo/constructors/constructors_simple.c | 6 +++--- src/tests/eo/constructors/constructors_simple2.c
[EGIT] [core/efl] master 01/02: Ecore audio: Remove redundant constructor/destructor.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e7ed0bfcedcea87f8645107a8a0775f67227d7c1
commit e7ed0bfcedcea87f8645107a8a0775f67227d7c1
Author: Tom Hacohen t...@stosb.com
Date: Tue May 19 10:30:11 2015 +0100
Ecore audio: Remove redundant constructor/destructor.
There's no need to have a constructor/destructor that just
do the super call.
---
src/lib/ecore_audio/ecore_audio_in_sndfile.eo| 1 -
src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c | 7 ---
src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c | 12
src/lib/ecore_audio/ecore_audio_out_core_audio.eo| 2 --
4 files changed, 22 deletions(-)
diff --git a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
index 8973475..170b385 100644
--- a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
@@ -2,7 +2,6 @@ class Ecore_Audio_In_Sndfile (Ecore_Audio_In)
{
eo_prefix: ecore_audio_obj_in_sndfile;
implements {
- Eo.Base.constructor;
Eo.Base.destructor;
Ecore_Audio.source.set;
Ecore_Audio.source.get;
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
index f6c725e..599ae27 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
@@ -195,13 +195,6 @@ _ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj,
Ecore_Audio_In_Sndfile_D
}
EOLIAN static void
-_ecore_audio_in_sndfile_eo_base_constructor(Eo *eo_obj,
Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED)
-{
- eo_do_super(eo_obj, MY_CLASS, eo_constructor());
-
-}
-
-EOLIAN static void
_ecore_audio_in_sndfile_eo_base_destructor(Eo *eo_obj,
Ecore_Audio_In_Sndfile_Data *obj)
{
Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
b/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
index d358ec0..7370f18 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
@@ -216,18 +216,6 @@ _audio_io_proc_cb(AudioObjectID obj_id
EINA_UNUSED,
**/
EOLIAN static void
-_ecore_audio_out_core_audio_eo_base_constructor(Eo *obj,
Ecore_Audio_Out_Core_Audio_Data *sd EINA_UNUSED)
-{
- eo_do_super(obj, MY_CLASS, eo_constructor());
-}
-
-EOLIAN static void
-_ecore_audio_out_core_audio_eo_base_destructor(Eo *obj,
Ecore_Audio_Out_Core_Audio_Data *sd EINA_UNUSED)
-{
- eo_do_super(obj, MY_CLASS, eo_destructor());
-}
-
-EOLIAN static void
_ecore_audio_out_core_audio_ecore_audio_volume_set(Eo *obj,
Ecore_Audio_Out_Core_Audio_Data *sd EINA_UNUSED, double volume)
{
// TODO Change volume of playing inputs
diff --git a/src/lib/ecore_audio/ecore_audio_out_core_audio.eo
b/src/lib/ecore_audio/ecore_audio_out_core_audio.eo
index 13edb4b..bbb7362 100644
--- a/src/lib/ecore_audio/ecore_audio_out_core_audio.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_core_audio.eo
@@ -2,8 +2,6 @@ class Ecore_Audio_Out_Core_Audio (Ecore_Audio_Out)
{
eo_prefix: ecore_audio_obj_out_core_audio;
implements {
- Eo.Base.constructor;
- Eo.Base.destructor;
Ecore_Audio.volume.set;
Ecore_Audio_Out.input_attach;
Ecore_Audio_Out.input_detach;
--
[EGIT] [tools/erigo] master 01/01: Adapt code to Elm_Win changes - 2
yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=d2982c4a03914a1b6b1bc50084944180cf462da4
commit d2982c4a03914a1b6b1bc50084944180cf462da4
Author: Yakov Goldberg yako...@samsung.com
Date: Wed May 20 15:10:45 2015 +0300
Adapt code to Elm_Win changes - 2
---
src/bin/gui/editor.c | 4 +---
src/lib/database.h | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index 6abbf5a..7965c8c 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -3208,11 +3208,9 @@ _editor_factory_wdg_create(const char *class_name, const
Gui_Widget *focused_wdg
if (IS_WIN(wdg))
{
-op = db_mro_op_desc_get(class_name, DB_DEF_WIN_CLASS,
ELM_OBJ_WIN_CONSTRUCTOR);
+op = db_mro_op_desc_get(class_name, DB_DEF_WIN_CLASS,
ELM_OBJ_WIN_TYPE);
prop = prop_create_for_op(op);
val = prop_value_nth_get(prop, 0);
-gui_value_string_set(val, NULL);
-val = prop_value_nth_get(prop, 1);
gui_value_string_set(val, ELM_WIN_BASIC);
wdg_prop_add(wdg, prop);
diff --git a/src/lib/database.h b/src/lib/database.h
index df28024..d16081a 100644
--- a/src/lib/database.h
+++ b/src/lib/database.h
@@ -139,7 +139,7 @@ typedef struct _Container_Desc Container_Desc;
#define SIZE_HINT_WEIGHT_SET size_hint_weight
#define SIZE_HINT_ALIGN_SET size_hint_align
#define POSITION_SET position
-#define ELM_OBJ_WIN_CONSTRUCTOR constructor
+#define ELM_OBJ_WIN_TYPE type
#define FILE_SET file
#define CONTENT_SET content_set
#define ITEM_PUSH item_push
--
[EGIT] [core/enlightenment] master 02/02: use layout for theme import dialog
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=fb32300ea75bbc84cd201259689df071bb395520 commit fb32300ea75bbc84cd201259689df071bb395520 Author: Mike Blumenkrantz zm...@osg.samsung.com Date: Wed May 20 08:18:48 2015 -0400 use layout for theme import dialog fixes min sizing --- src/modules/conf_theme/e_int_config_theme_import.c | 15 ++- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/modules/conf_theme/e_int_config_theme_import.c b/src/modules/conf_theme/e_int_config_theme_import.c index 95d4dc3..98b8318 100644 --- a/src/modules/conf_theme/e_int_config_theme_import.c +++ b/src/modules/conf_theme/e_int_config_theme_import.c @@ -66,7 +66,9 @@ e_int_config_theme_import(E_Config_Dialog *parent) evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _theme_import_cb_delete, NULL); ecore_evas_name_class_set(ecore_evas_ecore_evas_get(evas_object_evas_get(win)), E, _theme_import_dialog); - o = edje_object_add(evas); + o = elm_layout_add(win); + E_EXPAND(o); + E_FILL(o); import-bg_obj = o; e_theme_edje_object_set(o, base/theme/dialog, e/widgets/dialog/main); elm_win_resize_object_add(win, o); @@ -75,7 +77,7 @@ e_int_config_theme_import(E_Config_Dialog *parent) o = e_widget_list_add(evas, 1, 1); e_widget_on_focus_hook_set(o, _theme_import_cb_wid_focus, import); import-box_obj = o; - edje_object_part_swallow(import-bg_obj, e.swallow.buttons, o); + elm_object_part_content_set(import-bg_obj, e.swallow.buttons, o); o = evas_object_rectangle_add(evas); import-event_obj = o; @@ -110,7 +112,7 @@ e_int_config_theme_import(E_Config_Dialog *parent) e_widget_size_min_get(o, w, h); evas_object_size_hint_min_set(o, w, h); - edje_object_part_swallow(import-bg_obj, e.swallow.content, o); + elm_object_part_content_set(import-bg_obj, e.swallow.content, o); evas_object_show(o); import-ok_obj = e_widget_button_add(evas, _(OK), NULL, @@ -129,13 +131,8 @@ e_int_config_theme_import(E_Config_Dialog *parent) o = import-box_obj; e_widget_size_min_get(o, w, h); evas_object_size_hint_min_set(o, w, h); - edje_object_part_swallow(import-bg_obj, e.swallow.buttons, o); + elm_object_part_content_set(import-bg_obj, e.swallow.buttons, o); - edje_object_size_min_calc(import-bg_obj, w, h); - evas_object_resize(import-bg_obj, w, h); - evas_object_resize(win, w, h); - evas_object_size_hint_min_set(win, w, h); - evas_object_size_hint_max_set(win, 9, 9); evas_object_show(win); e_win_client_icon_set(win, preferences-desktop-theme); --
[EGIT] [core/enlightenment] master 01/02: remove legacy entry widget pointer setting code
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=fc1a94216be13b0339fe0bdf86a0c46f87cceeb3
commit fc1a94216be13b0339fe0bdf86a0c46f87cceeb3
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Wed May 20 08:11:59 2015 -0400
remove legacy entry widget pointer setting code
fix T2424
---
src/bin/e_widget_entry.c | 38 --
1 file changed, 38 deletions(-)
diff --git a/src/bin/e_widget_entry.c b/src/bin/e_widget_entry.c
index bf7748d..9426830 100644
--- a/src/bin/e_widget_entry.c
+++ b/src/bin/e_widget_entry.c
@@ -8,7 +8,6 @@ struct _E_Widget_Data
void (*func)(void *data, void *data2);
void*data;
void*data2;
- Eina_Boolhave_pointer : 1;
};
/* local subsystem functions */
@@ -16,8 +15,6 @@ static void _e_wid_del_hook(Evas_Object *obj);
static void _e_wid_focus_hook(Evas_Object *obj);
static void _e_wid_disable_hook(Evas_Object *obj);
static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void
*event_info);
-static void _e_wid_in(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static void _e_wid_out(void *data, Evas *e, Evas_Object *obj, void
*event_info);
static void _e_wid_changed_cb(void *data, Evas_Object *obj, void *event_info);
static void _e_wid_keydown(void *data, Evas *e, Evas_Object *obj, void
*event_info);
static void _e_wid_movresz(void *data, Evas *e, Evas_Object *obj, void
*event_info);
@@ -81,8 +78,6 @@ e_widget_entry_add(Evas_Object *parent, char **text_location,
void (*func)(void
evas_object_show(o);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_e_wid_focus_steal, obj);
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN, _e_wid_in, obj);
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT, _e_wid_out, obj);
o = wd-o_entry;
if ((text_location) (*text_location))
@@ -199,14 +194,9 @@ static void
_e_wid_del_hook(Evas_Object *obj)
{
E_Widget_Data *wd;
- E_Pointer *p;
if (!(obj) || (!(wd = e_widget_data_get(obj
return;
- evas_object_event_callback_del(wd-o_inout, EVAS_CALLBACK_MOUSE_IN,
_e_wid_in);
- evas_object_event_callback_del(wd-o_inout, EVAS_CALLBACK_MOUSE_OUT,
_e_wid_out);
- p = e_widget_pointer_get(obj);
- if (p) e_pointer_type_pop(p, obj, NULL);
evas_object_del(wd-o_entry);
evas_object_del(wd-o_inout);
wd-o_entry = NULL;
@@ -243,34 +233,6 @@ _e_wid_focus_steal(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED
}
static void
-_e_wid_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
-{
- E_Pointer *p;
- E_Widget_Data *wd;
-
- if (!(data) || (!(wd = e_widget_data_get(data
- return;
- if (wd-have_pointer) return;
- p = e_widget_pointer_get(data);
- if (p) e_pointer_type_push(p, data, entry);
- wd-have_pointer = EINA_TRUE;
-}
-
-static void
-_e_wid_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
-{
- E_Pointer *p;
- E_Widget_Data *wd;
-
- if (!(data) || (!(wd = e_widget_data_get(data
- return;
- if (!wd-have_pointer) return;
- p = e_widget_pointer_get(data);
- if (p) e_pointer_type_pop(p, data, entry);
- wd-have_pointer = EINA_FALSE;
-}
-
-static void
_e_wid_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
Evas_Object *entry;
--
[EGIT] [tools/erigo] master 01/01: Clean up
yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=185a280f7ff743cc85fbd37e150d27961628
commit 185a280f7ff743cc85fbd37e150d27961628
Author: Yakov Goldberg yako...@samsung.com
Date: Wed May 20 15:46:04 2015 +0300
Clean up
---
src/bin/gui/editor.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index 7965c8c..278b94a 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -2592,8 +2592,7 @@ _editor_widget_clear(Gui_Widget *wdg)
static void
_wdg_parent_win_reload(const Gui_Widget *wdg)
{
- Eid *wdg_id = wdg_eid_get(wdg);
- if (!wdg_get(wdg_id)) return;
+ if (!wdg) return;
Gui_Widget *pwin = (Gui_Widget *) wdg_main_wdg_get(wdg);
if (!pwin) return;
/* Remove all Eo of current window. */
--
[EGIT] [tools/edi] master 01/01: Update to latest eolian (getting stable we hope).
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=7cdab3d5ade097ee260d652075af4a5d3b465bc5
commit 7cdab3d5ade097ee260d652075af4a5d3b465bc5
Author: Andy Williams a...@andywilliams.me
Date: Wed May 20 14:18:20 2015 +0100
Update to latest eolian (getting stable we hope).
Also mark code as a construction property
---
elm_code/src/lib/widget/elm_code_widget.c | 8 +---
elm_code/src/lib/widget/elm_code_widget.eo | 3 +++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/elm_code/src/lib/widget/elm_code_widget.c
b/elm_code/src/lib/widget/elm_code_widget.c
index 48a32a2..341f034 100644
--- a/elm_code/src/lib/widget/elm_code_widget.c
+++ b/elm_code/src/lib/widget/elm_code_widget.c
@@ -45,21 +45,23 @@ Eina_Unicode status_icons[] = {
} \
} while (0)
-EOLIAN static void
+EOLIAN static Eo *
_elm_code_widget_eo_base_constructor(Eo *obj, Elm_Code_Widget_Data *pd)
{
- eo_do_super(obj, ELM_CODE_WIDGET_CLASS, eo_constructor());
+ obj = eo_do_super_ret(obj, ELM_CODE_WIDGET_CLASS, obj, eo_constructor());
pd-cursor_line = 1;
pd-cursor_col = 1;
pd-tabstop = 8;
+
+ return obj;
}
EOLIAN static Eo *
_elm_code_widget_eo_base_finalize(Eo *obj, Elm_Code_Widget_Data *pd)
{
- eo_do_super(obj, ELM_CODE_WIDGET_CLASS, eo_finalize());
+ obj = eo_do_super_ret(obj, ELM_CODE_WIDGET_CLASS, obj, eo_finalize());
if (pd-code)
return obj;
diff --git a/elm_code/src/lib/widget/elm_code_widget.eo
b/elm_code/src/lib/widget/elm_code_widget.eo
index 1bde7c7..b9fad3b 100644
--- a/elm_code/src/lib/widget/elm_code_widget.eo
+++ b/elm_code/src/lib/widget/elm_code_widget.eo
@@ -212,6 +212,9 @@ class Elm_Code_Widget (Elm.Layout, Elm_Interface_Atspi_Text)
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
}
+ constructors {
+ .code;
+ }
events {
line,clicked;
line,gutter,clicked;
--
[EGIT] [core/elementary] master 03/03: Adapt Eo classes to use new Eolian types
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=9e1698607be968201f868ea343e3563f5d1a83f5
commit 9e1698607be968201f868ea343e3563f5d1a83f5
Author: Daniel Zaoui daniel.za...@samsung.com
Date: Wed May 20 14:15:49 2015 +0300
Adapt Eo classes to use new Eolian types
---
src/lib/elm_gengrid.eo | 6 --
src/lib/elm_gengrid_item.eo | 4 +++-
src/lib/elm_genlist.eo | 6 --
src/lib/elm_genlist_item.eo | 4 +++-
src/lib/elm_list.eo | 6 --
src/lib/elm_toolbar.eo | 4 +++-
6 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/lib/elm_gengrid.eo b/src/lib/elm_gengrid.eo
index c332e27..d688f33 100644
--- a/src/lib/elm_gengrid.eo
+++ b/src/lib/elm_gengrid.eo
@@ -1,3 +1,5 @@
+import elm_general;
+
class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
Evas.Clickable_Interface, Elm_Interface_Atspi_Widget_Action)
{
@@ -179,7 +181,7 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
@ingroup Gengrid */
}
values {
-mode: Elm_Object_Select_Mode(4); /*@ The select mode */
+mode: Elm.Object.Select_Mode(Elm.Object.Select_Mode.max); /*@ The
select mode */
}
}
@property reorder_mode {
@@ -292,7 +294,7 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
@since 1.8 */
}
values {
-mode: Elm_Object_Multi_Select_Mode(2); /*@ The multi select mode */
+mode:
Elm.Object.Multi_Select_Mode(Elm.Object.Multi_Select_Mode.max); /*@ The multi
select mode */
}
}
@property horizontal {
diff --git a/src/lib/elm_gengrid_item.eo b/src/lib/elm_gengrid_item.eo
index 3f33943..18b9868 100644
--- a/src/lib/elm_gengrid_item.eo
+++ b/src/lib/elm_gengrid_item.eo
@@ -1,3 +1,5 @@
+import elm_general;
+
class Elm.Gengrid_Item(Elm.Widget_Item)
{
eo_prefix: elm_obj_gengrid_item;
@@ -152,7 +154,7 @@ class Elm.Gengrid_Item(Elm.Widget_Item)
*/
}
values {
- mode: Elm_Object_Select_Mode(4); /*@ The selected mode */
+ mode: Elm.Object.Select_Mode(Elm.Object.Select_Mode.max);
/*@ The selected mode */
}
}
/* init { FIXME
diff --git a/src/lib/elm_genlist.eo b/src/lib/elm_genlist.eo
index 88d60e6..8a4b612 100644
--- a/src/lib/elm_genlist.eo
+++ b/src/lib/elm_genlist.eo
@@ -1,3 +1,5 @@
+import elm_general;
+
class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable,
Evas.Clickable_Interface,
Elm_Interface_Atspi_Widget_Action)
{
@@ -71,7 +73,7 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable,
Evas.Clickable_Interfac
@ingroup Genlist */
}
values {
-mode: Elm_Object_Select_Mode(4); /*@ The select mode */
+mode: Elm.Object.Select_Mode(Elm.Object.Select_Mode.max); /*@ The
select mode */
}
}
@property focus_on_selection {
@@ -239,7 +241,7 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable,
Evas.Clickable_Interfac
@since 1.8 */
}
values {
-mode: Elm_Object_Multi_Select_Mode(2); /*@ The multi select mode */
+mode:
Elm.Object.Multi_Select_Mode(Elm.Object.Multi_Select_Mode.max); /*@ The multi
select mode */
}
}
@property block_count {
diff --git a/src/lib/elm_genlist_item.eo b/src/lib/elm_genlist_item.eo
index 6179c0b..c504412 100644
--- a/src/lib/elm_genlist_item.eo
+++ b/src/lib/elm_genlist_item.eo
@@ -1,3 +1,5 @@
+import elm_general;
+
class Elm.Genlist_Item(Elm.Widget_Item)
{
eo_prefix: elm_obj_genlist_item;
@@ -267,7 +269,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
*/
}
values {
- mode: Elm_Object_Select_Mode(4); /*@ The selected mode */
+ mode: Elm.Object.Select_Mode(Elm.Object.Select_Mode.max);
/*@ The selected mode */
}
}
@property type {
diff --git a/src/lib/elm_list.eo b/src/lib/elm_list.eo
index 14de545..61ca682 100644
--- a/src/lib/elm_list.eo
+++ b/src/lib/elm_list.eo
@@ -1,3 +1,5 @@
+import elm_general;
+
class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
Elm_Interface_Atspi_Widget_Action,
Elm_Interface_Atspi_Selection)
{
@@ -67,7 +69,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
@ingroup List */
}
values {
-mode: Elm_Object_Select_Mode(4); /*@ The select mode */
+mode: Elm.Object.Select_Mode(Elm.Object.Select_Mode.max); /*@ The
select mode */
}
}
@property focus_on_selection {
@@ -159,7 +161,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
@since 1.8 */
}
values {
-mode:
[EGIT] [core/efl] master 01/01: eolian: unify inherits and dependencies for parsing purposes
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dc4c0c64f8e73622c4e5290f12e67c6db32ccb1b
commit dc4c0c64f8e73622c4e5290f12e67c6db32ccb1b
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Wed May 20 15:15:53 2015 +0100
eolian: unify inherits and dependencies for parsing purposes
---
src/lib/eolian/eo_parser.c | 62
src/lib/eolian/eolian_database.c | 25 ++--
2 files changed, 46 insertions(+), 41 deletions(-)
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 66886f6..34bf9b2 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -181,22 +181,6 @@ parse_name(Eo_Lexer *ls, Eina_Strbuf *buf)
}
static void
-parse_name_list(Eo_Lexer *ls, Eina_List **out)
-{
- Eina_Strbuf *buf = push_strbuf(ls);
- parse_name(ls, buf);
- *out = eina_list_append(*out,
- eina_stringshare_add(eina_strbuf_string_get(buf)));
- while (test_next(ls, ','))
- {
-parse_name(ls, buf);
-*out = eina_list_append(*out,
-eina_stringshare_add(eina_strbuf_string_get(buf)));
- }
- pop_strbuf(ls);
-}
-
-static void
_fill_name(const char *input, Eina_Stringshare **full_name,
Eina_Stringshare **name, Eina_List **namespaces)
{
@@ -830,8 +814,7 @@ parse_type_void(Eo_Lexer *ls)
free(fnm);
if (fname)
{
- if (!eolian_class_get_by_name(nm))
- _append_dep(ls, fname, nm, dline, dcol);
+ _append_dep(ls, fname, nm, dline, dcol);
def-type = EOLIAN_TYPE_CLASS;
}
}
@@ -1733,6 +1716,41 @@ parse_class_body(Eo_Lexer *ls, Eolian_Class_Type type)
}
static void
+_inherit_dep(Eo_Lexer *ls, Eina_Strbuf *buf)
+{
+ int dline = ls-line_number, dcol = ls-column;
+ const char *fname, *iname;
+ char *fnm;
+ eina_strbuf_reset(buf);
+ eo_lexer_context_push(ls);
+ parse_name(ls, buf);
+ iname = eina_strbuf_string_get(buf);
+ fnm = database_class_to_filename(iname);
+ if (compare_class_file(fnm, ls-filename))
+ {
+char ebuf[PATH_MAX];
+free(fnm);
+eo_lexer_context_restore(ls);
+snprintf(ebuf, sizeof(ebuf), class '%s' cannot inherit from itself,
+ iname);
+eo_lexer_syntax_error(ls, ebuf);
+ }
+ fname = eina_hash_find(_filenames, fnm);
+ free(fnm);
+ if (!fname)
+ {
+char ebuf[PATH_MAX];
+eo_lexer_context_restore(ls);
+snprintf(ebuf, sizeof(ebuf), unknown inherit '%s', iname);
+eo_lexer_syntax_error(ls, ebuf);
+ }
+ _append_dep(ls, fname, iname, dline, dcol);
+ ls-tmp.kls-inherits = eina_list_append(ls-tmp.kls-inherits,
+eina_stringshare_add(iname));
+ eo_lexer_context_pop(ls);
+}
+
+static void
parse_class(Eo_Lexer *ls, Eolian_Class_Type type)
{
Eolian_Declaration *decl;
@@ -1774,7 +1792,13 @@ parse_class(Eo_Lexer *ls, Eolian_Class_Type type)
col = ls-column;
check_next(ls, '(');
if (ls-t.token != ')')
- parse_name_list(ls, ls-tmp.kls-inherits);
+ {
+ Eina_Strbuf *ibuf = push_strbuf(ls);
+ _inherit_dep(ls, ibuf);
+ while (test_next(ls, ','))
+_inherit_dep(ls, ibuf);
+ pop_strbuf(ls);
+ }
check_match(ls, ')', '(', line, col);
}
line = ls-line_number;
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index 9e71ec0..9d8f151 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -264,10 +264,10 @@ eolian_eo_file_parse(const char *filepath)
}
}
free(bfiledup);
- /* parse dependencies first */
+ /* parse dependencies first (that includes inherits) */
depl = eina_hash_find(_depclasses, eolian_class_file_get(class));
if (!depl)
- goto inherits;
+ goto impls;
eina_hash_set(_depclasses, eolian_class_file_get(class), NULL);
EINA_LIST_FREE(depl, dep)
{
@@ -287,26 +287,7 @@ free:
}
if (failed_dep)
goto error;
- /* and then inherits */
-inherits:
- itr = eolian_class_inherits_get(class);
- EINA_ITERATOR_FOREACH(itr, inherit_name)
- {
-if (!eolian_class_get_by_name(inherit_name))
- {
- char *filename = database_class_to_filename(inherit_name);
- filepath = eina_hash_find(_filenames, filename);
- free(filename);
- if (!filepath)
- {
- fprintf(stderr, eolian: unable to find a file for class
'%s'\n,
- inherit_name);
- goto error;
- }
- if (!eolian_eo_file_parse(filepath)) goto error;
- }
- }
- eina_iterator_free(itr);
+impls:
itr =
[EGIT] [core/efl] master 01/01: eolian: test for possible duplicates in deps list
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5ca43e58c020932b8cd89b7b1641a4879243258f
commit 5ca43e58c020932b8cd89b7b1641a4879243258f
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Wed May 20 14:45:32 2015 +0100
eolian: test for possible duplicates in deps list
---
src/lib/eolian/eo_parser.c | 24
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 774bf14..66886f6 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -685,12 +685,28 @@ parse_struct_attrs(Eo_Lexer *ls, Eina_Bool is_enum,
Eina_Bool *is_extern,
static void
_append_dep(Eo_Lexer *ls, const char *fname, const char *name, int line, int
col)
{
- Eolian_Dependency *dep = calloc(1, sizeof(Eolian_Dependency));
+ Eina_Stringshare *cname = eina_stringshare_add(name);
+ Eolian_Dependency *dep;
+
+ Eina_List *deps = eina_hash_find(_depclasses, ls-filename);
+ Eina_List *l;
+ void *data;
+
+ /* check for possible duplicates while building the deplist */
+ EINA_LIST_FOREACH(deps, l, data)
+ if (data == cname)
+ {
+ eina_stringshare_del(cname);
+ return;
+ }
+
+ dep = calloc(1, sizeof(Eolian_Dependency));
FILL_BASE(dep-base, ls, line, col);
dep-filename = eina_stringshare_add(fname);
- dep-name = eina_stringshare_add(name);
- eina_hash_set(_depclasses, ls-filename, eina_list_append((Eina_List*)
- eina_hash_find(_depclasses, ls-filename), dep));
+ dep-name = cname;
+
+ deps = eina_list_append(deps, dep);
+ eina_hash_set(_depclasses, ls-filename, deps);
}
static Eolian_Type *
--
[EGIT] [tools/erigo] master 01/01: Enum management refactoring - fix 3
yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=b029ccb1f307326c1ae4b22867090305ce36d43b
commit b029ccb1f307326c1ae4b22867090305ce36d43b
Author: Yakov Goldberg yako...@samsung.com
Date: Wed May 20 17:09:00 2015 +0300
Enum management refactoring - fix 3
Clean up after common enums were moved to Eolian.
---
src/lib/database.c | 35 +--
1 file changed, 1 insertion(+), 34 deletions(-)
diff --git a/src/lib/database.c b/src/lib/database.c
index 079def7..53112e3 100644
--- a/src/lib/database.c
+++ b/src/lib/database.c
@@ -438,43 +438,10 @@ _enum_types_table_init(Eina_Hash *typedef_table)
{
/* initializing enum types */
enum_types_table =
eina_hash_string_superfast_new(_enum_types_table_free_cb);
- eina_hash_add(typedef_table, Elm_Object_Select_Mode, (void *) (uintptr_t)
GUI_TYPE_ENUM);
eina_hash_add(typedef_table, Evas_Aspect_Control, (void *) (uintptr_t)
GUI_TYPE_ENUM);
Eina_List *lst = NULL;
- Enum_Info *ei = calloc(1, sizeof(Enum_Info));
- ei-enum_name = strdup(ELM_OBJECT_SELECT_MODE_DEFAULT);
- ei-enum_val = 0;
- lst = eina_list_append(lst, ei);
- eina_hash_add(enum_table, ELM_OBJECT_SELECT_MODE_DEFAULT, ei);
-
- ei = calloc(1, sizeof(Enum_Info));
- ei-enum_name = strdup(ELM_OBJECT_SELECT_MODE_ALWAYS);
- ei-enum_val = 1;
- lst = eina_list_append(lst, ei);
- eina_hash_add(enum_table, ELM_OBJECT_SELECT_MODE_ALWAYS, ei);
-
- ei = calloc(1, sizeof(Enum_Info));
- ei-enum_name = strdup(ELM_OBJECT_SELECT_MODE_NONE);
- ei-enum_val = 2;
- lst = eina_list_append(lst, ei);
- eina_hash_add(enum_table, ELM_OBJECT_SELECT_MODE_NONE, ei);
- ei = calloc(1, sizeof(Enum_Info));
- ei-enum_name = strdup(ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
- ei-enum_val = 3;
- lst = eina_list_append(lst, ei);
- eina_hash_add(enum_table, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY, ei);
-
- ei = calloc(1, sizeof(Enum_Info));
- ei-enum_name = strdup(ELM_OBJECT_SELECT_MODE_DISPLAY_MAX);
- ei-enum_val = 4;
- lst = eina_list_append(lst, ei);
- eina_hash_add(enum_table, ELM_OBJECT_SELECT_MODE_DISPLAY_MAX, ei);
-
- eina_hash_add(enum_types_table, Elm_Object_Select_Mode, lst);
-
- lst = NULL;
- ei = calloc(1, sizeof(Enum_Info));
+ Enum_Info *ei = calloc(1, sizeof(Enum_Info));
ei-enum_name = strdup(EVAS_ASPECT_CONTROL_NONE);
ei-enum_val = 0;
lst = eina_list_append(lst, ei);
--
[EGIT] [core/efl] master 01/01: eolian: use eolian_property_values_get correctly
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a22ac701b6b705d07327ace41e9a05398ff3a466
commit a22ac701b6b705d07327ace41e9a05398ff3a466
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Wed May 20 16:39:00 2015 +0100
eolian: use eolian_property_values_get correctly
---
src/bin/eolian/eo_generator.c | 12 +++-
src/bin/eolian/impl_generator.c | 5 +++--
src/bin/eolian/legacy_generator.c | 10 ++
3 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index a9c1ae6..508eff9 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -89,12 +89,13 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
const char *rettype = NULL;
Eina_Bool ret_const = EINA_FALSE;
Eolian_Object_Scope scope = eolian_function_scope_get(func);
+ Eina_Bool is_prop = (ftype == EOLIAN_PROP_GET || ftype == EOLIAN_PROP_SET);
_class_func_env_create(class, eolian_function_name_get(func), ftype,
func_env);
rettypet = eolian_function_return_type_get(func, ftype);
if (ftype == EOLIAN_PROP_GET !rettypet)
{
-itr = eolian_function_parameters_get(func);
+itr = eolian_property_values_get(func);
/* We want to check if there is only one parameter */
if (eina_iterator_next(itr, data) !eina_iterator_next(itr, data2))
{
@@ -164,7 +165,7 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
if (!var_as_ret)
{
-itr = eolian_function_parameters_get(func);
+itr = is_prop ? eolian_property_values_get(func) :
eolian_function_parameters_get(func);
EINA_ITERATOR_FOREACH(itr, data)
{
Eolian_Function_Parameter *param = data;
@@ -366,6 +367,7 @@ eo_bind_func_generate(const Eolian_Class *class, const
Eolian_Function *funcid,
Eina_Bool is_empty = impl ? eolian_implement_is_empty(impl) :
eolian_function_is_empty(funcid, ftype);
Eina_Bool is_auto = impl ? eolian_implement_is_auto(impl) :
eolian_function_is_auto(funcid, ftype);
if (ftype != EOLIAN_PROP_GET ftype != EOLIAN_PROP_SET) ftype =
eolian_function_type_get(funcid);
+ Eina_Bool is_prop = (ftype == EOLIAN_PROP_GET || ftype == EOLIAN_PROP_SET);
Eina_Bool need_implementation = EINA_TRUE;
if (!impl_env eolian_function_is_virtual_pure(funcid, ftype))
need_implementation = EINA_FALSE;
@@ -388,7 +390,7 @@ eo_bind_func_generate(const Eolian_Class *class, const
Eolian_Function *funcid,
add_star = EINA_TRUE;
if (!rettypet)
{
- itr = eolian_function_parameters_get(funcid);
+ itr = eolian_property_values_get(funcid);
/* We want to check if there is only one parameter */
if (eina_iterator_next(itr, data) !eina_iterator_next(itr,
data2))
{
@@ -424,7 +426,7 @@ eo_bind_func_generate(const Eolian_Class *class, const
Eolian_Function *funcid,
eina_iterator_free(itr);
if (!var_as_ret)
{
-itr = eolian_function_parameters_get(funcid);
+itr = is_prop ? eolian_property_values_get(funcid) :
eolian_function_parameters_get(funcid);
EINA_ITERATOR_FOREACH(itr, data)
{
Eolian_Function_Parameter *param = data;
@@ -563,7 +565,7 @@ eo_bind_func_generate(const Eolian_Class *class, const
Eolian_Function *funcid,
if (!has_params !var_as_ret)
{
- itr = eolian_function_parameters_get(funcid);
+ itr = is_prop ? eolian_property_values_get(funcid) :
eolian_function_parameters_get(funcid);
has_params |= (eina_iterator_next(itr, data));
eina_iterator_free(itr);
}
diff --git a/src/bin/eolian/impl_generator.c b/src/bin/eolian/impl_generator.c
index 75f1266..490de91 100644
--- a/src/bin/eolian/impl_generator.c
+++ b/src/bin/eolian/impl_generator.c
@@ -16,6 +16,7 @@ _params_generate(const Eolian_Function *foo,
Eolian_Function_Type ftype, Eina_Bo
{
Eina_Iterator *itr;
Eolian_Function_Parameter *param;
+ Eina_Bool is_prop = (ftype == EOLIAN_PROP_GET || ftype == EOLIAN_PROP_SET);
eina_strbuf_reset(params);
eina_strbuf_reset(short_params);
itr = eolian_property_keys_get(foo);
@@ -42,7 +43,7 @@ _params_generate(const Eolian_Function *foo,
Eolian_Function_Type ftype, Eina_Bo
if (!var_as_ret)
{
Eina_Bool add_star = (ftype == EOLIAN_PROP_GET);
-itr = eolian_function_parameters_get(foo);
+itr = is_prop ? eolian_property_values_get(foo) :
eolian_function_parameters_get(foo);
EINA_ITERATOR_FOREACH(itr, param)
{
const Eolian_Type *ptypet = eolian_parameter_type_get(param);
@@ -147,7 +148,7 @@ _prototype_generate(const Eolian_Function *foo,
Eolian_Function_Type ftype, Eina
const Eolian_Type *rettypet =
[EGIT] [core/elementary] master 01/01: eo: remove occurences of @const_get/@const_set
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6b6ba6d2a00d11fb04c31734e0c8520c4764b90d
commit 6b6ba6d2a00d11fb04c31734e0c8520c4764b90d
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Wed May 20 17:54:54 2015 +0100
eo: remove occurences of @const_get/@const_set
---
src/lib/elm_widget.eo | 9 ++---
src/lib/elm_win.eo| 33 ++---
2 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo
index 0bde07e..65d23c2 100644
--- a/src/lib/elm_widget.eo
+++ b/src/lib/elm_widget.eo
@@ -140,12 +140,15 @@ abstract Elm.Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Accessible, Elm_Inte
@property focus_custom_chain {
set {
/*@ No description supplied by the EAPI. */
+values {
+ objs: listEvas_Object**;
+}
}
get {
/*@ No description supplied by the EAPI. */
- }
- values {
-objs: listEvas_Object * * @const_get;
+values {
+ objs: const(listEvas_Object*)*;
+}
}
}
@property can_focus {
diff --git a/src/lib/elm_win.eo b/src/lib/elm_win.eo
index aeacb5f..ed3d0e8 100644
--- a/src/lib/elm_win.eo
+++ b/src/lib/elm_win.eo
@@ -294,6 +294,10 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
ingroup Win
@since 1.9 */
legacy: elm_win_wm_rotation_available_rotations_set;
+values {
+ rotations: const(int)*; /*@ The array of rotation value. */
+ count: uint; /*@ The size of the @param rotations array. */
+}
}
get {
/*@
@@ -306,12 +310,12 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
ingroup Win
@since 1.9 */
legacy: elm_win_wm_rotation_available_rotations_get;
+values {
+ rotations: int*; /*@ The array of rotation value. */
+ count: uint; /*@ The size of the @param rotations array. */
+}
return: bool;
}
- values {
-rotations: int * @const_set; /*@ The array of rotation value. */
-count: uint; /*@ The size of the @param rotations array. */
- }
}
@property quickpanel_zone {
set {
@@ -536,6 +540,10 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
@ingroup Win
@since 1.8 */
+values {
+ profiles: const(char)**; /*@ The string array of available
profiles */
+ count: uint; /*@ The number of members in profiles */
+}
}
get {
/*@
@@ -545,12 +553,12 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
@ingroup Win
@since 1.8 */
+values {
+ profiles: char**; /*@ The string array of available profiles */
+ count: uint; /*@ The number of members in profiles */
+}
return: bool;
}
- values {
-profiles: char ** @const_set; /*@ The string array of available
profiles */
-count: uint; /*@ The number of members in profiles */
- }
}
@property focus_highlight_enabled {
set {
@@ -701,6 +709,9 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
@endcode
@ingroup Win */
+values {
+ icon: Evas_Object* @nullable; /*@ The Evas image object to use
for an icon */
+}
}
get {
/*@
@@ -712,9 +723,9 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
@return The icon object set
@ingroup Win */
- }
- values {
-icon: Evas_Object * @const_get @nullable; /*@ The Evas image
object to use for an icon */
+values {
+ icon: const(Evas_Object)* @nullable; /*@ The Evas image object
to use for an icon */
+}
}
}
@property quickpanel_priority_minor {
--
[EGIT] [core/elementary] master 01/01: Fix usage of the now removed eo_error_set().
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=152d18c2decff1fcbed4390a125d6283a5f48a5d
commit 152d18c2decff1fcbed4390a125d6283a5f48a5d
Author: Tom Hacohen t...@stosb.com
Date: Wed May 20 16:31:04 2015 +0100
Fix usage of the now removed eo_error_set().
This API has been removed from Eo.
---
src/bin/test_application_server.c | 2 +-
src/lib/elm_app_client.c | 18 +--
src/lib/elm_app_client.eo | 1 +
src/lib/elm_app_client_view.c | 46 ---
src/lib/elm_app_client_view.eo| 19 ++--
src/lib/elm_app_server.c | 17 ++-
src/lib/elm_app_server.eo | 1 +
src/lib/elm_app_server_view.c | 44 +
src/lib/elm_app_server_view.eo| 16 --
src/lib/elm_glview.c | 10 +++--
src/lib/elm_glview.eo | 1 +
src/lib/elm_inwin.c | 2 +-
src/lib/elm_widget.c | 2 +-
src/lib/elm_win.c | 16 +-
14 files changed, 106 insertions(+), 89 deletions(-)
diff --git a/src/bin/test_application_server.c
b/src/bin/test_application_server.c
index 126a285..227755f 100644
--- a/src/bin/test_application_server.c
+++ b/src/bin/test_application_server.c
@@ -101,7 +101,7 @@ _create_view_cb(Elm_App_Server *app_server, const
Eina_Value *args EINA_UNUSED,
}
view = eo_add(ELM_APP_SERVER_VIEW_CLASS, app_server,
-elm_app_server_view_constructor(NULL));
+elm_app_server_view_id_set(NULL));
eo_do(view, id = elm_app_server_view_id_get());
eo_do(app_server, pkg = elm_app_server_package_get());
diff --git a/src/lib/elm_app_client.c b/src/lib/elm_app_client.c
index c5bb560..5c4bd31 100644
--- a/src/lib/elm_app_client.c
+++ b/src/lib/elm_app_client.c
@@ -38,7 +38,7 @@ _sub_path_process(Elm_App_Client *eo, Eldbus_Message_Iter
*obj_iter, Elm_App_Cli
continue;
view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo,
- elm_app_client_view_constructor(obj_path));
+ elm_app_client_view_path_set(obj_path));
eina_hash_add(data-views, obj_path, view);
if (!loading_list)
eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_EVENT_VIEW_CREATED,
view));
@@ -160,7 +160,7 @@ _elm_app_client_constructor(Eo *eo, Elm_App_Client_Data
*data, const char *pkg)
Eldbus_Object *obj;
char *path;
- EINA_SAFETY_ON_NULL_GOTO(pkg, error);
+ EINA_SAFETY_ON_NULL_RETURN(pkg);
data-views = eina_hash_string_small_new(NULL);
@@ -177,10 +177,6 @@ _elm_app_client_constructor(Eo *eo, Elm_App_Client_Data
*data, const char *pkg)
eo, EINA_FALSE);
free(path);
-
- return;
-error:
- eo_error_set(eo);
}
static void
@@ -220,7 +216,7 @@ _create_view_cb(void *data, const Eldbus_Message *msg,
Eldbus_Pending *pending)
if (!view)
{
view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo,
- elm_app_client_view_constructor(view_path));
+ elm_app_client_view_path_set(view_path));
eina_hash_add(cdata-views, view_path, view);
eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_EVENT_VIEW_CREATED,
view));
@@ -305,6 +301,14 @@ _elm_app_client_view_open_cancel(Eo *eo EINA_UNUSED,
Elm_App_Client_Data *_pd EI
eldbus_pending_cancel(pending);
}
+EOLIAN static Eo *
+_elm_app_client_eo_base_finalize(Eo *obj, Elm_App_Client_Data *data)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(data-views, NULL);
+
+ return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+}
+
EOLIAN static void
_elm_app_client_eo_base_destructor(Eo *eo, Elm_App_Client_Data *data)
{
diff --git a/src/lib/elm_app_client.eo b/src/lib/elm_app_client.eo
index 32de834..76e15f4 100644
--- a/src/lib/elm_app_client.eo
+++ b/src/lib/elm_app_client.eo
@@ -50,6 +50,7 @@ class Elm_App_Client (Eo.Base)
}
implements {
Eo.Base.destructor;
+ Eo.Base.finalize;
}
constructors {
.constructor;
diff --git a/src/lib/elm_app_client_view.c b/src/lib/elm_app_client_view.c
index 2cc8c4f..3ad1399 100644
--- a/src/lib/elm_app_client_view.c
+++ b/src/lib/elm_app_client_view.c
@@ -13,6 +13,7 @@ typedef struct
{
Eldbus_Proxy *view_proxy;
Elm_App_View_State state;
+ Eina_Stringshare *path;
} Elm_App_Client_View_Data;
static const char *_string_prop_get(const Eina_Value *v)
@@ -126,26 +127,25 @@ elm_app_client_view_internal_state_set(Eo *eo,
Elm_App_View_State state)
(void *)(uintptr_t)cdata-state));
}
-EOLIAN static void
-_elm_app_client_view_constructor(Eo *eo, Elm_App_Client_View_Data *data, const
char *path)
+EOLIAN static Eo *
+_elm_app_client_view_eo_base_finalize(Eo *eo, Elm_App_Client_View_Data *data)
{
[EGIT] [core/efl] master 01/05: Eo base: Correct comment regarding the finalizer.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=99cb7e9ba7fe257e265b821febbacd2e8aff0616
commit 99cb7e9ba7fe257e265b821febbacd2e8aff0616
Author: Tom Hacohen t...@stosb.com
Date: Wed May 20 14:02:56 2015 +0100
Eo base: Correct comment regarding the finalizer.
---
src/lib/eo/eo_base.eo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index 5c7123c..b81ed6e 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -53,7 +53,7 @@ Should not be used with #eo_do. Only use it with
#eo_do_super. */
}
finalize {
/*@ Called at the end of #eo_add. Should not be called, just
overridden. */
- return: Eo *; /*@ The new object created, can be NULL if the finalize
func decided to abort (though it should free the created object on it's own). */
+ return: Eo *; /*@ The new object created, can be NULL if aborting */
}
wref_add {
/*@ Add a new weak reference to obj.
--
[EGIT] [core/efl] master 02/05: Ecore con url: correctly destruct the object.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=29d11200c67dd9058a5175330159b115d8ed44f0
commit 29d11200c67dd9058a5175330159b115d8ed44f0
Author: Tom Hacohen t...@stosb.com
Date: Wed May 20 14:26:02 2015 +0100
Ecore con url: correctly destruct the object.
---
src/lib/ecore_con/ecore_con_url.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/ecore_con/ecore_con_url.c
b/src/lib/ecore_con/ecore_con_url.c
index 37f5fa0..626f7d4 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -598,6 +598,7 @@ EOLIAN static void
_efl_network_url_eo_base_destructor(Efl_Network_Url *url_obj,
Efl_Network_Url_Data *url_con)
{
char *s;
+ eo_do_super(url_obj, MY_CLASS, eo_destructor());
if (!_c) return;
if (url_con-curl_easy)
--
[EGIT] [core/efl] master 03/05: Ecore con url: Fix wrong object destruction.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7c769163d9eb122412675dca621e83ed7648e60e
commit 7c769163d9eb122412675dca621e83ed7648e60e
Author: Tom Hacohen t...@stosb.com
Date: Wed May 20 15:34:37 2015 +0100
Ecore con url: Fix wrong object destruction.
Because we defer the deletion of this object until we get all the
responses from the network, we must manually free it. A better solution
would possibly be to just free the requests upon object deletion instead
of deferring the deletion.
@fix
---
src/lib/ecore_con/ecore_con_url.c | 36 +---
1 file changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/lib/ecore_con/ecore_con_url.c
b/src/lib/ecore_con/ecore_con_url.c
index 626f7d4..021b6f2 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -472,6 +472,8 @@ _efl_network_url_eo_base_constructor(Efl_Network_Url
*url_obj, Efl_Network_Url_D
return NULL;
}
+ eo_manual_free_set(url_obj, EINA_TRUE);
+
return url_obj;
}
@@ -484,7 +486,6 @@ _efl_network_url_eo_base_finalize(Efl_Network_Url *url_obj,
Efl_Network_Url_Data
if (!url_con-url)
{
-ecore_con_url_free(url_obj);
return NULL;
}
@@ -555,7 +556,7 @@ _efl_network_url_eo_base_finalize(Efl_Network_Url *url_obj,
Efl_Network_Url_Data
*/
_c-curl_easy_setopt(url_con-curl_easy, CURLOPT_CONNECTTIMEOUT, 30);
_c-curl_easy_setopt(url_con-curl_easy, CURLOPT_FOLLOWLOCATION, 1);
- return url_obj;
+ return eo_do_super_ret(url_obj, MY_CLASS, url_obj, eo_finalize());
}
EAPI Ecore_Con_Url *
@@ -594,10 +595,24 @@ ecore_con_url_free(Ecore_Con_Url *url_obj)
eo_del(url_obj);
}
+static void
+_ecore_con_url_free_internal(Ecore_Con_Url *url_obj)
+{
+ Efl_Network_Url_Data *url_con = eo_data_scope_get(url_obj, MY_CLASS);
+ char *s;
+
+ if (_c) _c-curl_slist_free_all(url_con-headers);
+ EINA_LIST_FREE(url_con-additional_headers, s)
+ free(s);
+ EINA_LIST_FREE(url_con-response_headers, s)
+ free(s);
+ eina_stringshare_del(url_con-url);
+ if (url_con-post_data) free(url_con-post_data);
+}
+
EOLIAN static void
_efl_network_url_eo_base_destructor(Efl_Network_Url *url_obj,
Efl_Network_Url_Data *url_con)
{
- char *s;
eo_do_super(url_obj, MY_CLASS, eo_destructor());
if (!_c) return;
@@ -626,13 +641,8 @@ _efl_network_url_eo_base_destructor(Efl_Network_Url
*url_obj, Efl_Network_Url_Da
url_con-dead = EINA_TRUE;
if (url_con-event_count) return;
- if (_c) _c-curl_slist_free_all(url_con-headers);
- EINA_LIST_FREE(url_con-additional_headers, s)
- free(s);
- EINA_LIST_FREE(url_con-response_headers, s)
- free(s);
- eina_stringshare_del(url_con-url);
- if (url_con-post_data) free(url_con-post_data);
+ eo_manual_free_set(url_obj, EINA_FALSE);
+ _ecore_con_url_free_internal(url_obj);
}
EOLIAN static const char *
@@ -1702,7 +1712,11 @@ _ecore_con_event_url_free(Ecore_Con_Url *url_obj, void
*ev)
free(ev);
url_con-event_count--;
- if (url_con-dead (!url_con-event_count)) ecore_con_url_free(url_obj);
+ if (url_con-dead (!url_con-event_count))
+ {
+_ecore_con_url_free_internal(url_obj);
+eo_manual_free(url_obj);
+ }
}
#include efl_network_url.eo.c
--
[EGIT] [core/efl] master 04/05: Eo: Remove eo_error_set() and clean up finalizer()
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=92fb2917cba7b91a83fbfd39b876d585921d6d3e
commit 92fb2917cba7b91a83fbfd39b876d585921d6d3e
Author: Tom Hacohen t...@stosb.com
Date: Wed May 20 14:56:45 2015 +0100
Eo: Remove eo_error_set() and clean up finalizer()
This is another cleanup in perparation for the Eo stable release.
This is no longer needed thanks to the proper error reporting with
eo_constructor()'s new return value.
The finalizer change cleans it up a bit so it catches more cases/issues.
This also means that the finalizer cleans up the object in all cases,
and not only some.
@feature.
---
src/lib/ecore/ecore_anim.c | 13 ++--
src/lib/ecore/ecore_animator.eo | 1 +
src/lib/ecore/ecore_idle_enterer.c | 13 ++--
src/lib/ecore/ecore_idle_enterer.eo | 1 +
src/lib/ecore/ecore_idle_exiter.c| 12 +--
src/lib/ecore/ecore_idle_exiter.eo | 1 +
src/lib/ecore/ecore_idler.c | 13 ++--
src/lib/ecore/ecore_idler.eo | 1 +
src/lib/ecore/ecore_job.c| 14 ++--
src/lib/ecore/ecore_job.eo | 1 +
src/lib/ecore/ecore_poller.c | 13 ++--
src/lib/ecore/ecore_poller.eo| 1 +
src/lib/ecore/ecore_timer.c | 13 ++--
src/lib/ecore/ecore_timer.eo | 1 +
src/lib/ecore_con/ecore_con_url.c| 7 ++--
src/lib/eo/Eo.h | 13
src/lib/eo/eo.c | 42 +---
src/lib/eo/eo_base_class.c | 2 +-
src/lib/eo/eo_private.h | 2 --
src/lib/evas/canvas/evas_object_image.c | 6 ++--
src/lib/evas/canvas/evas_object_main.c | 2 +-
src/lib/evas/canvas/evas_vg_node.c | 15 +
src/lib/evas/canvas/evas_vg_root_node.c | 8 +++--
src/tests/eo/constructors/constructors_simple.c | 7 ++--
src/tests/eo/constructors/constructors_simple2.c | 3 +-
src/tests/eo/constructors/constructors_simple6.c | 2 --
src/tests/eo/suite/eo_test_general.c | 2 --
27 files changed, 133 insertions(+), 76 deletions(-)
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index 14c4531..b02d905 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -177,7 +177,6 @@ _ecore_animator_add(Ecore_Animator *obj,
{
if (EINA_UNLIKELY(!eina_main_loop_is()))
{
- eo_error_set(obj);
EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE);
}
@@ -186,7 +185,6 @@ _ecore_animator_add(Ecore_Animator *obj,
if (!func)
{
-eo_error_set(obj);
ERR(callback function must be set up for an object of class: '%s',
MY_CLASS_NAME);
return EINA_FALSE;
}
@@ -526,6 +524,17 @@ _ecore_animator_eo_base_destructor(Eo *obj,
Ecore_Animator_Data *pd)
eo_do_super(obj, MY_CLASS, eo_destructor());
}
+EOLIAN static Eo *
+_ecore_animator_eo_base_finalize(Eo *obj, Ecore_Animator_Data *pd)
+{
+ if (!pd-func)
+ {
+return NULL;
+ }
+
+ return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+}
+
EAPI void
ecore_animator_frametime_set(double frametime)
{
diff --git a/src/lib/ecore/ecore_animator.eo b/src/lib/ecore/ecore_animator.eo
index 58f565c..ff1e21d 100644
--- a/src/lib/ecore/ecore_animator.eo
+++ b/src/lib/ecore/ecore_animator.eo
@@ -22,6 +22,7 @@ class Ecore.Animator (Eo.Base)
}
implements {
Eo.Base.destructor;
+ Eo.Base.finalize;
Eo.Base.event_freeze;
Eo.Base.event_thaw;
}
diff --git a/src/lib/ecore/ecore_idle_enterer.c
b/src/lib/ecore/ecore_idle_enterer.c
index 45fd601..c4091ee 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -39,7 +39,6 @@ _ecore_idle_enterer_add(Ecore_Idle_Enterer *obj,
{
if (EINA_UNLIKELY(!eina_main_loop_is()))
{
- eo_error_set(obj);
EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE);
}
@@ -48,7 +47,6 @@ _ecore_idle_enterer_add(Ecore_Idle_Enterer *obj,
if (!func)
{
-eo_error_set(obj);
ERR(callback function must be set up for an object of class: '%s',
MY_CLASS_NAME);
return EINA_FALSE;
}
@@ -135,6 +133,17 @@ _ecore_idle_enterer_eo_base_destructor(Eo *obj,
Ecore_Idle_Enterer_Data *idle_en
eo_do_super(obj, MY_CLASS, eo_destructor());
}
+EOLIAN static Eo *
+_ecore_idle_enterer_eo_base_finalize(Eo *obj, Ecore_Idle_Enterer_Data
*idle_enterer)
+{
+ if (!idle_enterer-func)
+ {
+return NULL;
+ }
+
+ return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+}
+
void
_ecore_idle_enterer_shutdown(void)
{
diff --git a/src/lib/ecore/ecore_idle_enterer.eo
[EGIT] [core/efl] master 01/01: eolian: remove const_get/const_set support
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=54974b074b4031c25947576bcf4809c66d93d858
commit 54974b074b4031c25947576bcf4809c66d93d858
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Wed May 20 18:05:45 2015 +0100
eolian: remove const_get/const_set support
This was made obsolete by per-accessor values. It was
also hacky and i've wanted to remove it for a while.
---
src/bin/eolian/eo_generator.c| 32
src/bin/eolian/impl_generator.c | 18 +
src/bin/eolian/legacy_generator.c| 27 ++--
src/bindings/luajit/eolian.lua | 5
src/lib/eolian/Eolian.h | 14 ---
src/lib/eolian/database_function_parameter_api.c | 10
src/lib/eolian/eo_lexer.h| 9 +++
src/lib/eolian/eo_parser.c | 14 ---
src/lib/eolian/eolian_database.h | 2 --
9 files changed, 28 insertions(+), 103 deletions(-)
diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index 90dfbc9..573fe1f 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -87,7 +87,6 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
Eina_Bool var_as_ret = EINA_FALSE;
const Eolian_Type *rettypet = NULL;
const char *rettype = NULL;
- Eina_Bool ret_const = EINA_FALSE;
Eolian_Object_Scope scope = eolian_function_scope_get(func);
Eina_Bool is_prop = (ftype == EOLIAN_PROP_GET || ftype == EOLIAN_PROP_SET);
@@ -101,7 +100,6 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
{
rettypet =
eolian_parameter_type_get((Eolian_Function_Parameter*)data);
var_as_ret = EINA_TRUE;
- ret_const = eolian_parameter_const_attribute_get(data, EINA_TRUE);
}
eina_iterator_free(itr);
}
@@ -176,7 +174,6 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
Eina_Bool add_star = EINA_FALSE;
Eolian_Parameter_Dir pdir = eolian_parameter_direction_get(param);
- Eina_Bool is_const = eolian_parameter_const_attribute_get(data,
ftype == EOLIAN_PROP_GET);
if (ftype == EOLIAN_PROP_GET) {
add_star = EINA_TRUE;
pdir = EOLIAN_OUT_PARAM;
@@ -190,8 +187,7 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
eina_strbuf_append_printf(str_pardesc, tmpl_eo_pardesc, dir_str,
pname, pdesc?pdesc:No description supplied.);
if (eina_strbuf_length_get(str_par)) eina_strbuf_append(str_par,
, );
- eina_strbuf_append_printf(str_par, %s%s%s%s%s,
- is_const?const :,
+ eina_strbuf_append_printf(str_par, %s%s%s%s,
ptype, had_star?: , add_star?*:, pname);
eina_stringshare_del(ptype);
@@ -202,8 +198,7 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
if (rettypet) rettype = eolian_type_c_type_get(rettypet);
tmpstr[0] = '\0';
- sprintf(tmpstr, %s%s%s,
- ret_const ? const : ,
+ sprintf(tmpstr, %s%s,
rettype ? rettype : void,
rettype strchr(rettype, '*')?: );
eina_strbuf_replace_all(str_func, @#rettype, tmpstr);
@@ -359,7 +354,6 @@ eo_bind_func_generate(const Eolian_Class *class, const
Eolian_Function *funcid,
Eina_Bool var_as_ret = EINA_FALSE;
const Eolian_Type *rettypet = NULL;
const char *rettype = NULL;
- Eina_Bool ret_const = EINA_FALSE;
Eina_Bool add_star = EINA_FALSE;
Eina_Iterator *itr;
void *data, *data2;
@@ -397,7 +391,6 @@ eo_bind_func_generate(const Eolian_Class *class, const
Eolian_Function *funcid,
Eolian_Function_Parameter *param = data;
rettypet = eolian_parameter_type_get(param);
var_as_ret = EINA_TRUE;
- ret_const = eolian_parameter_const_attribute_get(data,
EINA_TRUE);
default_ret_val = eolian_parameter_default_value_get(param);
}
eina_iterator_free(itr);
@@ -415,11 +408,9 @@ eo_bind_func_generate(const Eolian_Class *class, const
Eolian_Function *funcid,
const Eolian_Type *ptypet = eolian_parameter_type_get(param);
const char *pname = eolian_parameter_name_get(param);
const char *ptype = eolian_type_c_type_get(ptypet);
-Eina_Bool is_const = eolian_parameter_const_attribute_get(data, ftype
== EOLIAN_PROP_GET);
if (eina_strbuf_length_get(params)) eina_strbuf_append(params, , );
eina_strbuf_append_printf(params, %s, pname);
-eina_strbuf_append_printf(full_params, , %s%s %s%s,
- is_const?const :,
+
[EGIT] [core/efl] master 01/01: eolian: distinguish between get/set for property keys/values retrieval
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5c199857c911c8b301b694ae9311685ae1ff121d
commit 5c199857c911c8b301b694ae9311685ae1ff121d
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Wed May 20 17:03:14 2015 +0100
eolian: distinguish between get/set for property keys/values retrieval
---
src/bin/eolian/eo_generator.c | 16
src/bin/eolian/impl_generator.c| 6 +++---
src/bin/eolian/legacy_generator.c | 12 ++--
src/bindings/luajit/eolian.lua | 12 ++--
src/lib/eolian/Eolian.h| 6 --
src/lib/eolian/database_function_api.c | 13 ++---
src/scripts/elua/modules/lualian.lua | 21 ++---
src/tests/eolian/eolian_parsing.c | 8
8 files changed, 55 insertions(+), 39 deletions(-)
diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index 508eff9..90dfbc9 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -95,7 +95,7 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
rettypet = eolian_function_return_type_get(func, ftype);
if (ftype == EOLIAN_PROP_GET !rettypet)
{
-itr = eolian_property_values_get(func);
+itr = eolian_property_values_get(func, ftype);
/* We want to check if there is only one parameter */
if (eina_iterator_next(itr, data) !eina_iterator_next(itr, data2))
{
@@ -146,7 +146,7 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
Eina_Strbuf *str_retdesc = eina_strbuf_new();
Eina_Strbuf *str_typecheck = eina_strbuf_new();
- itr = eolian_property_keys_get(func);
+ itr = eolian_property_keys_get(func, ftype);
EINA_ITERATOR_FOREACH(itr, data)
{
Eolian_Function_Parameter *param = data;
@@ -165,7 +165,7 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
if (!var_as_ret)
{
-itr = is_prop ? eolian_property_values_get(func) :
eolian_function_parameters_get(func);
+itr = is_prop ? eolian_property_values_get(func, ftype) :
eolian_function_parameters_get(func);
EINA_ITERATOR_FOREACH(itr, data)
{
Eolian_Function_Parameter *param = data;
@@ -390,7 +390,7 @@ eo_bind_func_generate(const Eolian_Class *class, const
Eolian_Function *funcid,
add_star = EINA_TRUE;
if (!rettypet)
{
- itr = eolian_property_values_get(funcid);
+ itr = eolian_property_values_get(funcid, ftype);
/* We want to check if there is only one parameter */
if (eina_iterator_next(itr, data) !eina_iterator_next(itr,
data2))
{
@@ -408,7 +408,7 @@ eo_bind_func_generate(const Eolian_Class *class, const
Eolian_Function *funcid,
suffix = _set;
}
- itr = eolian_property_keys_get(funcid);
+ itr = eolian_property_keys_get(funcid, ftype);
EINA_ITERATOR_FOREACH(itr, data)
{
Eolian_Function_Parameter *param = data;
@@ -426,7 +426,7 @@ eo_bind_func_generate(const Eolian_Class *class, const
Eolian_Function *funcid,
eina_iterator_free(itr);
if (!var_as_ret)
{
-itr = is_prop ? eolian_property_values_get(funcid) :
eolian_function_parameters_get(funcid);
+itr = is_prop ? eolian_property_values_get(funcid, ftype) :
eolian_function_parameters_get(funcid);
EINA_ITERATOR_FOREACH(itr, data)
{
Eolian_Function_Parameter *param = data;
@@ -559,13 +559,13 @@ eo_bind_func_generate(const Eolian_Class *class, const
Eolian_Function *funcid,
Eina_Strbuf *eo_func_decl = eina_strbuf_new();
Eina_Bool has_params = EINA_FALSE;
-itr = eolian_property_keys_get(funcid);
+itr = eolian_property_keys_get(funcid, ftype);
has_params |= (eina_iterator_next(itr, data));
eina_iterator_free(itr);
if (!has_params !var_as_ret)
{
- itr = is_prop ? eolian_property_values_get(funcid) :
eolian_function_parameters_get(funcid);
+ itr = is_prop ? eolian_property_values_get(funcid, ftype) :
eolian_function_parameters_get(funcid);
has_params |= (eina_iterator_next(itr, data));
eina_iterator_free(itr);
}
diff --git a/src/bin/eolian/impl_generator.c b/src/bin/eolian/impl_generator.c
index 490de91..5891ae0 100644
--- a/src/bin/eolian/impl_generator.c
+++ b/src/bin/eolian/impl_generator.c
@@ -19,7 +19,7 @@ _params_generate(const Eolian_Function *foo,
Eolian_Function_Type ftype, Eina_Bo
Eina_Bool is_prop = (ftype == EOLIAN_PROP_GET || ftype == EOLIAN_PROP_SET);
eina_strbuf_reset(params);
eina_strbuf_reset(short_params);
- itr = eolian_property_keys_get(foo);
+ itr = eolian_property_keys_get(foo, ftype);
EINA_ITERATOR_FOREACH(itr, param)
{
const
[EGIT] [core/efl] master 01/02: ecore-input: add keysym to Ecore_Event_Key struct
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c3f3c4eba80f0a7f388de608f2b1566213e73603
commit c3f3c4eba80f0a7f388de608f2b1566213e73603
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Wed May 20 14:38:38 2015 -0400
ecore-input: add keysym to Ecore_Event_Key struct
currently only functional for x11, wl, drm
@feature
---
src/lib/ecore_drm/ecore_drm_evdev.c| 1 +
src/lib/ecore_input/Ecore_Input.h | 1 +
src/lib/ecore_wayland/ecore_wl_input.c | 1 +
src/lib/ecore_x/xcb/ecore_xcb_events.c | 1 +
src/lib/ecore_x/xlib/ecore_x_events.c | 1 +
5 files changed, 5 insertions(+)
diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c
b/src/lib/ecore_drm/ecore_drm_evdev.c
index e40ad40..ec50509 100644
--- a/src/lib/ecore_drm/ecore_drm_evdev.c
+++ b/src/lib/ecore_drm/ecore_drm_evdev.c
@@ -361,6 +361,7 @@ _device_handle_key(struct libinput_device *device, struct
libinput_event_keyboar
e-timestamp = timestamp;
e-same_screen = 1;
e-keycode = code;
+ e-keysym = sym;
_device_modifiers_update(edev);
diff --git a/src/lib/ecore_input/Ecore_Input.h
b/src/lib/ecore_input/Ecore_Input.h
index f58c56e..f944006 100644
--- a/src/lib/ecore_input/Ecore_Input.h
+++ b/src/lib/ecore_input/Ecore_Input.h
@@ -152,6 +152,7 @@ extern C {
unsigned int keycode; /** Key scan code numeric value @since 1.10
*/
void*data; /** User data associated with an
Ecore_Event_Key @since 1.10 */
+unsigned int keysym; /** Encoding of keyboard symbold @since 1.15
*/
};
/**
diff --git a/src/lib/ecore_wayland/ecore_wl_input.c
b/src/lib/ecore_wayland/ecore_wl_input.c
index 7813a15..58d1030 100755
--- a/src/lib/ecore_wayland/ecore_wl_input.c
+++ b/src/lib/ecore_wayland/ecore_wl_input.c
@@ -827,6 +827,7 @@ _ecore_wl_input_cb_keyboard_key(void *data, struct
wl_keyboard *keyboard EINA_UN
e-timestamp = timestamp;
e-modifiers = input-modifiers;
e-keycode = code;
+ e-keysym = sym;
if (state)
ecore_event_add(ECORE_EVENT_KEY_DOWN, e, NULL, NULL);
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_events.c
b/src/lib/ecore_x/xcb/ecore_xcb_events.c
index 0b71451..fdd17da 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_events.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_events.c
@@ -2422,6 +2422,7 @@ _ecore_xcb_event_key_press(xcb_generic_event_t *event)
e-same_screen = xevent-same_screen;
e-root_window = xevent-root;
e-keycode = keycode;
+e-keysym = sym;
DBG(Sending Key Down Event: %s, e-keyname);
ecore_event_add(ECORE_EVENT_KEY_DOWN, e, NULL, NULL);
diff --git a/src/lib/ecore_x/xlib/ecore_x_events.c
b/src/lib/ecore_x/xlib/ecore_x_events.c
index 8ab79a4..9864074 100644
--- a/src/lib/ecore_x/xlib/ecore_x_events.c
+++ b/src/lib/ecore_x/xlib/ecore_x_events.c
@@ -393,6 +393,7 @@ _ecore_key_press(int event,
e-same_screen = xevent-same_screen;
e-root_window = xevent-root;
e-keycode = xevent-keycode;
+ e-keysym = sym;
ecore_event_add(event, e, NULL, NULL);
--
[EGIT] [core/efl] master 01/01: ecore-wl: Set keycode in event structure for key down/up
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ae6ec069916c17df7525e060b23356a48912738a commit ae6ec069916c17df7525e060b23356a48912738a Author: Chris Michael cp.mich...@samsung.com Date: Wed May 20 14:42:03 2015 -0400 ecore-wl: Set keycode in event structure for key down/up Summary: When we generate an Ecore key down/up event, we should also be setting the keycode in the event structure @fix Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/lib/ecore_wayland/ecore_wl_input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/ecore_wayland/ecore_wl_input.c b/src/lib/ecore_wayland/ecore_wl_input.c index 61c32b4..7813a15 100755 --- a/src/lib/ecore_wayland/ecore_wl_input.c +++ b/src/lib/ecore_wayland/ecore_wl_input.c @@ -826,6 +826,7 @@ _ecore_wl_input_cb_keyboard_key(void *data, struct wl_keyboard *keyboard EINA_UN e-event_window = win-id; e-timestamp = timestamp; e-modifiers = input-modifiers; + e-keycode = code; if (state) ecore_event_add(ECORE_EVENT_KEY_DOWN, e, NULL, NULL); --
[EGIT] [core/elementary] master 01/01: elm_genlist: fix implementation of genlist tooltip functions
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2c2761dd2ab98de2a2ac47494d3f9bf091a97488
commit 2c2761dd2ab98de2a2ac47494d3f9bf091a97488
Author: Aleksey Karmanov a.karma...@samsung.com
Date: Thu May 21 10:22:23 2015 +0900
elm_genlist: fix implementation of genlist tooltip functions
Summary:
elm_genlist_item_tooltip_style_get
elm_genlist_item_tooltip_window_mode_get
@fix
Reviewers: artem.popov, myoungwoon, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D2530
---
src/lib/elm_genlist.c | 6 ++
src/lib/elm_genlist_item.eo | 1 +
2 files changed, 7 insertions(+)
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 45a3dfd..0c31158 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -7094,6 +7094,12 @@ elm_genlist_item_tooltip_window_mode_get(const
Elm_Object_Item *eo_it)
return eo_do_ret(eo_it, ret, elm_wdg_item_tooltip_window_mode_get());
}
+EOLIAN static Eina_Bool
+_elm_genlist_item_elm_widget_item_tooltip_window_mode_get(Eo *eo_it
EINA_UNUSED, Elm_Gen_Item *it)
+{
+ return it-tooltip.free_size;
+}
+
EAPI void
elm_genlist_item_cursor_set(Elm_Object_Item *item,
const char *cursor)
diff --git a/src/lib/elm_genlist_item.eo b/src/lib/elm_genlist_item.eo
index c504412..e95869c 100644
--- a/src/lib/elm_genlist_item.eo
+++ b/src/lib/elm_genlist_item.eo
@@ -502,6 +502,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
Elm.Widget_Item.tooltip_style.set;
Elm.Widget_Item.tooltip_style.get;
Elm.Widget_Item.tooltip_window_mode.set;
+ Elm.Widget_Item.tooltip_window_mode.get;
Elm.Widget_Item.tooltip_content_cb_set;
Elm.Widget_Item.tooltip_unset;
Elm.Widget_Item.cursor.set;
--
[EGIT] [tools/edi] master 01/01: Fix crash if closing with no project open
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=b4cd9cb4a171a095dbe0c2af1fa2f86e122dc695
commit b4cd9cb4a171a095dbe0c2af1fa2f86e122dc695
Author: Andy Williams a...@andywilliams.me
Date: Wed May 20 23:26:29 2015 +0100
Fix crash if closing with no project open
---
src/bin/edi_config.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/edi_config.c b/src/bin/edi_config.c
index 4d7cd6d..1ff66d7 100644
--- a/src/bin/edi_config.c
+++ b/src/bin/edi_config.c
@@ -257,7 +257,8 @@ Eina_Bool
_edi_config_shutdown(void)
{
_edi_config_cb_free();
- _edi_project_config_cb_free();
+ if (_edi_project_config)
+ _edi_project_config_cb_free();
EDI_CONFIG_DD_FREE(_edi_cfg_proj_edd);
EDI_CONFIG_DD_FREE(_edi_cfg_mime_edd);
--
[EGIT] [tools/enventor] master 01/01: auto_comp: +precise_is_inside
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=49a2a87c6f50207fb979f3982f05d52fca584e5e
commit 49a2a87c6f50207fb979f3982f05d52fca584e5e
Author: ChunEon Park her...@hermet.pe.kr
Date: Thu May 21 11:07:43 2015 +0900
auto_comp: +precise_is_inside
---
src/lib/auto_comp_code.h | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/lib/auto_comp_code.h b/src/lib/auto_comp_code.h
index 1227e69..88d2cd2 100644
--- a/src/lib/auto_comp_code.h
+++ b/src/lib/auto_comp_code.h
@@ -55,6 +55,12 @@ const char *AUTOCOMP_TYPE[AUTOCOMP_TYPE_LINE_CNT] =
type: IMAGE;,
};
+#define AUTOCOMP_TYPE_PRECISE_IS_INSIDE_CNT 1
+const char *AUTOCOMP_TYPE[AUTOCOMP_TYPE_PRECISE_IS_INSIDE_CNT] =
+{
+ precise_is_inside: ;,
+};
+
#define AUTOCOMP_INHERIT_LINE_CNT 1
const char *AUTOCOMP_INHERIT[AUTOCOMP_INHERIT_LINE_CNT] =
{
@@ -437,4 +443,4 @@ const char
*AUTOCOMP_ANTI_ALIAS[AUTOCOMP_ANTI_ALIAS_LINE_CNT] =
anti_alias: ;,
};
-#define COMPSET_CNT 67
+#define COMPSET_CNT 68
--
[EGIT] [tools/erigo] master 01/01: Add Elm.Win.type property to default values
yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=e967115b05244affe98cb4c4620f91a318e0be6c
commit e967115b05244affe98cb4c4620f91a318e0be6c
Author: Yakov Goldberg yako...@samsung.com
Date: Wed May 20 17:26:54 2015 +0300
Add Elm.Win.type property to default values
---
data/config/func_names.json | 1 +
src/bin/gui/editor.c| 6 --
src/lib/database.h | 1 -
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/data/config/func_names.json b/data/config/func_names.json
index 7d8cfab..fe83098 100644
--- a/data/config/func_names.json
+++ b/data/config/func_names.json
@@ -3,6 +3,7 @@
{
Elm.Win:
{
+ Elm.Win.type:[ELM_WIN_BASIC],
Efl.Gfx.Base.size:[150, 100]
},
Elm.Button:
diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index 278b94a..daa138e 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -3207,12 +3207,6 @@ _editor_factory_wdg_create(const char *class_name, const
Gui_Widget *focused_wdg
if (IS_WIN(wdg))
{
-op = db_mro_op_desc_get(class_name, DB_DEF_WIN_CLASS,
ELM_OBJ_WIN_TYPE);
-prop = prop_create_for_op(op);
-val = prop_value_nth_get(prop, 0);
-gui_value_string_set(val, ELM_WIN_BASIC);
-wdg_prop_add(wdg, prop);
-
op = db_mro_op_desc_get(class_name, DB_DEF_WIN_CLASS, TITLE_SET);
prop = prop_create_for_op(op);
val = prop_value_nth_get(prop, 0);
diff --git a/src/lib/database.h b/src/lib/database.h
index d16081a..1c4eb14 100644
--- a/src/lib/database.h
+++ b/src/lib/database.h
@@ -139,7 +139,6 @@ typedef struct _Container_Desc Container_Desc;
#define SIZE_HINT_WEIGHT_SET size_hint_weight
#define SIZE_HINT_ALIGN_SET size_hint_align
#define POSITION_SET position
-#define ELM_OBJ_WIN_TYPE type
#define FILE_SET file
#define CONTENT_SET content_set
#define ITEM_PUSH item_push
--
[EGIT] [core/efl] master 01/01: eolian: keep track of all currently parsing files
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dfbb777bf144c528eeaffe7b85a5e90957eeba94
commit dfbb777bf144c528eeaffe7b85a5e90957eeba94
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Wed May 20 15:41:07 2015 +0100
eolian: keep track of all currently parsing files
---
src/lib/eolian/database_fill.c | 10 --
src/lib/eolian/eo_parser.c | 2 +-
src/lib/eolian/eolian_database.c | 6 +++---
src/lib/eolian/eolian_database.h | 2 +-
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/lib/eolian/database_fill.c b/src/lib/eolian/database_fill.c
index 58eaace..e1ef5b0 100644
--- a/src/lib/eolian/database_fill.c
+++ b/src/lib/eolian/database_fill.c
@@ -218,7 +218,7 @@ eo_parser_database_fill(const char *filename, Eina_Bool eot)
if (eot eina_hash_find(_parsedeots, filename))
return EINA_TRUE;
- if (eot) eina_hash_set(_parsingeots, filename, (void *)EINA_TRUE);
+ eina_hash_set(_parsingeos, filename, (void *)EINA_TRUE);
ls = eo_lexer_new(filename);
if (!ls)
@@ -256,16 +256,14 @@ eo_parser_database_fill(const char *filename, Eina_Bool
eot)
done:
if (eot)
- {
-eina_hash_set(_parsedeots, filename, (void *)EINA_TRUE);
-eina_hash_set(_parsingeots, filename, (void *)EINA_FALSE);
- }
+ eina_hash_set(_parsedeots, filename, (void *)EINA_TRUE);
+ eina_hash_set(_parsingeos, filename, (void *)EINA_FALSE);
eo_lexer_free(ls);
return EINA_TRUE;
error:
- if (eot) eina_hash_set(_parsingeots, filename, (void *)EINA_FALSE);
+ eina_hash_set(_parsingeos, filename, (void *)EINA_FALSE);
eo_lexer_free(ls);
return EINA_FALSE;
}
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 34bf9b2..6a695a0 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -1845,7 +1845,7 @@ parse_unit(Eo_Lexer *ls, Eina_Bool eot)
unknown import '%s', ls-t.value.s);
eo_lexer_syntax_error(ls, errbuf);
}
- if (eina_hash_find(_parsingeots, found))
+ if (eina_hash_find(_parsingeos, found))
{
pop_strbuf(ls);
snprintf(errbuf, sizeof(errbuf),
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index 9d8f151..5ba1124 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -25,7 +25,7 @@ Eina_Hash *_depclasses = NULL;
Eina_Hash *_decls = NULL;
Eina_Hash *_parsedeots = NULL;
-Eina_Hash *_parsingeots = NULL;
+Eina_Hash *_parsingeos = NULL;
static int _database_init_count = 0;
@@ -70,7 +70,7 @@ database_init()
_depclasses = eina_hash_stringshared_new(EINA_FREE_CB(_deplist_free));
_decls = eina_hash_stringshared_new(free);
_parsedeots = eina_hash_string_small_new(NULL);
- _parsingeots = eina_hash_string_small_new(NULL);
+ _parsingeos = eina_hash_string_small_new(NULL);
return ++_database_init_count;
}
@@ -103,7 +103,7 @@ database_shutdown()
eina_hash_free(_depclasses); _depclasses = NULL;
eina_hash_free(_decls ); _decls = NULL;
eina_hash_free(_parsedeots); _parsedeots = NULL;
-eina_hash_free(_parsingeots); _parsingeots = NULL;
+eina_hash_free(_parsingeos); _parsingeos = NULL;
eina_shutdown();
}
return _database_init_count;
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index 5910152..2129e95 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -54,7 +54,7 @@ extern Eina_Hash *_decls;
/* holds parsed/currently parsing eot files to keep track */
extern Eina_Hash *_parsedeots;
-extern Eina_Hash *_parsingeots;
+extern Eina_Hash *_parsingeos;
typedef struct _Eolian_Object
{
--
