[EGIT] [core/efl] master 04/04: evas_clickable_interface: adding new event
jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=24b786462a1b10744eaeb5f807fbe01fb56d4c13 commit 24b786462a1b10744eaeb5f807fbe01fb56d4c13 Author: Avi Levin Date: Wed May 20 10:08:17 2015 +0300 evas_clickable_interface: adding new event --- src/lib/evas/canvas/evas_clickable_interface.eo | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/evas/canvas/evas_clickable_interface.eo b/src/lib/evas/canvas/evas_clickable_interface.eo index 47337b6..f945ba4 100644 --- a/src/lib/evas/canvas/evas_clickable_interface.eo +++ b/src/lib/evas/canvas/evas_clickable_interface.eo @@ -4,6 +4,7 @@ interface Evas.Clickable_Interface (Evas.Signal_Interface) clicked; clicked,double; clicked,triple; + clicked,right; pressed; unpressed; longpressed; --
[EGIT] [core/efl] master 02/04: emotion: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f9c116a48749c642eb31154a4cfb5f60a110dcba
commit f9c116a48749c642eb31154a4cfb5f60a110dcba
Author: Avi Levin
Date: Sun Apr 26 14:49:26 2015 +0300
emotion: porting evas smart callbacks to eo
---
src/examples/emotion/emotion_basic_example.c | 17 +++-
src/examples/emotion/emotion_border_example.c | 66 +
src/examples/emotion/emotion_generic_example.c | 80 ++-
.../emotion/emotion_generic_subtitle_example.c | 16 ++-
src/examples/emotion/emotion_signals_example.c | 87 ++--
src/lib/emotion/emotion_smart.c| 76 ++
src/modules/ethumb/emotion/emotion.c | 56 +++
src/tests/emotion/emotion_test_main.c | 110 ++---
8 files changed, 318 insertions(+), 190 deletions(-)
diff --git a/src/examples/emotion/emotion_basic_example.c
b/src/examples/emotion/emotion_basic_example.c
index ec465bc..ebf8244 100644
--- a/src/examples/emotion/emotion_basic_example.c
+++ b/src/examples/emotion/emotion_basic_example.c
@@ -1,5 +1,9 @@
//Compile with:
-// gcc -o emotion_basic_example emotion_basic_example.c `pkg-config --libs
--cflags emotion evas ecore ecore-evas`
+// gcc -o emotion_basic_example emotion_basic_example.c `pkg-config --libs
--cflags emotion evas ecore ecore-evas eo`
+
+#define EFL_BETA_API_SUPPORT
+#define EFL_EO_API_SUPPORT
+#include
#include
#include
@@ -10,10 +14,13 @@
#define WIDTH (320)
#define HEIGHT (240)
-static void
-_playback_started_cb(void *data EINA_UNUSED, Evas_Object *o EINA_UNUSED, void
*event_info EINA_UNUSED)
+static Eina_Bool
+_playback_started_cb(void *data EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
printf("Emotion object started playback.\n");
+
+return EINA_TRUE;
}
int
@@ -58,8 +65,8 @@ main(int argc, const char *argv[])
em = emotion_object_add(e);
emotion_object_init(em, NULL);
- evas_object_smart_callback_add(
- em, "playback_started", _playback_started_cb, NULL);
+ eo_do(em, eo_event_callback_add
+ (EMOTION_OBJECT_EVENT_PLAYBACK_START, _playback_started_cb, NULL));
emotion_object_file_set(em, filename);
diff --git a/src/examples/emotion/emotion_border_example.c
b/src/examples/emotion/emotion_border_example.c
index 695b507..22eca25 100644
--- a/src/examples/emotion/emotion_border_example.c
+++ b/src/examples/emotion/emotion_border_example.c
@@ -1,5 +1,8 @@
//Compile with:
-// gcc -o emotion_border_example emotion_border_example.c `pkg-config --libs
--cflags emotion evas ecore ecore-evas eina`
+// gcc -o emotion_border_example emotion_border_example.c `pkg-config --libs
--cflags emotion evas ecore ecore-evas eina eo`
+
+#define EFL_EO_API_SUPPORT
+#define EFL_BETA_API_SUPPORT
#include
#include
@@ -14,10 +17,13 @@
static Eina_List *filenames = NULL;
static Eina_List *curfile = NULL;
-static void
-_playback_started_cb(void *data EINA_UNUSED, Evas_Object *o EINA_UNUSED, void
*event_info EINA_UNUSED)
+static Eina_Bool
+_playback_started_cb(void *data EINA_UNUSED,
+Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
void *event_info EINA_UNUSED)
{
printf("Emotion object started playback.\n");
+
+return EINA_TRUE;
}
static Evas_Object *
@@ -27,8 +33,8 @@ _create_emotion_object(Evas *e)
emotion_object_init(em, "gstreamer1");
- evas_object_smart_callback_add(
- em, "playback_started", _playback_started_cb, NULL);
+ eo_do(em, eo_event_callback_add(
+ EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL));
return em;
}
@@ -103,38 +109,53 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object
*o EINA_UNUSED, void *
}
}
-static void
-_frame_decode_cb(void *data EINA_UNUSED, Evas_Object *o EINA_UNUSED, void
*event_info EINA_UNUSED)
+static Eina_Bool
+_frame_decode_cb(void *data EINA_UNUSED,
+Eo *o EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
void *event_info EINA_UNUSED)
{
// fprintf(stderr, "smartcb: frame_decode\n");
+
+ return EINA_TRUE;
}
-static void
-_length_change_cb(void *data EINA_UNUSED, Evas_Object *o, void *event_info
EINA_UNUSED)
+static Eina_Bool
+_length_change_cb(void *data EINA_UNUSED,
+Eo *o, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
fprintf(stderr, "smartcb: length_change: %0.3f\n",
emotion_object_play_length_get(o));
+
+ return EINA_TRUE;
}
-static void
-_position_update_cb(void *data EINA_UNUSED, Evas_Object *o, void *event_info
EINA_UNUSED)
+static Eina_Bool
+_position_update_cb(void *data EINA_UNUSED,
+Eo *o, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
fprintf(stder
[EGIT] [core/efl] master 03/04: evas: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7d493fb4207dce83e35dc5f808d7fc1684f7c440 commit 7d493fb4207dce83e35dc5f808d7fc1684f7c440 Author: Avi Levin Date: Mon Apr 27 18:28:36 2015 +0300 evas: porting evas smart callbacks to eo --- src/lib/evas/canvas/evas_object_box.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index eda1bcd..675e63e 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -221,7 +221,7 @@ _evas_box_internal_append(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child) priv->children = eina_list_append(priv->children, opt); priv->children_changed = EINA_TRUE; - evas_object_smart_callback_call(o, SIG_CHILD_ADDED, opt); + eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, opt)); return opt; } @@ -237,7 +237,7 @@ _evas_box_internal_prepend(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child priv->children = eina_list_prepend(priv->children, opt); priv->children_changed = EINA_TRUE; - evas_object_smart_callback_call(o, SIG_CHILD_ADDED, opt); + eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, opt)); return opt; } @@ -261,7 +261,7 @@ _evas_box_internal_insert_before(Eo *o, Evas_Object_Box_Data *priv, Evas_Object priv->children = eina_list_prepend_relative (priv->children, new_opt, opt); priv->children_changed = EINA_TRUE; - evas_object_smart_callback_call(o, SIG_CHILD_ADDED, new_opt); + eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, new_opt)); return new_opt; } } @@ -288,7 +288,7 @@ _evas_box_internal_insert_after(Eo *o, Evas_Object_Box_Data *priv, Evas_Object * priv->children = eina_list_append_relative (priv->children, new_opt, opt); priv->children_changed = EINA_TRUE; - evas_object_smart_callback_call(o, SIG_CHILD_ADDED, new_opt); + eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, new_opt)); return new_opt; } } @@ -311,7 +311,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi priv->children = eina_list_prepend(priv->children, new_opt); priv->children_changed = EINA_TRUE; -evas_object_smart_callback_call(o, SIG_CHILD_ADDED, new_opt); +eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, new_opt)); return new_opt; } @@ -330,7 +330,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi priv->children = eina_list_prepend_relative (priv->children, new_opt, opt); priv->children_changed = EINA_TRUE; - evas_object_smart_callback_call(o, SIG_CHILD_ADDED, new_opt); + eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, new_opt)); return new_opt; } } @@ -352,7 +352,7 @@ _evas_box_internal_remove(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child) priv->children = eina_list_remove(priv->children, opt); eo_do(o, evas_obj_box_internal_option_free(opt)); priv->children_changed = EINA_TRUE; - evas_object_smart_callback_call(o, SIG_CHILD_REMOVED, obj); + eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_REMOVED, obj)); return obj; } @@ -380,7 +380,7 @@ _evas_box_internal_remove_at(Eo *o, Evas_Object_Box_Data *priv, unsigned int pos priv->children = eina_list_remove_list(priv->children, node); eo_do(o, evas_obj_box_internal_option_free(opt)); priv->children_changed = EINA_TRUE; - evas_object_smart_callback_call(o, SIG_CHILD_REMOVED, obj); + eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_REMOVED, obj)); return obj; } --
[EGIT] [core/efl] master 01/04: edje: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b563efc52ffbc02ae33d4901326a583102975cbb
commit b563efc52ffbc02ae33d4901326a583102975cbb
Author: Avi Levin
Date: Tue Apr 21 19:00:58 2015 +0300
edje: porting evas smart callbacks to eo
It's the first stage of replacing calls of
evas_object_smart_callback_add/del/call
with eo_callback_add/del/call.
This will reduce the use of legacy events and callbacks lists in
smart_object which in turn will improve performance and reduce memory
use.
---
src/lib/edje/edje_calc.c| 2 +-
src/lib/edje/edje_object.eo | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
old mode 100644
new mode 100755
index 31cfbd0..3d75e24
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -742,7 +742,7 @@ _edje_recalc_do(Edje *ed)
if (!ed->calc_only)
{
if (ed->recalc_call)
- evas_object_smart_callback_call(ed->obj, "recalc", NULL);
+ eo_do(ed->obj, eo_event_callback_call(EDJE_OBJECT_EVENT_RECALC,
NULL));
}
else
evas_object_smart_need_recalculate_set(ed->obj, need_calc);
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
old mode 100644
new mode 100755
index 5eecbe4..c05ef77
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -2399,4 +2399,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
Efl.File.mmap.set;
Efl.File.mmap.get;
}
+ events {
+ recalc; /*@ Edje re-calculated the object. */
+ }
}
--
[EGIT] [core/efl] master 01/01: emotion: revert changes to emotion test as discussed on ML and chat
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d833722e6ee2fb2848ab28e940aac6dd2a4b2969
commit d833722e6ee2fb2848ab28e940aac6dd2a4b2969
Author: Avi Levin
Date: Thu Jun 11 15:20:13 2015 +0300
emotion: revert changes to emotion test as discussed on ML and chat
We want a separate test for Eo callbacks, as we still want to verify
legacy callbacks.
---
src/tests/emotion/emotion_test_main.c | 110 +++---
1 file changed, 36 insertions(+), 74 deletions(-)
diff --git a/src/tests/emotion/emotion_test_main.c
b/src/tests/emotion/emotion_test_main.c
index 3d7d4a9..24ab7db 100644
--- a/src/tests/emotion/emotion_test_main.c
+++ b/src/tests/emotion/emotion_test_main.c
@@ -1,11 +1,7 @@
#ifdef HAVE_CONFIG_H
-#include "config.h"
-#else
-#define EFL_EO_API_SUPPORT
-#define EFL_BETA_API_SUPPORT
+# include "config.h"
#endif
-#include
#include
#include
#include
@@ -329,9 +325,8 @@ video_obj_time_changed(Evas_Object *obj, Evas_Object *edje)
edje_object_part_text_set(edje, "video_progress_txt", buf);
}
-static Eina_Bool
-video_obj_frame_decode_cb(void *data,
- Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+video_obj_frame_decode_cb(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
{
video_obj_time_changed(obj, data);
@@ -343,12 +338,10 @@ video_obj_frame_decode_cb(void *data,
printf("FPS: %3.3f\n", 1.0 / (t - pt));
pt = t;
}
- return EINA_TRUE;
}
-static Eina_Bool
-video_obj_frame_resize_cb(void *data,
- Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+video_obj_frame_resize_cb(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
{
Evas_Object *oe;
int iw, ih;
@@ -366,33 +359,24 @@ video_obj_frame_resize_cb(void *data,
evas_object_resize(oe, w, h);
evas_object_size_hint_min_set(obj, 0, 0);
edje_object_part_swallow(oe, "video_swallow", obj);
-
- return EINA_TRUE;
}
-static Eina_Bool
-video_obj_length_change_cb(void *data,
- Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+video_obj_length_change_cb(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
{
printf("len change!\n");
video_obj_time_changed(obj, data);
-
- return EINA_TRUE;
}
-static Eina_Bool
-video_obj_position_update_cb(void *data,
- Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+video_obj_position_update_cb(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
{
printf("pos up!\n");
video_obj_time_changed(obj, data);
-
- return EINA_TRUE;
}
-static Eina_Bool
-video_obj_stopped_cb(void *data EINA_UNUSED,
- Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+video_obj_stopped_cb(void *data EINA_UNUSED, Evas_Object *obj, void
*event_info EINA_UNUSED)
{
printf("video stopped!!!\n");
if (loop)
@@ -400,73 +384,54 @@ video_obj_stopped_cb(void *data EINA_UNUSED,
emotion_object_position_set(obj, 0.0);
emotion_object_play_set(obj, 1);
}
-
- return EINA_TRUE;
}
-static Eina_Bool
-video_obj_channels_cb(void *data EINA_UNUSED,
- Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+video_obj_channels_cb(void *data EINA_UNUSED, Evas_Object *obj, void
*event_info EINA_UNUSED)
{
printf("channels changed: [AUD %i][VID %i][SPU %i]\n",
emotion_object_audio_channel_count(obj),
emotion_object_video_channel_count(obj),
emotion_object_spu_channel_count(obj));
-
- return EINA_TRUE;
}
-static Eina_Bool
- video_obj_title_cb(void *data EINA_UNUSED,
- Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+video_obj_title_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
{
printf("video title to: \"%s\"\n", emotion_object_title_get(obj));
-
- return EINA_TRUE;
}
-static Eina_Bool
-video_obj_progress_cb(void *data EINA_UNUSED,
- Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+video_obj_progress_cb(void *data EINA_UNUSED, Evas_Object *obj, void
*event_info EINA_UNUSED)
{
printf("progress: \"%s\" %3.3f\n",
emotion_object_progress_info_get(obj),
emotion_object_progress_status_get(obj));
-
- return EINA_TRUE;
}
-static Eina_Bool
-video_obj_ref_cb(void *data EINA_UNUSED,
- Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info
EINA_UNUSED)
+static void
+video_obj_ref_cb(void *data EINA_UNUSED, Evas
[EGIT] [core/elementary] master 03/06: elc_player: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=0657cd583f7c451b28130e699aef26893603c0b6
commit 0657cd583f7c451b28130e699aef26893603c0b6
Author: Avi Levin
Date: Tue Apr 28 19:37:09 2015 +0300
elc_player: porting evas smart callbacks to eo
---
src/lib/elc_player.c | 206 ---
1 file changed, 113 insertions(+), 93 deletions(-)
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
old mode 100644
new mode 100755
index 1818e1f..91e38ed
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -210,16 +210,15 @@ _elm_player_elm_layout_sizing_eval(Eo *obj,
Elm_Player_Data *sd EINA_UNUSED)
evas_object_size_hint_min_set(obj, w, h);
}
-static void
+static Eina_Bool
_update_slider(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
double pos, length;
Eina_Bool seekable;
ELM_PLAYER_DATA_GET(data, sd);
- if (!sd) return;
+ if (!sd) return EINA_TRUE;
seekable = elm_video_is_seekable_get(sd->video);
length = elm_video_play_length_get(sd->video);
@@ -231,22 +230,24 @@ _update_slider(void *data,
if ((elm_slider_value_get(sd->slider) != pos) &&
(!sd->dragging))
elm_slider_value_set(sd->slider, pos);
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_update_frame(void *data,
- Evas_Object *obj,
- void *event_info)
+ Eo *obj, const Eo_Event_Description *desc, void *event_info)
{
ELM_PLAYER_DATA_GET(data, sd);
- if (!sd) return;
- _update_slider(data, obj, event_info);
+ if (!sd) return EINA_TRUE;
+ _update_slider(data, obj, desc, event_info);
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_update_position(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
double pos;
ELM_PLAYER_DATA_GET(data, sd);
@@ -254,30 +255,33 @@ _update_position(void *data,
pos = elm_slider_value_get(sd->slider);
if (pos != elm_video_play_position_get(sd->video))
elm_video_play_position_set(sd->video, pos);
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_drag_start(void *data,
-Evas_Object *obj EINA_UNUSED,
-void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
ELM_PLAYER_DATA_GET(data, sd);
sd->dragging = EINA_TRUE;
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_drag_stop(void *data,
-Evas_Object *obj EINA_UNUSED,
-void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
ELM_PLAYER_DATA_GET(data, sd);
sd->dragging = EINA_FALSE;
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_update_volume(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
double vol;
ELM_PLAYER_DATA_GET(data, sd);
@@ -285,12 +289,13 @@ _update_volume(void *data,
vol = elm_slider_value_get(sd->vslider) / 100.0;
if (vol != elm_video_audio_level_get(sd->video))
elm_video_audio_level_set(sd->video, vol);
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_forward(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
double pos, length;
ELM_PLAYER_DATA_GET(data, sd);
@@ -302,64 +307,70 @@ _forward(void *data,
elm_video_play_position_set(sd->video, pos);
elm_layout_signal_emit(data, "elm,button,forward", "elm");
- evas_object_smart_callback_call(data, SIG_FORWARD_CLICKED, NULL);
+ eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_FORWARD_CLICKED, NULL));
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_info(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
elm_layout_signal_emit(data, "elm,button,info", "elm");
- evas_object_smart_callback_call(data, SIG_INFO_CLICKED, NULL);
+ eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_INFO_CLICKED, NULL));
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_next(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ Eo *ob
[EGIT] [core/elementary] master 04/06: elm_dayselector: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=22f81130739eb3d650f92c0cf0bbdd2732f86f1c
commit 22f81130739eb3d650f92c0cf0bbdd2732f86f1c
Author: Avi Levin
Date: Wed Apr 29 14:30:15 2015 +0300
elm_dayselector: porting evas smart callbacks to eo
---
src/lib/elm_dayselector.c | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
old mode 100644
new mode 100755
index c3fed5f..6f60147
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -191,14 +191,15 @@ _item_signal_emit_cb(void *data,
eina_stringshare_replace(&it->day_style, emission);
}
-static void
+static Eina_Bool
_item_clicked_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Elm_Dayselector_Item_Data *it = data;
- evas_object_smart_callback_call(WIDGET(it), SIG_CHANGED, (void *)it->day);
+ eo_do(WIDGET(it), eo_event_callback_call(ELM_CHECK_EVENT_CHANGED, (void
*)it->day));
+
+ return EINA_TRUE;
}
static Elm_Dayselector_Item_Data *
@@ -269,7 +270,8 @@ _elm_dayselector_elm_container_content_set(Eo *obj,
Elm_Dayselector_Data *sd, co
snprintf(buf, sizeof(buf), "day%d,visible", _item_location_get(sd, it));
elm_layout_signal_emit(obj, buf, "elm");
- evas_object_smart_callback_add(VIEW(it), "changed", _item_clicked_cb, it);
+ eo_do(VIEW(it), eo_event_callback_add
+ (ELM_CHECK_EVENT_CHANGED, _item_clicked_cb, it));
evas_object_event_callback_add
(VIEW(it), EVAS_CALLBACK_DEL, _item_del_cb, obj);
@@ -317,7 +319,8 @@ _elm_dayselector_elm_container_content_unset(Eo *obj,
Elm_Dayselector_Data *sd,
if (!content) return NULL;
sd->items = eina_list_remove(sd->items, it);
- evas_object_smart_callback_del(content, "changed", _item_clicked_cb);
+ eo_do(content, eo_event_callback_del(
+ ELM_CHECK_EVENT_CHANGED, _item_clicked_cb, it));
evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _item_del_cb);
elm_object_signal_callback_del
--
[EGIT] [core/elementary] master 06/06: elm_flip: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=ec424b6893ef6c665fd351115b314a59865c0f6e commit ec424b6893ef6c665fd351115b314a59865c0f6e Author: Avi Levin Date: Thu Apr 30 14:18:41 2015 +0300 elm_flip: porting evas smart callbacks to eo --- src/lib/elm_flip.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c index 29cd214..8608817 100644 --- a/src/lib/elm_flip.c +++ b/src/lib/elm_flip.c @@ -1333,7 +1333,7 @@ _flip(Evas_Object *obj) sd->state = sd->next_state; _configure(obj); _flip_show_hide(obj); -evas_object_smart_callback_call(obj, SIG_ANIMATE_DONE, NULL); +eo_do(obj, eo_event_callback_call(ELM_FLIP_EVENT_ANIMATE_DONE, NULL)); return ECORE_CALLBACK_CANCEL; } @@ -1514,8 +1514,8 @@ _event_anim(void *data, _flip_show_hide(sd->obj); _configure(sd->obj); sd->animator = NULL; - evas_object_smart_callback_call - (sd->obj, SIG_ANIMATE_DONE, NULL); + eo_do(sd->obj, eo_event_callback_call + (ELM_FLIP_EVENT_ANIMATE_DONE, NULL)); return ECORE_CALLBACK_CANCEL; } @@ -1701,7 +1701,7 @@ _move_cb(void *data, evas_smart_objects_calculate(evas_object_evas_get(data)); _configure(fl); // FIXME: end hack - evas_object_smart_callback_call(fl, SIG_ANIMATE_BEGIN, NULL); + eo_do(fl, eo_event_callback_call(ELM_FLIP_EVENT_ANIMATE_BEGIN, NULL)); } else return; } @@ -1922,7 +1922,7 @@ _internal_elm_flip_go_to(Evas_Object *obj, evas_smart_objects_calculate(evas_object_evas_get(obj)); _configure(obj); // FIXME: end hack - evas_object_smart_callback_call(obj, SIG_ANIMATE_BEGIN, NULL); + eo_do(obj, eo_event_callback_call(ELM_FLIP_EVENT_ANIMATE_BEGIN, NULL)); // set focus to the content object when flip go to is called if (elm_object_focus_get(obj)) --
[EGIT] [core/elementary] master 01/06: elm_box: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e68e171ba3d974b126793409af9071f8a10d1857
commit e68e171ba3d974b126793409af9071f8a10d1857
Author: Avi Levin
Date: Tue Apr 28 14:26:17 2015 +0300
elm_box: porting evas smart callbacks to eo
Replacing calls of evas_object_smart_callback_add/del/call
with eo_callback_add/del/call.
This will reduce the use of legacy events and callbacks lists in
smart_object which in turn will improve performance and reduce memory
use.
---
src/lib/elm_box.c | 58 +--
1 file changed, 31 insertions(+), 27 deletions(-)
diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
old mode 100644
new mode 100755
index 42a6f33..f89989f
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -28,24 +28,26 @@ _elm_box_list_data_get(const Eina_List *list)
return opt->obj;
}
-static void
+static Eina_Bool
_child_added_cb_proxy(void *data,
- Evas_Object *o EINA_UNUSED,
- void *event_info)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info)
{
Evas_Object *box = data;
Evas_Object_Box_Option *opt = event_info;
- evas_object_smart_callback_call(box, SIG_CHILD_ADDED, opt->obj);
+ eo_do(box, eo_event_callback_call(ELM_BOX_EVENT_CHILD_ADDED, opt->obj));
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_child_removed_cb_proxy(void *data,
-Evas_Object *o EINA_UNUSED,
-void *event_info)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info)
{
Evas_Object *box = data;
Evas_Object *child = event_info;
- evas_object_smart_callback_call(box, SIG_CHILD_REMOVED, child);
+ eo_do(box, eo_event_callback_call(ELM_BOX_EVENT_CHILD_REMOVED, child));
+
+ return EINA_TRUE;
}
EOLIAN static Eina_Bool
@@ -192,27 +194,27 @@ _transition_animation(void *data)
return ECORE_CALLBACK_RENEW;
}
-static void
+static Eina_Bool
_transition_layout_child_added(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info)
{
Transition_Animation_Data *tad;
Evas_Object_Box_Option *opt = event_info;
Elm_Box_Transition *layout_data = data;
tad = calloc(1, sizeof(Transition_Animation_Data));
- if (!tad) return;
+ if (!tad) return EINA_TRUE;
tad->obj = opt->obj;
layout_data->objs = eina_list_append(layout_data->objs, tad);
layout_data->recalculate = EINA_TRUE;
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_transition_layout_child_removed(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info)
{
Eina_List *l;
Transition_Animation_Data *tad;
@@ -228,6 +230,8 @@ _transition_layout_child_removed(void *data,
break;
}
}
+
+ return EINA_TRUE;
}
static void
@@ -319,10 +323,10 @@ _transition_layout_animation_start(Evas_Object *obj,
evas_object_event_callback_add
(obj, EVAS_CALLBACK_RESIZE, _transition_layout_obj_resize_cb,
layout_data);
- evas_object_smart_callback_add
- (obj, SIG_CHILD_ADDED, _transition_layout_child_added, layout_data);
- evas_object_smart_callback_add
- (obj, SIG_CHILD_REMOVED, _transition_layout_child_removed, layout_data);
+ eo_do(obj, eo_event_callback_add
+ (ELM_BOX_EVENT_CHILD_ADDED, _transition_layout_child_added, layout_data));
+ eo_do(obj, eo_event_callback_add
+ (ELM_BOX_EVENT_CHILD_REMOVED, _transition_layout_child_removed,
layout_data));
if (!layout_data->animator)
layout_data->animator = ecore_animator_add(transition_animation_cb, obj);
@@ -387,10 +391,10 @@ _elm_box_evas_object_smart_add(Eo *obj, Elm_Box_Data *_pd
EINA_UNUSED)
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
- evas_object_smart_callback_add(wd->resize_obj, SIG_CHILD_ADDED,
- _child_added_cb_proxy, obj);
- evas_object_smart_callback_add(wd->resize_obj, SIG_CHILD_REMOVED,
- _child_removed_cb_proxy, obj);
+ eo_do(wd->resize_obj, eo_event_callback_add
+ (ELM_BOX_EVENT_CHILD_ADDED, _child_added_cb_proxy, obj));
+ eo_do(wd->resize_obj, eo_event_callback_add
+ (ELM_BOX_EVENT_CHILD_REMOVED, _child_removed_cb_proxy, obj));
elm_widget_can_focus_set(obj, EINA_FALSE);
elm_widget_highlight_ignore_set(obj, EINA_TRUE);
@@ -642,10 +646,10 @@ elm_box_transition_free(void *data)
evas_object_event_callback_del
(box_data->box, EVAS_CALL
[EGIT] [core/elementary] master 05/06: elm_photo: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=5ac56354a11f212253792edd007f302c801df4de
commit 5ac56354a11f212253792edd007f302c801df4de
Author: Avi Levin
Date: Wed Apr 29 17:45:24 2015 +0300
elm_photo: porting evas smart callbacks to eo
---
src/lib/elm_photo.c | 18 ++
src/lib/elm_photo.eo | 5 -
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
old mode 100644
new mode 100755
index 00c113d..fc214da
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -109,7 +109,7 @@ _drag_done_cb(void *unused EINA_UNUSED,
ELM_PHOTO_DATA_GET(obj, sd);
elm_object_scroll_freeze_pop(obj);
- evas_object_smart_callback_call(obj, SIG_DRAG_END, NULL);
+ eo_do(obj, eo_event_callback_call(EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_END,
NULL));
sd->drag_started = EINA_FALSE;
}
@@ -171,7 +171,8 @@ _long_press_cb(void *obj)
_drag_done_cb, NULL))
{
elm_object_scroll_freeze_push(obj);
- evas_object_smart_callback_call(obj, SIG_DRAG_START, NULL);
+ eo_do(obj, eo_event_callback_call
+ (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START, NULL));
sd->drag_started = EINA_TRUE;
}
}
@@ -213,7 +214,7 @@ _mouse_up(void *data,
ELM_SAFE_FREE(sd->long_press_timer, ecore_timer_del);
if (!sd->drag_started)
- evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
+ eo_do(data,
eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
}
static inline int
@@ -241,12 +242,13 @@ _elm_photo_internal_image_follow(Evas_Object *obj)
(img, EVAS_CALLBACK_RESIZE, _icon_move_resize_cb, obj);
}
-static void
+static Eina_Bool
_on_thumb_done(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
_elm_photo_internal_image_follow(data);
+
+ return EINA_TRUE;
}
EOLIAN static void
@@ -274,8 +276,8 @@ _elm_photo_evas_object_smart_add(Eo *obj, Elm_Photo_Data
*priv)
evas_object_event_callback_add
(priv->icon, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, obj);
- evas_object_smart_callback_add
- (priv->icon, "thumb,done", _on_thumb_done, obj);
+ eo_do(priv->icon, eo_event_callback_add
+ (ELM_ICON_EVENT_THUMB_DONE, _on_thumb_done, obj));
_elm_photo_internal_image_follow(obj);
diff --git a/src/lib/elm_photo.eo b/src/lib/elm_photo.eo
index 2ff4c7d..67c2c84 100644
--- a/src/lib/elm_photo.eo
+++ b/src/lib/elm_photo.eo
@@ -93,10 +93,5 @@ class Elm.Photo (Elm.Widget, Efl.File,
Evas.Clickable_Interface, Evas.Draggable_
Evas.Object_Smart.del;
Elm.Widget.theme_apply;
}
- events {
- clicked;
- drag,start;
- drag,end;
- }
}
--
[EGIT] [core/elementary] master 02/06: elc_popup: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=37c76b3920a7f09bc336ffbbb31758ff0986b7cd
commit 37c76b3920a7f09bc336ffbbb31758ff0986b7cd
Author: Avi Levin
Date: Tue Apr 28 16:41:29 2015 +0300
elc_popup: porting evas smart callbacks to eo
---
src/lib/elc_popup.c | 56 ++---
1 file changed, 32 insertions(+), 24 deletions(-)
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
old mode 100644
new mode 100755
index 629b294..7cbcaa2
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -83,21 +83,23 @@ _visuals_set(Evas_Object *obj)
elm_layout_signal_emit(sd->main_layout, "elm,state,action_area,hidden",
"elm");
}
-static void
+static Eina_Bool
_block_clicked_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
- evas_object_smart_callback_call(data, SIG_BLOCK_CLICKED, NULL);
+ eo_do(data, eo_event_callback_call(ELM_POPUP_EVENT_BLOCK_CLICKED, NULL));
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_timeout_cb(void *data,
-Evas_Object *obj EINA_UNUSED,
-void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
evas_object_hide(data);
- evas_object_smart_callback_call(data, SIG_TIMEOUT, NULL);
+ eo_do(data, eo_event_callback_call(ELM_POPUP_EVENT_TIMEOUT, NULL));
+
+ return EINA_TRUE;
}
static Evas_Object *
@@ -196,9 +198,10 @@ _elm_popup_evas_object_smart_del(Eo *obj, Elm_Popup_Data
*sd)
evas_object_event_callback_del_full(sd->parent, EVAS_CALLBACK_RESIZE,
_parent_geom_cb, obj);
evas_object_event_callback_del_full(sd->parent, EVAS_CALLBACK_MOVE,
_parent_geom_cb, obj);
- evas_object_smart_callback_del
- (sd->notify, "block,clicked", _block_clicked_cb);
- evas_object_smart_callback_del(sd->notify, "timeout", _timeout_cb);
+ eo_do(sd->notify, eo_event_callback_del(
+ ELM_POPUP_EVENT_BLOCK_CLICKED, _block_clicked_cb, obj));
+ eo_do(sd->notify, eo_event_callback_del(
+ ELM_POPUP_EVENT_TIMEOUT, _timeout_cb, obj));
evas_object_event_callback_del
(sd->content, EVAS_CALLBACK_DEL, _on_content_del);
evas_object_event_callback_del(obj, EVAS_CALLBACK_SHOW, _on_show);
@@ -765,24 +768,26 @@ _elm_popup_item_elm_widget_item_signal_emit(Eo *eo_it
EINA_UNUSED, Elm_Popup_Ite
elm_layout_signal_emit(VIEW(it), emission, source);
}
-static void
+static Eina_Bool
_item_focused_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Elm_Popup_Item_Data *it = data;
- evas_object_smart_callback_call(WIDGET(it), SIG_ITEM_FOCUSED, EO_OBJ(it));
+ eo_do(WIDGET(it), eo_event_callback_call(ELM_POPUP_EVENT_ITEM_FOCUSED,
EO_OBJ(it)));
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_item_unfocused_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Elm_Popup_Item_Data *it = data;
- evas_object_smart_callback_call(WIDGET(it), SIG_ITEM_UNFOCUSED, EO_OBJ(it));
+ eo_do(WIDGET(it), eo_event_callback_call(ELM_POPUP_EVENT_ITEM_UNFOCUSED,
EO_OBJ(it)));
+
+ return EINA_TRUE;
}
EOLIAN static Eo *
@@ -810,8 +815,10 @@ _item_new(Elm_Popup_Item_Data *it)
elm_layout_signal_callback_add(VIEW(it), "elm,action,click", "*",
_item_select_cb, it);
evas_object_size_hint_align_set(VIEW(it), EVAS_HINT_FILL,
EVAS_HINT_FILL);
-evas_object_smart_callback_add(VIEW(it), SIG_LAYOUT_FOCUSED,
_item_focused_cb, it);
-evas_object_smart_callback_add(VIEW(it), SIG_LAYOUT_UNFOCUSED,
_item_unfocused_cb, it);
+eo_do(VIEW(it), eo_event_callback_add
+ (ELM_LAYOUT_EVENT_FOCUSED, _item_focused_cb, it));
+eo_do(VIEW(it), eo_event_callback_add
+ (ELM_LAYOUT_EVENT_UNFOCUSED, _item_unfocused_cb, it));
evas_object_show(VIEW(it));
}
}
@@ -1439,10 +1446,11 @@ _elm_popup_evas_object_smart_add(Eo *obj,
Elm_Popup_Data *priv)
_size_hints_changed_cb, obj);
priv->content_text_wrap_type = ELM_WRAP_MIXED;
- evas_object_smart_callback_add
- (priv->notify, "block,clicked", _block_clicked_cb, obj);
+ eo_do(priv->notify, eo_event_callback_add
+ (ELM_POPUP_EVENT_BLOCK_CLICKED,_block_clicked_cb, obj));
- evas_object_smart_callback_add(priv->notify, "timeout", _
[EGIT] [core/efl] master 01/01: Emotion: Adding Eo test for emotion
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dc5d6a6f7d7e0068625a9d9dead65dc49595393a
commit dc5d6a6f7d7e0068625a9d9dead65dc49595393a
Author: Avi Levin
Date: Sun Jun 14 11:46:59 2015 +0300
Emotion: Adding Eo test for emotion
This test is exactly like the existing legacy one but works
with Eo invocations.
---
src/Makefile_Emotion.am | 18 +
src/tests/emotion/emotion_test_main-eo.c | 835 +++
2 files changed, 853 insertions(+)
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 0390512..6b6efca 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -243,6 +243,24 @@ tests_emotion_emotion_test_CPPFLAGS =
-I$(top_builddir)/src/lib/efl \
tests_emotion_emotion_test_LDADD = @USE_EDJE_LIBS@ @USE_EMOTION_LIBS@
tests_emotion_emotion_test_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
@USE_EMOTION_INTERNAL_LIBS@
+bin_PROGRAMS += tests/emotion/emotion_test-eo
+
+tests_emotion_emotion_test_eo_SOURCES = \
+tests/emotion/emotion_test_main-eo.c
+
+tests_emotion_emotion_test_eo_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+@EDJE_CFLAGS@ \
+@EMOTION_CFLAGS@ \
+@EO_CFLAGS@
+
+tests_emotion_emotion_test_eo_LDADD = @USE_EDJE_LIBS@ @USE_EMOTION_LIBS@
@USE_EO_LIBS@
+tests_emotion_emotion_test_eo_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
@USE_EMOTION_INTERNAL_LIBS@ \
+@USE_EO_INTERNAL_LIBS@
+
tests/emotion/data/theme.edj: tests/emotion/data/theme.edc
bin/edje/edje_cc${EXEEXT}
$(AM_V_EDJ) \
$(MKDIR_P) tests/emotion/data; \
diff --git a/src/tests/emotion/emotion_test_main-eo.c
b/src/tests/emotion/emotion_test_main-eo.c
new file mode 100644
index 000..efa9d3c
--- /dev/null
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -0,0 +1,835 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#else
+#define EFL_EO_API_SUPPORT
+#define EFL_BETA_API_SUPPORT
+#endif
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include "Emotion.h"
+
+static const Ecore_Getopt options = {
+ "emotion_test",
+ "%prog [options] ",
+ "1.0.0",
+ "(C) 2011-2014 Enlightenment",
+ "BSD\nThis is a 3 clause bsd bla bla",
+ "a simple test program for emotion.",
+ 1,
+ {
+ ECORE_GETOPT_STORE_STR('e', "engine", "ecore-evas engine to use"),
+ ECORE_GETOPT_CALLBACK_NOARGS('E', "list-engines", "list ecore-evas
engines",
+
ecore_getopt_callback_ecore_evas_list_engines, NULL),
+ ECORE_GETOPT_CALLBACK_ARGS('g', "geometry", "geometry to use in x:y:w:h
form.", "X:Y:W:H",
+ ecore_getopt_callback_geometry_parse, NULL),
+ ECORE_GETOPT_STORE_STR('b', "backend", "backend to use"),
+ ECORE_GETOPT_STORE_INT('v', "vis", "visualization type"),
+ ECORE_GETOPT_STORE_TRUE('w', "webcams", "show all the available v4l
streams"),
+ ECORE_GETOPT_STORE_TRUE('r', "reflex", "show video reflex effect"),
+ ECORE_GETOPT_STORE_TRUE('l', "loop", "restart the video when end
reached"),
+ ECORE_GETOPT_STORE_TRUE('p', "position", "start the video from last know
position"),
+ ECORE_GETOPT_VERSION('V', "version"),
+ ECORE_GETOPT_COPYRIGHT('R', "copyright"),
+ ECORE_GETOPT_LICENSE('L', "license"),
+ ECORE_GETOPT_HELP('h', "help"),
+ ECORE_GETOPT_SENTINEL
+ }
+};
+
+typedef struct _Frame_Data Frame_Data;
+
+struct _Frame_Data
+{
+ unsigned char moving : 1;
+ unsigned char resizing : 1;
+ intbutton;
+ Evas_Coord x, y;
+};
+
+static Eina_Bool bg_key_down(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
+ const Eo_Event_Description *desc EINA_UNUSED, void *event_info);
+
+
+static Evas_Object *o_bg = NULL;
+
+static Ecore_Evas *ecore_evas = NULL;
+static Evas*evas = NULL;
+static int startw = 800;
+static int starth = 600;
+
+static Eina_List *video_objs = NULL;
+static Emotion_Vis vis= EMOTION_VIS_NONE;
+static unsigned char reflex= 0;
+static unsigned char loop = 0;
+static unsigned char last_position_load = 0;
+static const char *theme_file = NULL;
+
+static void
+bg_resize(Evas_Coord w, Evas_Coord h)
+{
+ eo_do(o_bg, efl_gfx_size_set(w, h));
+}
+
+static void
+main_resize(Ecore_Evas *ee)
+{
+ Evas_Coord w
[EGIT] [core/elementary] master 05/11: elm_segment_control: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1f8c60c2016527835a3db1940ab323d9c040cae2 commit 1f8c60c2016527835a3db1940ab323d9c040cae2 Author: Avi Levin Date: Tue Jun 9 16:11:10 2015 +0300 elm_segment_control: porting evas smart callbacks to eo --- src/lib/elm_segment_control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c index 310dea3..a011936 100644 --- a/src/lib/elm_segment_control.c +++ b/src/lib/elm_segment_control.c @@ -314,7 +314,7 @@ _segment_on(Elm_Segment_Control_Item_Data *it) edje_object_signal_emit(VIEW(it), "elm,state,segment,selected", "elm"); sd->selected_item = it; - evas_object_smart_callback_call(sd->obj, SIG_CHANGED, EO_OBJ(it)); + eo_do(sd->obj, eo_event_callback_call(ELM_SEGMENT_CONTROL_EVENT_CHANGED, EO_OBJ(it))); } static void --
[EGIT] [core/elementary] master 06/11: elc_hoversel, elm_interface_scrollable: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=4cb1ce029cad97f8fd8501756a5f7ed131083358
commit 4cb1ce029cad97f8fd8501756a5f7ed131083358
Author: Avi Levin
Date: Sun May 3 16:34:53 2015 +0300
elc_hoversel, elm_interface_scrollable: porting evas smart callbacks to eo
---
src/lib/elc_hoversel.c | 71 ++
src/lib/elm_interface_scrollable.c | 10 +++---
2 files changed, 47 insertions(+), 34 deletions(-)
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index 379c4af..65a43de 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -89,46 +89,54 @@ _elm_hoversel_elm_widget_theme_apply(Eo *obj,
Elm_Hoversel_Data *sd)
return EINA_TRUE;
}
-static void
-_on_hover_clicked(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+static Eina_Bool
+_on_hover_clicked(void *data EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
+ void *event_info EINA_UNUSED)
{
elm_hoversel_hover_end(data);
+
+ return EINA_TRUE;
}
-static void
-_on_item_clicked(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+static Eina_Bool
+_on_item_clicked(void *data EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
+ void *event_info EINA_UNUSED)
{
Elm_Hoversel_Item_Data *item = data;
Evas_Object *obj2 = WIDGET(item);
Elm_Object_Item *eo_it = EO_OBJ(item);
if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2,
eo_it);
- evas_object_smart_callback_call(obj2, SIG_SELECTED, eo_it);
+ eo_do(obj2, eo_event_callback_call(ELM_HOVERSEL_EVENT_SELECTED, eo_it));
elm_hoversel_hover_end(obj2);
+
+ return EINA_TRUE;
}
-static void
-_item_focused_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+static Eina_Bool
+_item_focused_cb(void *data EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
+ void *event_info EINA_UNUSED)
{
Elm_Hoversel_Item_Data *it = data;
- evas_object_smart_callback_call(WIDGET(it), SIG_ITEM_FOCUSED, EO_OBJ(it));
+ eo_do(WIDGET(it), eo_event_callback_call(ELM_HOVERSEL_EVENT_ITEM_FOCUSED,
EO_OBJ(it)));
+
+ return EINA_TRUE;
}
-static void
-_item_unfocused_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
+static Eina_Bool
+_item_unfocused_cb(void *data EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Elm_Hoversel_Item_Data *it = data;
- evas_object_smart_callback_call(WIDGET(it), SIG_ITEM_UNFOCUSED, EO_OBJ(it));
+ eo_do(WIDGET(it), eo_event_callback_call(ELM_HOVERSEL_EVENT_ITEM_UNFOCUSED,
EO_OBJ(it)));
+
+ return EINA_TRUE;
}
static void
@@ -162,8 +170,8 @@ _activate(Evas_Object *obj)
elm_object_style_set(sd->hover, buf);
- evas_object_smart_callback_add
- (sd->hover, "clicked", _on_hover_clicked, obj);
+ eo_do(sd->hover, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_hover_clicked, obj));
elm_hover_target_set(sd->hover, obj);
/* hover's content */
@@ -200,10 +208,12 @@ _activate(Evas_Object *obj)
evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(bx, bt);
-evas_object_smart_callback_add(bt, "clicked", _on_item_clicked, item);
+eo_do(bt, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_clicked, item));
evas_object_show(bt);
-evas_object_smart_callback_add(bt, SIG_LAYOUT_FOCUSED,
_item_focused_cb, item);
-evas_object_smart_callback_add(bt, SIG_LAYOUT_UNFOCUSED,
_item_unfocused_cb, item);
+eo_do(bt,
+ eo_event_callback_add(ELM_LAYOUT_EVENT_FOCUSED,
_item_focused_cb, item),
+ eo_event_callback_add(ELM_LAYOUT_EVENT_UNFOCUSED,
_item_unfocused_cb, item));
}
if (sd->horizontal)
@@ -213,16 +223,18 @@ _activate(Evas_Object *obj)
elm_object_part_content_set(sd->hover, elm_hover_best_content_location_get
(sd->hover, ELM_HOVER_AXIS_VERTICAL), bx);
- evas_object_smart_callback_call(obj, SIG_EXPANDED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_HOVERSEL_EVENT_EXPANDED, NULL));
evas_object_show(sd->hover);
}
-static void
-_on_clicked(void *data,
-Evas_Object *obj EINA_UNUSED,
+static Eina_Bool
+_on_clicked(void *data EINA_UNUSED,
+Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
[EGIT] [core/elementary] master 01/11: etc_ctxpopup, elm_gengrid, elm_notify: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=c9727ca6a8bf4f34c3ebed96e9ae0c27b7ee9e16
commit c9727ca6a8bf4f34c3ebed96e9ae0c27b7ee9e16
Author: Avi Levin
Date: Sun May 3 14:28:16 2015 +0300
etc_ctxpopup, elm_gengrid, elm_notify: porting evas smart callbacks to eo
---
src/lib/elc_ctxpopup.c | 4 +-
src/lib/elm_ctxpopup.eo | 5 +--
src/lib/elm_gengrid.c | 117 ++--
src/lib/elm_gengrid.eo | 18
src/lib/elm_list.eo | 2 +
src/lib/elm_notify.c| 4 +-
src/lib/elm_widget.eo | 3 ++
7 files changed, 92 insertions(+), 61 deletions(-)
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index f5e6740..90b3757 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -708,7 +708,7 @@ _on_parent_resize(void *data,
sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;
evas_object_hide(data);
-evas_object_smart_callback_call(data, SIG_DISMISSED, NULL);
+eo_do(data, eo_event_callback_call(ELM_CTXPOPUP_EVENT_DISMISSED,
NULL));
}
else
{
@@ -1020,7 +1020,7 @@ _hide_finished_cb(void *data,
const char *source EINA_UNUSED)
{
evas_object_hide(data);
- evas_object_smart_callback_call(data, SIG_DISMISSED, NULL);
+ eo_do(data, eo_event_callback_call(ELM_CTXPOPUP_EVENT_DISMISSED, NULL));
}
static void
diff --git a/src/lib/elm_ctxpopup.eo b/src/lib/elm_ctxpopup.eo
index 903f6b9..098150a 100644
--- a/src/lib/elm_ctxpopup.eo
+++ b/src/lib/elm_ctxpopup.eo
@@ -265,10 +265,7 @@ class Elm.Ctxpopup (Elm.Layout,
Elm_Interface_Atspi_Widget_Action)
Elm_Interface_Atspi_Widget_Action.elm_actions.get;
}
events {
- language,changed;
- access,changed;
- focused;
- unfocused;
+ dismissed;
}
}
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index faef8a1..da87292 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -482,7 +482,8 @@ _calc_job(void *data)
{
sd->minh = minh;
sd->minw = minw;
- evas_object_smart_callback_call(sd->pan_obj, "changed", NULL);
+ eo_do(sd->pan_obj, eo_event_callback_call
+ (ELM_PAN_EVENT_CHANGED, NULL));
}
sd->nmax = nmax;
@@ -533,7 +534,8 @@ _item_unselect(Elm_Gen_Item *it)
{
it->selected = EINA_FALSE;
sd->selected = eina_list_remove(sd->selected, eo_it);
-evas_object_smart_callback_call(WIDGET(it), SIG_UNSELECTED, eo_it);
+eo_do(WIDGET(it), eo_event_callback_call
+ (ELM_GENGRID_EVENT_UNSELECTED, eo_it));
}
}
@@ -587,7 +589,7 @@ _item_mouse_move_cb(void *data,
if ((it->dragging) && (it->down))
{
ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
-evas_object_smart_callback_call(WIDGET(it), SIG_DRAG, eo_it);
+eo_do(WIDGET(it),
eo_event_callback_call(EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG, eo_it));
return;
}
@@ -636,17 +638,17 @@ _item_mouse_move_cb(void *data,
if ((adx > minw) || (ady > minh))
{
-const char *left_drag, *right_drag;
+const Eo_Event_Description *left_drag, *right_drag;
if (!elm_widget_mirrored_get(WIDGET(it)))
{
- left_drag = SIG_DRAG_START_LEFT;
- right_drag = SIG_DRAG_START_RIGHT;
+ left_drag = EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_LEFT;
+ right_drag = EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_RIGHT;
}
else
{
- left_drag = SIG_DRAG_START_RIGHT;
- right_drag = SIG_DRAG_START_LEFT;
+ left_drag = EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_RIGHT;
+ right_drag = EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_LEFT;
}
it->dragging = 1;
@@ -660,26 +662,25 @@ _item_mouse_move_cb(void *data,
if (dy < 0)
{
if (ady > adx)
- evas_object_smart_callback_call
- (WIDGET(it), SIG_DRAG_START_UP, eo_it);
+ eo_do(WIDGET(it), eo_event_callback_call
+ (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_UP, eo_it));
else
{
if (dx < 0)
-evas_object_smart_callback_call(WIDGET(it), left_drag,
eo_it);
+eo_do(WIDGET(it), eo_event_callback_call(left_drag,
eo_it));
}
}
else
{
if (ady > adx)
- evas_object_smart_callback_call
- (WIDGET(it), SIG_DRAG_START_DOWN, eo_it);
+ eo_do(WIDGET(it), eo_event_callback_call
+ (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_DOWN, eo_it));
else
{
if (dx < 0)
-
[EGIT] [core/elementary] master 10/11: elm_image, elm_colorselector: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e262ef2b111d9f20e0291190d521b3bc5f10d582
commit e262ef2b111d9f20e0291190d521b3bc5f10d582
Author: Avi Levin
Date: Tue May 5 18:51:55 2015 +0300
elm_image, elm_colorselector: porting evas smart callbacks to eo
---
src/lib/elm_colorselector.c | 80 +++-
src/lib/elm_colorselector.eo | 3 +-
src/lib/elm_image.c | 17 +-
3 files changed, 53 insertions(+), 47 deletions(-)
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 5dc9f17..d45ace5 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -404,8 +404,8 @@ _update_hsla_from_colorbar(Evas_Object *obj, Color_Type
type, double x)
_update_colorbars(sd);
if ((sd->mode == ELM_COLORSELECTOR_ALL) || (sd->mode ==
ELM_COLORSELECTOR_PICKER))
_color_picker_init(sd);
- evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
- evas_object_smart_callback_call(obj, SIG_CHANGED_USER, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_COLORSELECTOR_EVENT_CHANGED, NULL));
+ eo_do(obj, eo_event_callback_call(ELM_COLORSELECTOR_EVENT_CHANGED_USER,
NULL));
}
static void
@@ -460,13 +460,12 @@ _colors_set(Evas_Object *obj,
}
if ((sd->mode == ELM_COLORSELECTOR_ALL) || (sd->mode ==
ELM_COLORSELECTOR_PICKER))
_color_picker_init(sd);
- evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_COLORSELECTOR_EVENT_CHANGED, NULL));
}
-static void
+static Eina_Bool
_spinner_changed_cb(void *data,
-Evas_Object *obj,
-void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Elm_Colorselector_Data *sd = data;
Evas_Object *parent;
@@ -494,7 +493,9 @@ _spinner_changed_cb(void *data,
break;
}
evas_object_data_del(obj, "_changed");
- evas_object_smart_callback_call(obj, SIG_CHANGED_USER, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_COLORSELECTOR_EVENT_CHANGED_USER,
NULL));
+
+ return EINA_TRUE;
}
#ifdef HAVE_ELEMENTARY_X
@@ -523,8 +524,9 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj)
return xwin;
}
-static void
-_start_grab_pick_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
+static Eina_Bool
+_start_grab_pick_cb(void *data,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Evas_Object *o = data;
@@ -538,6 +540,8 @@ _start_grab_pick_cb(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
ecore_x_keyboard_grab(sd->grab.xroot);
ecore_x_pointer_grab(sd->grab.xroot);
+
+ return EINA_TRUE;
}
static Eina_Bool
@@ -581,7 +585,7 @@ _mouse_up_cb(void *data, int type EINA_UNUSED, void *event
EINA_UNUSED)
b = pixels[17 * 8 + 8] & 0xFF;
_colors_set(o, r, g, b, 0xFF);
- evas_object_smart_callback_call(o, SIG_CHANGED_USER, NULL);
+ eo_do(o, eo_event_callback_call(ELM_COLORSELECTOR_EVENT_CHANGED_USER,
NULL));
return EINA_TRUE;
}
@@ -723,7 +727,8 @@ _create_colorpicker(Evas_Object *obj)
sd->button = elm_button_add(sd->picker);
elm_object_style_set(sd->button, style);
elm_object_text_set(sd->button, E_("Pick a color"));
-evas_object_smart_callback_add(sd->button, "clicked",
_start_grab_pick_cb, obj);
+eo_do(sd->button, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _start_grab_pick_cb,
obj));
elm_box_pack_end(bx, sd->button);
evas_object_show(sd->button);
}
@@ -746,7 +751,8 @@ _create_colorpicker(Evas_Object *obj)
spinner = elm_spinner_add(sd->picker);
elm_object_style_set(spinner, style);
evas_object_data_set(spinner, "parent", obj);
-evas_object_smart_callback_add(spinner, "changed",
_spinner_changed_cb, sd);
+eo_do(spinner, eo_event_callback_add
+ (ELM_COLORSELECTOR_EVENT_CHANGED, _spinner_changed_cb, sd));
elm_spinner_editable_set(spinner, EINA_TRUE);
elm_spinner_interval_set(spinner, 0.1);
elm_spinner_min_max_set(spinner, 0, 255);
@@ -816,10 +822,9 @@ _colorbar_cb(void *data,
sd->focused = ELM_COLORSELECTOR_COMPONENTS;
}
-static void
+static Eina_Bool
_button_clicked_cb(void *data,
- Evas_Object *obj,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Color_Bar_Data *cb_data = data;
double x, y, step;
@@ -859,12 +864,13 @@ _button_clicked_cb(void *data,
_update_hsla_from_colorbar(cb_data->parent, cb_data->color_type, x);
sd->sel_color_type = cb_data->color
[EGIT] [core/elementary] master 07/11: elm_clock, elm_flipselector: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=5c1b16a06583ad6809c56cee8c4f46edc1becbec
commit 5c1b16a06583ad6809c56cee8c4f46edc1becbec
Author: Avi Levin
Date: Tue Jun 9 16:20:05 2015 +0300
elm_clock, elm_flipselector: porting evas smart callbacks to eo
---
src/lib/elm_clock.c| 4 ++--
src/lib/elm_flipselector.c | 12 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index 4195e83..b7a7139 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -73,7 +73,7 @@ _on_clock_val_up(void *data)
sd->interval = sd->interval / 1.05;
ecore_timer_interval_set(sd->spin, sd->interval);
_time_update(data, EINA_FALSE);
- evas_object_smart_callback_call(data, SIG_CHANGED, NULL);
+ eo_do(data, eo_event_callback_call(ELM_CLOCK_EVENT_CHANGED, NULL));
return ECORE_CALLBACK_RENEW;
clock_val_up_cancel:
@@ -128,7 +128,7 @@ _on_clock_val_down(void *data)
sd->interval = sd->interval / 1.05;
ecore_timer_interval_set(sd->spin, sd->interval);
_time_update(data, EINA_FALSE);
- evas_object_smart_callback_call(data, SIG_CHANGED, NULL);
+ eo_do(data, eo_event_callback_call(ELM_CLOCK_EVENT_CHANGED, NULL));
return ECORE_CALLBACK_RENEW;
clock_val_down_cancel:
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index ce6da7e..cb5f03a 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -230,8 +230,8 @@ _on_item_changed(Elm_Flipselector_Data *sd)
if (item->func)
item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item);
- evas_object_smart_callback_call
- (sd->obj, SIG_SELECTED, eo_item);
+ eo_do(sd->obj, eo_event_callback_call
+ (ELM_FLIPSELECTOR_EVENT_SELECTED, eo_item));
}
static void
@@ -367,8 +367,8 @@ _flip_up(Elm_Flipselector_Data *sd)
if (sd->current == sd->items)
{
sd->current = eina_list_last(sd->items);
-evas_object_smart_callback_call
- (sd->obj, SIG_UNDERFLOWED, NULL);
+eo_do(sd->obj, eo_event_callback_call
+ (ELM_FLIPSELECTOR_EVENT_UNDERFLOWED, NULL));
}
else
sd->current = eina_list_prev(sd->current);
@@ -392,8 +392,8 @@ _flip_down(Elm_Flipselector_Data *sd)
if (!sd->current)
{
sd->current = sd->items;
-evas_object_smart_callback_call
- (sd->obj, SIG_OVERFLOWED, NULL);
+eo_do(sd->obj, eo_event_callback_call
+ (ELM_FLIPSELECTOR_EVENT_OVERFLOWED, NULL));
}
eo_item = DATA_GET(sd->current);
--
[EGIT] [core/elementary] master 11/11: elm_actionslider, elm_map: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8a344469ebdb51b0133158ccffcc365fe3fd2a97
commit 8a344469ebdb51b0133158ccffcc365fe3fd2a97
Author: Avi Levin
Date: Wed May 6 15:47:21 2015 +0300
elm_actionslider, elm_map: porting evas smart callbacks to eo
---
src/lib/elm_actionslider.c | 52 +
src/lib/elm_actionslider.eo | 3 +-
src/lib/elm_map.c | 110 ++--
src/lib/elm_map.eo | 13 +-
4 files changed, 94 insertions(+), 84 deletions(-)
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 8f65847..f7095a9 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -154,13 +154,16 @@ _drag_button_move_cb(void *data,
edje_object_part_drag_value_get
(wd->resize_obj, "elm.drag_button_base", &pos, NULL);
if (pos == 0.0)
- evas_object_smart_callback_call
- (obj, SIG_CHANGED, !elm_widget_mirrored_get(obj) ? "left" : "right");
+ eo_do(obj, eo_event_callback_call
+ (ELM_ACTIONSLIDER_EVENT_POS_CHANGED,
+ !elm_widget_mirrored_get(obj) ? "left" : "right"));
else if (pos == 1.0)
- evas_object_smart_callback_call
- (obj, SIG_CHANGED, !elm_widget_mirrored_get(obj) ? "right" : "left");
+ eo_do(obj, eo_event_callback_call
+ (ELM_ACTIONSLIDER_EVENT_POS_CHANGED,
+ !elm_widget_mirrored_get(obj) ? "right" : "left"));
else if (pos >= 0.45 && pos <= 0.55)
- evas_object_smart_callback_call(obj, SIG_CHANGED, "center");
+ eo_do(obj, eo_event_callback_call
+ (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center"));
}
static void
@@ -230,13 +233,16 @@ _button_animator(void *data)
if ((!sd->final_position) &&
(sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
- evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)left);
+ eo_do(obj, eo_event_callback_call
+(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)left));
else if ((sd->final_position == 0.5) &&
(sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
- evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)center);
+ eo_do(obj, eo_event_callback_call
+(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)center));
else if ((sd->final_position == 1) &&
(sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
- evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)right);
+ eo_do(obj, eo_event_callback_call
+(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)right));
sd->button_animator = NULL;
@@ -273,7 +279,8 @@ _drag_button_up_cb(void *data,
(elm_widget_mirrored_get(obj) && position == 1.0)))
{
sd->final_position = 0;
-evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)left);
+eo_do(obj, eo_event_callback_call
+ (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)left));
return;
}
@@ -282,7 +289,8 @@ _drag_button_up_cb(void *data,
(sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
{
sd->final_position = 0.5;
-evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)center);
+eo_do(obj, eo_event_callback_call
+ (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)center));
ecore_animator_del(sd->button_animator);
sd->button_animator = ecore_animator_add(_button_animator, obj);
@@ -295,7 +303,8 @@ _drag_button_up_cb(void *data,
(elm_widget_mirrored_get(obj) && position == 0.0)))
{
sd->final_position = 1;
-evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)right);
+eo_do(obj, eo_event_callback_call
+ (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)right));
return;
}
@@ -364,19 +373,22 @@ _track_move_cb(void *data,
{
if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
{
- evas_object_smart_callback_call(obj, SIG_CHANGED, "center");
+ eo_do(obj, eo_event_callback_call
+(ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center"));
sd->final_position = 0.5;
}
else if (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT)
{
- evas_object_smart_callback_call(obj, SIG_CHANGED, "right");
+ eo_do(obj, eo_event_callback_call
+(ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right"));
sd->final_position =
[EGIT] [core/elementary] master 08/11: elm_toolbar: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=435d49575e9146aa2a6c67a2ccf7ff3e71d3fcae
commit 435d49575e9146aa2a6c67a2ccf7ff3e71d3fcae
Author: Avi Levin
Date: Tue Jun 9 16:21:46 2015 +0300
elm_toolbar: porting evas smart callbacks to eo
---
src/lib/elm_toolbar.c | 28 ++--
src/lib/elm_toolbar.eo | 15 ---
2 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index d03b587..b0079d7 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -159,7 +159,7 @@ _item_unselect(Elm_Toolbar_Item_Data *item)
edje_object_signal_emit(VIEW(item), "elm,state,unselected", "elm");
if (item->icon)
elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm");
- evas_object_smart_callback_call(WIDGET(item), SIG_UNSELECTED, EO_OBJ(item));
+ eo_do(WIDGET(item),
eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED,
EO_OBJ(item)));
}
static void
@@ -632,8 +632,8 @@ _elm_toolbar_item_focused(Elm_Object_Item *eo_it)
focus_raise = edje_object_data_get(VIEW(it), "focusraise");
if ((focus_raise) && (!strcmp(focus_raise, "on")))
evas_object_raise(VIEW(it));
- evas_object_smart_callback_call
- (obj, SIG_ITEM_FOCUSED, EO_OBJ(it));
+ eo_do(obj, eo_event_callback_call
+ (ELM_TOOLBAR_EVENT_ITEM_FOCUSED, EO_OBJ(it)));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it),
ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
}
@@ -659,8 +659,8 @@ _elm_toolbar_item_unfocused(Elm_Object_Item *eo_it)
edje_object_signal_emit
(VIEW(it), "elm,highlight,off", "elm");
sd->focused_item = NULL;
- evas_object_smart_callback_call
- (obj, SIG_ITEM_UNFOCUSED, eo_it);
+ eo_do(obj, eo_event_callback_call
+ (ELM_TOOLBAR_EVENT_ITEM_UNFOCUSED, eo_it));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(eo_it,
ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
}
@@ -1159,8 +1159,8 @@ _item_select(Elm_Toolbar_Item_Data *it)
{
if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))),
WIDGET(it), EO_OBJ(it));
}
- evas_object_smart_callback_call(obj, SIG_CLICKED, EO_OBJ(it));
- evas_object_smart_callback_call(obj, SIG_SELECTED, EO_OBJ(it));
+ eo_do(obj, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
EO_OBJ(it)));
+ eo_do(obj, eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED,
EO_OBJ(it)));
}
static void
@@ -2057,7 +2057,7 @@ _long_press_cb(void *data)
if (sd->reorder_mode)
_item_reorder_start(it);
- evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, EO_OBJ(it));
+ eo_do(WIDGET(it),
eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it)));
return ECORE_CALLBACK_CANCEL;
}
@@ -2090,7 +2090,7 @@ _mouse_down_cb(Elm_Toolbar_Item_Data *it,
if (ev->button != 1) return;
if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
- evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED_DOUBLE,
EO_OBJ(it));
+ eo_do(WIDGET(it),
eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE,
EO_OBJ(it)));
sd->mouse_down = EINA_TRUE;
sd->long_press = EINA_FALSE;
if (sd->long_timer)
@@ -2157,21 +2157,21 @@ static void
_scroll_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL, NULL);
+ eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL,
NULL));
}
static void
_scroll_anim_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_START, NULL);
+ eo_do(obj,
eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START,
NULL));
}
static void
_scroll_anim_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_STOP, NULL);
+ eo_do(obj,
eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL));
}
static void
@@ -2181,14 +2181,14 @@ _scroll_drag_start_cb(Evas_Object *obj,
ELM_TOOLBAR_DATA_GET(obj, sd);
ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
- evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_START, NULL);
+ eo_do(obj,
eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START,
NULL));
}
static void
_scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_STOP, NULL);
+ eo_do(obj,
eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL));
}
static void
diff --git a/src/lib/elm_toolbar.eo b/src/lib/elm_toolbar.eo
[EGIT] [core/elementary] master 02/11: elc_naviframe: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=88e312a47e76057c5a1bef83c1aa0925f79c4f48
commit 88e312a47e76057c5a1bef83c1aa0925f79c4f48
Author: Avi Levin
Date: Wed Apr 29 17:23:54 2015 +0300
elc_naviframe: porting evas smart callbacks to eo
---
src/lib/elc_naviframe.c | 33 -
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 2b1c197..8fc95ad 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -41,7 +41,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
static const char SIG_CLICKED[] = "clicked";
-static void _on_item_back_btn_clicked(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED);
+static Eina_Bool _on_item_back_btn_clicked(void *data,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED);
static Eina_Bool _key_action_top_item_get(Evas_Object *obj, const char
*params);
@@ -341,7 +342,8 @@ _on_item_title_transition_finished(void *data,
{
Elm_Naviframe_Item_Data *it = data;
- evas_object_smart_callback_call(WIDGET(it), SIG_TITLE_TRANSITION_FINISHED,
EO_OBJ(it));
+ eo_do(WIDGET(it), eo_event_callback_call
+ (ELM_NAVIFRAME_EVENT_TITLE_TRANSITION_FINISHED, EO_OBJ(it)));
}
static void
@@ -675,8 +677,10 @@ _item_title_prev_btn_unset(Elm_Naviframe_Item_Data *it)
evas_object_event_callback_del
(content, EVAS_CALLBACK_DEL, _item_title_prev_btn_del_cb);
- evas_object_smart_callback_del(content, SIG_CLICKED,
- _on_item_back_btn_clicked);
+ Eo* parent = eo_do_ret(content, parent, eo_parent_get());
+ eo_do(content, eo_event_callback_del(
+EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked,
+parent));
it->title_prev_btn = NULL;
return content;
}
@@ -932,17 +936,20 @@ _elm_naviframe_elm_layout_sizing_eval(Eo *obj,
Elm_Naviframe_Data *sd)
evas_object_size_hint_max_set(obj, -1, -1);
}
-static void
+static Eina_Bool
_on_item_back_btn_clicked(void *data,
- Evas_Object *obj,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
/* Since edje has the event queue, clicked event could be happend
multiple times on some heavy environment. This callback del will
prevent those scenario and guarantee only one clicked for it's own
page. */
- evas_object_smart_callback_del(obj, SIG_CLICKED, _on_item_back_btn_clicked);
+ eo_do(obj, eo_event_callback_del(
+EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked,
+data));
elm_naviframe_item_pop(data);
+
+ return EINA_TRUE;
}
static Evas_Object *
@@ -954,8 +961,8 @@ _back_btn_new(Evas_Object *obj, const char *title_label)
btn = elm_button_add(obj);
if (!btn) return NULL;
- evas_object_smart_callback_add
- (btn, SIG_CLICKED, _on_item_back_btn_clicked, obj);
+ eo_do(btn, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked,
obj));
snprintf
(buf, sizeof(buf), "naviframe/back_btn/%s", elm_widget_style_get(obj));
elm_object_style_set(btn, buf);
@@ -1066,7 +1073,7 @@ _on_item_title_clicked(void *data,
{
Elm_Naviframe_Item_Data *it = data;
- evas_object_smart_callback_call(WIDGET(it), SIG_TITLE_CLICKED, EO_OBJ(it));
+ eo_do(WIDGET(it), eo_event_callback_call(ELM_NAVIFRAME_EVENT_TITLE_CLICKED,
EO_OBJ(it)));
}
/* "elm,state,cur,pushed"
@@ -1130,7 +1137,7 @@ _on_item_show_finished(void *data,
if (sd->freeze_events)
evas_object_freeze_events_set(VIEW(it), EINA_FALSE);
- evas_object_smart_callback_call(WIDGET(it), SIG_TRANSITION_FINISHED,
EO_OBJ(it));
+ eo_do(WIDGET(it),
eo_event_callback_call(ELM_NAVIFRAME_EVENT_TRANSITION_FINISHED, EO_OBJ(it)));
}
static void
@@ -1464,7 +1471,7 @@ _key_action_top_item_get(Evas_Object *obj, const char
*params EINA_UNUSED)
///Leave for compatibility.
ELM_NAVIFRAME_ITEM_DATA_GET(eo_item, it);
if (it->title_prev_btn)
- evas_object_smart_callback_call(it->title_prev_btn, SIG_CLICKED, NULL);
+ eo_do(it->title_prev_btn,
eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
return EINA_TRUE;
}
--
[EGIT] [core/elementary] master 03/11: elm_datetime: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1e45158dda88940c3359425698c2a2fc84aebecc commit 1e45158dda88940c3359425698c2a2fc84aebecc Author: Avi Levin Date: Tue Jun 9 16:08:07 2015 +0300 elm_datetime: porting evas smart callbacks to eo --- src/lib/elm_datetime.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c index 12a8cf0..ed313a8 100644 --- a/src/lib/elm_datetime.c +++ b/src/lib/elm_datetime.c @@ -1026,7 +1026,8 @@ _elm_datetime_field_limit_set(Eo *obj, Elm_Datetime_Data *sd, Elm_Datetime_Field _apply_field_limits(obj); if (!_field_cmp(fieldtype, &old_time, &sd->curr_time)) - evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); + eo_do(obj, eo_event_callback_call(ELM_DATETIME_EVENT_CHANGED, NULL)); + } EOLIAN static Eina_Bool @@ -1052,7 +1053,7 @@ _elm_datetime_value_set(Eo *obj, Elm_Datetime_Data *sd, const struct tm *newtime _validate_datetime_limits(&sd->max_limit, &sd->curr_time, EINA_TRUE); _apply_field_limits(obj); - evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); + eo_do(obj, eo_event_callback_call(ELM_DATETIME_EVENT_CHANGED, NULL)); return EINA_TRUE; } @@ -1084,7 +1085,7 @@ _elm_datetime_value_min_set(Eo *obj, Elm_Datetime_Data *sd, const struct tm *min _apply_field_limits(obj); if (!_date_cmp(&old_time, &sd->curr_time)) - evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); + eo_do(obj, eo_event_callback_call(ELM_DATETIME_EVENT_CHANGED, NULL)); return EINA_TRUE; } @@ -1116,7 +1117,7 @@ _elm_datetime_value_max_set(Eo *obj, Elm_Datetime_Data *sd, const struct tm *max _apply_field_limits(obj); if (!_date_cmp(&old_time, &sd->curr_time)) - evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); + eo_do(obj, eo_event_callback_call(ELM_DATETIME_EVENT_CHANGED, NULL)); return EINA_TRUE; } --
[EGIT] [core/elementary] master 09/11: elm_genlist: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6e35aacc674c84b4b8070441aacaa8cd5ed29296
commit 6e35aacc674c84b4b8070441aacaa8cd5ed29296
Author: Avi Levin
Date: Mon May 4 16:47:57 2015 +0300
elm_genlist: porting evas smart callbacks to eo
---
src/lib/elm_genlist.c | 170 ++---
src/lib/elm_genlist.eo | 35 +-
2 files changed, 126 insertions(+), 79 deletions(-)
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index e332bce..8a8b47b 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -599,7 +599,7 @@ _elm_genlist_item_unrealize(Elm_Gen_Item *it,
evas_event_freeze(evas_object_evas_get(WIDGET(it)));
if (!calc)
- evas_object_smart_callback_call(WIDGET(it), SIG_UNREALIZED, EO_OBJ(it));
+ eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_UNREALIZED,
EO_OBJ(it)));
ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
_view_clear(VIEW(it), &(it->texts), &(it->contents));
@@ -750,7 +750,8 @@ _calc_job(void *data)
{
sd->minw = minw;
sd->minh = minh;
-evas_object_smart_callback_call(sd->pan_obj, "changed", NULL);
+eo_do(sd->pan_obj, eo_event_callback_call
+ (ELM_PAN_EVENT_CHANGED, NULL));
elm_layout_sizing_eval(sd->obj);
if (sd->reorder_it)
{
@@ -1113,9 +1114,9 @@ _item_tree_effect_finish(Elm_Genlist_Data *sd)
sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_NONE;
sd->move_items = eina_list_free(sd->move_items);
- evas_object_smart_callback_call(sd->pan_obj, "changed", NULL);
- evas_object_smart_callback_call
- (sd->obj, SIG_TREE_EFFECT_FINISHED, NULL);
+ eo_do(sd->pan_obj, eo_event_callback_call(ELM_PAN_EVENT_CHANGED, NULL));
+ eo_do(sd->obj, eo_event_callback_call
+ (ELM_GENLIST_EVENT_TREE_EFFECT_FINISHED, NULL));
evas_object_smart_changed(sd->pan_obj);
sd->tree_effect_animator = NULL;
@@ -1324,8 +1325,8 @@ _elm_genlist_item_index_update(Elm_Gen_Item *it)
{
if (it->position_update || GL_IT(it)->block->position_update)
{
-evas_object_smart_callback_call(WIDGET(it), SIG_INDEX_UPDATE,
-EO_OBJ(it));
+eo_do(WIDGET(it), eo_event_callback_call
+ (ELM_GENLIST_EVENT_INDEX_UPDATE, EO_OBJ(it)));
it->position_update = EINA_FALSE;
}
}
@@ -1428,9 +1429,9 @@ _expand_toggle_signal_cb(void *data,
Elm_Gen_Item *it = data;
if (it->item->expanded)
- evas_object_smart_callback_call(WIDGET(it), SIG_CONTRACT_REQUEST,
EO_OBJ(it));
+ eo_do(WIDGET(it),
eo_event_callback_call(ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it)));
else
- evas_object_smart_callback_call(WIDGET(it), SIG_EXPAND_REQUEST,
EO_OBJ(it));
+ eo_do(WIDGET(it),
eo_event_callback_call(ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it)));
}
static void
@@ -1442,7 +1443,7 @@ _expand_signal_cb(void *data,
Elm_Gen_Item *it = data;
if (!it->item->expanded)
- evas_object_smart_callback_call(WIDGET(it), SIG_EXPAND_REQUEST,
EO_OBJ(it));
+ eo_do(WIDGET(it),
eo_event_callback_call(ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it)));
}
static void
@@ -1454,7 +1455,7 @@ _contract_signal_cb(void *data,
Elm_Gen_Item *it = data;
if (it->item->expanded)
- evas_object_smart_callback_call(WIDGET(it), SIG_CONTRACT_REQUEST,
EO_OBJ(it));
+ eo_do(WIDGET(it),
eo_event_callback_call(ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it)));
}
//-- item cache handle routine --//
@@ -1908,7 +1909,7 @@ _item_realize(Elm_Gen_Item *it,
}
-evas_object_smart_callback_call(WIDGET(it), SIG_REALIZED, EO_OBJ(it));
+eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_REALIZED,
EO_OBJ(it)));
}
//Send a signal so that an item changes its style according to its expand
depth
@@ -2643,7 +2644,7 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it)
}
}
}
- evas_object_smart_callback_call(obj, SIG_ITEM_FOCUSED, eo_it);
+ eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_ITEM_FOCUSED, eo_it));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(eo_it,
ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
}
@@ -2671,7 +2672,7 @@ _elm_genlist_item_unfocused(Elm_Object_Item *eo_it)
}
sd->focused_item = NULL;
- evas_object_smart_callback_call(obj, SIG_ITEM_UNFOCUSED, eo_it);
+ eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_ITEM_UNFOCUSED, eo_it));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(eo_it,
ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
}
@@ -3026,7 +3027,7 @@ _key_action_select(Evas_Object *obj, const char *params)
if (_item_select(it)
[EGIT] [core/elementary] master 04/11: elm_panel: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=c2e10ffa3a8c6376de09d6553b87e66f94500cc5 commit c2e10ffa3a8c6376de09d6553b87e66f94500cc5 Author: Avi Levin Date: Tue Jun 9 16:09:52 2015 +0300 elm_panel: porting evas smart callbacks to eo --- src/lib/elm_panel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c index 94d767a..67ef1f0 100644 --- a/src/lib/elm_panel.c +++ b/src/lib/elm_panel.c @@ -1314,7 +1314,8 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED) } break; } - evas_object_smart_callback_call(obj, SIG_SCROLL, (void *) &event); + eo_do(obj, eo_event_callback_call + (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, (void *) &event)); } EOLIAN static Eina_Bool --
[EGIT] [core/elementary] master 20/24: elm_prefs, elm_check: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=c3dc34f38167718d95f05375f5484843e04980bd
commit c3dc34f38167718d95f05375f5484843e04980bd
Author: Avi Levin
Date: Thu May 14 13:31:40 2015 +0300
elm_prefs, elm_check: porting evas smart callbacks to eo
---
src/lib/elm_check.c | 6 +++---
src/lib/elm_prefs.c | 24
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index be376a6..0dbf571 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -68,7 +68,7 @@ _activate(Evas_Object *obj)
_elm_access_say(E_("State: Off"));
}
- evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_CHECK_EVENT_CHANGED, NULL));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(obj,
@@ -273,7 +273,7 @@ _on_check_off(void *data,
if (sd->statep) *sd->statep = sd->state;
elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
- evas_object_smart_callback_call(data, SIG_CHANGED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_CHECK_EVENT_CHANGED, NULL));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(data,
@@ -294,7 +294,7 @@ _on_check_on(void *data,
sd->state = EINA_TRUE;
if (sd->statep) *sd->statep = sd->state;
elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
- evas_object_smart_callback_call(data, SIG_CHANGED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_CHECK_EVENT_CHANGED, NULL));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(data,
diff --git a/src/lib/elm_prefs.c b/src/lib/elm_prefs.c
index 585e329..2bb8880 100644
--- a/src/lib/elm_prefs.c
+++ b/src/lib/elm_prefs.c
@@ -136,8 +136,8 @@ _elm_prefs_save(void *data)
{
elm_prefs_data_save(sd->prefs_data, NULL, NULL);
-evas_object_smart_callback_call
- (wd->obj, SIG_PAGE_SAVED, (char *)sd->root->name);
+eo_do(wd->obj, eo_event_callback_call
+ (ELM_PREFS_EVENT_PAGE_SAVED, (char *)sd->root->name));
}
sd->dirty = EINA_FALSE;
@@ -300,8 +300,8 @@ _elm_prefs_item_changed_report(Eo *obj,
snprintf(buf, sizeof(buf), "%s:%s", it->page->name, it->name);
- evas_object_smart_callback_call
- (wd->obj, SIG_ITEM_CHANGED, buf);
+ eo_do(wd->obj, eo_event_callback_call
+ (ELM_PREFS_EVENT_ITEM_CHANGED, buf));
}
static Elm_Prefs_Item_Node *
@@ -400,8 +400,8 @@ _prefs_data_autosaved_cb(void *cb_data,
ELM_PREFS_DATA_GET(cb_data, sd);
ELM_WIDGET_DATA_GET_OR_RETURN(cb_data, wd);
- evas_object_smart_callback_call
- (wd->obj, SIG_PAGE_SAVED, event_info);
+ eo_do(wd->obj, eo_event_callback_call
+ (ELM_PREFS_EVENT_PAGE_SAVED, event_info));
sd->dirty = EINA_FALSE;
}
@@ -556,8 +556,8 @@ _item_changed_cb(Evas_Object *it_obj)
/* we use the changed cb on ACTION/RESET/SAVE items specially */
if (it->type == ELM_PREFS_TYPE_ACTION)
{
-evas_object_smart_callback_call
- (wd->obj, SIG_ACTION, buf);
+eo_do(wd->obj, eo_event_callback_call
+ (ELM_PREFS_EVENT_ACTION, buf));
return;
}
@@ -1175,8 +1175,8 @@ _elm_prefs_efl_file_file_set(Eo *obj, Elm_Prefs_Data *sd,
const char *file, cons
_elm_prefs_values_get_default(sd->root, EINA_FALSE);
- evas_object_smart_callback_call
- (obj, SIG_PAGE_LOADED, (char *)sd->root->name);
+ eo_do(obj, eo_event_callback_call
+ (ELM_PREFS_EVENT_PAGE_LOADED, (char *)sd->root->name));
return EINA_TRUE;
}
@@ -1220,8 +1220,8 @@ _elm_prefs_data_set(Eo *obj, Elm_Prefs_Data *sd,
Elm_Prefs_Data *prefs_data)
sd->values_fetching = EINA_FALSE;
end:
- evas_object_smart_callback_call
- (obj, SIG_PAGE_CHANGED, (char *)sd->root->name);
+ eo_do(obj, eo_event_callback_call
+ (ELM_PREFS_EVENT_PAGE_CHANGED, (char *)sd->root->name));
return EINA_TRUE;
}
--
[EGIT] [core/elementary] master 08/24: elm_thumb: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=4e646b95e2bfaea546f336e4f942a3d17382c9f3
commit 4e646b95e2bfaea546f336e4f942a3d17382c9f3
Author: Avi Levin
Date: Thu May 7 18:04:13 2015 +0300
elm_thumb: porting evas smart callbacks to eo
---
src/lib/elm_thumb.c | 30 +++---
src/lib/elm_thumb.eo | 2 --
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index cdcfeed..51d389b 100644
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -62,9 +62,9 @@ _mouse_down_cb(void *data,
else sd->on_hold = EINA_FALSE;
if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
- evas_object_smart_callback_call(obj, SIG_CLICKED_DOUBLE, NULL);
+ eo_do(obj,
eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL));
else
- evas_object_smart_callback_call(obj, SIG_PRESS, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_THUMB_EVENT_PRESS, NULL));
}
static void
@@ -81,7 +81,7 @@ _mouse_up_cb(void *data,
else sd->on_hold = EINA_FALSE;
if (!sd->on_hold)
- evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
+ eo_do(obj, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
NULL));
sd->on_hold = EINA_FALSE;
}
@@ -115,8 +115,8 @@ _thumb_ready_inform(Elm_Thumb_Data *sd,
edje_object_signal_emit
(wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm");
edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm");
- evas_object_smart_callback_call
- (sd->obj, SIG_GENERATE_STOP, NULL);
+ eo_do(sd->obj, eo_event_callback_call
+ (ELM_THUMB_EVENT_GENERATE_STOP, NULL));
}
static void
@@ -293,16 +293,16 @@ _thumb_finish(Elm_Thumb_Data *sd,
wd = eo_data_scope_get(sd->obj, ELM_WIDGET_CLASS);
edje_object_signal_emit
(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm");
- evas_object_smart_callback_call
-(sd->obj, SIG_LOAD_ERROR, NULL);
+ eo_do(sd->obj, eo_event_callback_call
+(ELM_THUMB_EVENT_LOAD_ERROR, NULL));
}
return;
err:
edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm");
- evas_object_smart_callback_call
- (sd->obj, SIG_LOAD_ERROR, NULL);
+ eo_do(sd->obj, eo_event_callback_call
+ (ELM_THUMB_EVENT_LOAD_ERROR, NULL));
}
static void
@@ -349,8 +349,8 @@ _on_ethumb_thumb_error(Ethumb_Client *client EINA_UNUSED,
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_ERROR, "elm");
edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm");
- evas_object_smart_callback_call
- (sd->obj, SIG_GENERATE_ERROR, NULL);
+ eo_do(sd->obj, eo_event_callback_call
+ (ELM_THUMB_EVENT_GENERATE_ERROR, NULL));
}
static void
@@ -389,8 +389,8 @@ _thumb_start(Elm_Thumb_Data *sd)
ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd);
edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_START, "elm");
edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_START, "elm");
- evas_object_smart_callback_call
- (sd->obj, SIG_GENERATE_START, NULL);
+ eo_do(sd->obj, eo_event_callback_call
+ (ELM_THUMB_EVENT_GENERATE_START, NULL));
pending_request++;
ethumb_client_file_set(_elm_ethumb_client, sd->file, sd->key);
@@ -482,8 +482,8 @@ _elm_thumb_evas_object_smart_hide(Eo *obj, Elm_Thumb_Data
*sd)
edje_object_signal_emit
(wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm");
-evas_object_smart_callback_call
- (sd->obj, SIG_GENERATE_STOP, NULL);
+eo_do(sd->obj, eo_event_callback_call
+ (ELM_THUMB_EVENT_GENERATE_STOP, NULL));
}
if (sd->thumb.retry)
diff --git a/src/lib/elm_thumb.eo b/src/lib/elm_thumb.eo
index 07903a3..452c4e0 100644
--- a/src/lib/elm_thumb.eo
+++ b/src/lib/elm_thumb.eo
@@ -308,8 +308,6 @@ class Elm.Thumb (Elm.Layout, Efl.File,
Evas.Clickable_Interface)
Evas.Object_Smart.show;
}
events {
- clicked;
- clicked,double;
generate,error;
generate,start;
generate,stop;
--
[EGIT] [core/elementary] master 23/24: elc_fileselector_entry, elm_bubble: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=c2a03be424e45d5f3d7f9514382c1e2acd45ac3f
commit c2a03be424e45d5f3d7f9514382c1e2acd45ac3f
Author: Avi Levin
Date: Sun May 17 10:37:49 2015 +0300
elc_fileselector_entry, elm_bubble: porting evas smart callbacks to eo
---
src/lib/elc_fileselector_entry.c | 89 +-
src/lib/elm_bubble.c | 2 +-
src/lib/elm_fileselector_entry.eo | 6 ++-
src/lib/elm_interface_scrollable.c | 20 +
4 files changed, 66 insertions(+), 51 deletions(-)
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index 32b1f0b..45170c4 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -43,28 +43,31 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
};
#undef ELM_PRIV_FILESELECTOR_ENTRY_SIGNALS
-#define SIG_FWD(name) \
- static void \
- _##name##_fwd(void *data, Evas_Object * obj EINA_UNUSED, void *event_info) \
+#define SIG_FWD(name, event)
\
+ static Eina_Bool
\
+ _##name##_fwd(void *data, \
+Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)\
{ \
- evas_object_smart_callback_call(data, SIG_##name, event_info); \
+ eo_do(data, eo_event_callback_call(event, event_info)); \
+ \
+ return EINA_TRUE;\
}
-SIG_FWD(CHANGED)
-SIG_FWD(PRESS)
-SIG_FWD(LONGPRESSED)
-SIG_FWD(CLICKED)
-SIG_FWD(CLICKED_DOUBLE)
-SIG_FWD(FOCUSED)
-SIG_FWD(UNFOCUSED)
-SIG_FWD(SELECTION_PASTE)
-SIG_FWD(SELECTION_COPY)
-SIG_FWD(SELECTION_CUT)
-SIG_FWD(UNPRESSED)
+SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED)
+SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
+SIG_FWD(LONGPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED)
+SIG_FWD(CLICKED, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED)
+SIG_FWD(CLICKED_DOUBLE, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE)
+SIG_FWD(FOCUSED, ELM_LAYOUT_EVENT_FOCUSED)
+SIG_FWD(UNFOCUSED, ELM_LAYOUT_EVENT_UNFOCUSED)
+SIG_FWD(SELECTION_PASTE, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE)
+SIG_FWD(SELECTION_COPY, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_COPY)
+SIG_FWD(SELECTION_CUT, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CUT)
+SIG_FWD(UNPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED)
#undef SIG_FWD
-static void
+static Eina_Bool
_FILE_CHOSEN_fwd(void *data,
- Evas_Object *obj EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info)
{
const char *file = event_info;
@@ -73,15 +76,18 @@ _FILE_CHOSEN_fwd(void *data,
ELM_FILESELECTOR_ENTRY_DATA_GET(data, sd);
s = elm_entry_utf8_to_markup(file);
- if (!s) return;
+ if (!s) return EINA_TRUE;
elm_object_text_set(sd->entry, s);
free(s);
- evas_object_smart_callback_call(data, SIG_FILE_CHOSEN, event_info);
+ eo_do(data, eo_event_callback_call
+ (ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event_info));
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_ACTIVATED_fwd(void *data,
- Evas_Object *obj EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info)
{
const char *file;
@@ -90,7 +96,10 @@ _ACTIVATED_fwd(void *data,
file = elm_object_text_get(sd->entry);
elm_fileselector_path_set(sd->button, file);
- evas_object_smart_callback_call(data, SIG_ACTIVATED, event_info);
+ eo_do(data, eo_event_callback_call
+ (ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event_info));
+
+ return EINA_TRUE;
}
EOLIAN static void
@@ -284,11 +293,11 @@ _elm_fileselector_entry_evas_object_smart_add(Eo *obj,
Elm_Fileselector_Entry_Da
elm_fileselector_expandable_set
(priv->button, _elm_config->fileselector_expand_enable);
-#define SIG_FWD(name) \
- evas_object_smart_callback_add(priv->button, SIG_##name, _##name##_fwd, obj)
- SIG_FWD(CLICKED);
- SIG_FWD(UNPRESSED);
- SIG_FWD(FILE_CHOSEN);
+#define SIG_FWD(name, event) \
+ eo_do(priv->button, eo_event_callback_add(event, _##name##_fwd, obj))
+ SIG_FWD(CLICKED, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED);
+ SIG_FWD(UNPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED);
+ SIG_FWD(FILE_CHOSEN, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN);
#undef SIG_FWD
priv->entry = elm_entry_add(obj);
@@ -298,19 +307,19 @@ _elm_fileselector_entry_evas_object_smart_add(Eo *obj,
E
[EGIT] [core/elementary] master 21/24: elm_icon: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=3f06b36e9863992e29e47b63c78d5009550807a3
commit 3f06b36e9863992e29e47b63c78d5009550807a3
Author: Avi Levin
Date: Thu May 14 14:03:16 2015 +0300
elm_icon: porting evas smart callbacks to eo
---
src/lib/elm_icon.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index 8ca0bde..8e8877d 100644
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -113,11 +113,11 @@ _icon_thumb_display(Elm_Icon_Data *sd)
(sd->obj, sd->thumb.thumb.path, sd->thumb.thumb.key);
if (ret)
- evas_object_smart_callback_call
- (sd->obj, SIG_THUMB_DONE, NULL);
+ eo_do(sd->obj, eo_event_callback_call
+ (ELM_ICON_EVENT_THUMB_DONE, NULL));
else
- evas_object_smart_callback_call
- (sd->obj, SIG_THUMB_ERROR, NULL);
+ eo_do(sd->obj, eo_event_callback_call
+ (ELM_ICON_EVENT_THUMB_ERROR, NULL));
return ret;
}
@@ -219,7 +219,7 @@ _icon_thumb_error(Ethumb_Client *client,
ERR("could not generate thumbnail for %s (key: %s)",
sd->thumb.file.path, sd->thumb.file.key);
- evas_object_smart_callback_call(sd->obj, SIG_THUMB_ERROR, NULL);
+ eo_do(sd->obj, eo_event_callback_call(ELM_ICON_EVENT_THUMB_ERROR, NULL));
_icon_thumb_cleanup(client);
}
--
[EGIT] [core/elementary] master 18/24: elm_spinner, elm_index: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e550e2361f9f67f8a9c840c1802ece294eb5be12
commit e550e2361f9f67f8a9c840c1802ece294eb5be12
Author: Avi Levin
Date: Wed May 13 15:49:40 2015 +0300
elm_spinner, elm_index: porting evas smart callbacks to eo
---
src/lib/elm_index.c | 30 +
src/lib/elm_index.eo | 2 +-
src/lib/elm_spinner.c | 92 ++-
3 files changed, 73 insertions(+), 51 deletions(-)
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 6195ff5..272fd8c 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -509,7 +509,8 @@ _delay_change_cb(void *data)
sd->delay = NULL;
item = elm_index_selected_item_get(data, sd->level);
- if (item) evas_object_smart_callback_call(data, SIG_DELAY_CHANGED, item);
+ if (item) eo_do(data, eo_event_callback_call
+ (ELM_INDEX_EVENT_DELAY_CHANGED, item));
return ECORE_CALLBACK_CANCEL;
}
@@ -667,12 +668,12 @@ _sel_eval(Evas_Object *obj,
_elm_access_say(ret);
}
- if (om_closest)
-evas_object_smart_callback_call
- (obj, SIG_CHANGED, EO_OBJ(om_closest));
+ if (om_closest)
+eo_do(obj, eo_event_callback_call
+ (ELM_INDEX_EVENT_CHANGED, EO_OBJ(om_closest)));
else
-evas_object_smart_callback_call
- (obj, SIG_CHANGED, EO_OBJ(it));
+eo_do(obj, eo_event_callback_call
+ (ELM_INDEX_EVENT_CHANGED, EO_OBJ(it)));
ecore_timer_del(sd->delay);
sd->delay = ecore_timer_add(sd->delay_change_time,
_delay_change_cb, obj);
@@ -763,7 +764,8 @@ _on_mouse_up(void *data,
eo_item = elm_index_selected_item_get(data, sd->level);
if (eo_item)
{
-evas_object_smart_callback_call(data, SIG_SELECTED, eo_item);
+eo_do(data, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, eo_item));
eo_id_item = eo_item;
ELM_INDEX_ITEM_DATA_GET(eo_id_item, id_item);
if (id_item->func)
@@ -811,7 +813,8 @@ _on_mouse_move(void *data,
sd->level = 1;
snprintf(buf, sizeof(buf), "elm,state,level,%i", sd->level);
elm_layout_signal_emit(data, buf, "elm");
- evas_object_smart_callback_call(data, SIG_LEVEL_UP, NULL);
+ eo_do(data, eo_event_callback_call
+(ELM_INDEX_EVENT_LEVEL_UP, NULL));
}
}
else
@@ -821,7 +824,8 @@ _on_mouse_move(void *data,
sd->level = 0;
snprintf(buf, sizeof(buf), "elm,state,level,%i", sd->level);
elm_layout_signal_emit(data, buf, "elm");
- evas_object_smart_callback_call(data, SIG_LEVEL_DOWN, NULL);
+ eo_do(data, eo_event_callback_call
+(ELM_INDEX_EVENT_LEVEL_DOWN, NULL));
}
}
}
@@ -1216,10 +1220,10 @@ _elm_index_item_selected_set(Eo *eo_it,
edje_object_signal_emit(VIEW(it_active), "elm,state,active", "elm");
edje_object_message_signal_process(VIEW(it_active));
-evas_object_smart_callback_call
- (obj, SIG_CHANGED, eo_it);
-evas_object_smart_callback_call
- (obj, SIG_SELECTED, eo_it);
+eo_do(obj, eo_event_callback_call
+ (ELM_INDEX_EVENT_CHANGED, eo_it));
+eo_do(obj, eo_event_callback_call
+ (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it));
ecore_timer_del(sd->delay);
sd->delay = ecore_timer_add(sd->delay_change_time,
_delay_change_cb, obj);
diff --git a/src/lib/elm_index.eo b/src/lib/elm_index.eo
index 218bfdb..ed3eba6 100644
--- a/src/lib/elm_index.eo
+++ b/src/lib/elm_index.eo
@@ -1,4 +1,4 @@
-class Elm.Index (Elm.Layout)
+class Elm.Index (Elm.Layout, Evas.Clickable_Interface,
Evas.Selectable_Interface)
{
eo_prefix: elm_obj_index;
methods {
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 654e1a6..42ff096 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -132,7 +132,7 @@ _delay_change_timer_cb(void *data)
ELM_SPINNER_DATA_GET(data, sd);
sd->delay_change_timer = NULL;
- evas_object_smart_callback_call(data, SIG_DELAY_CHANGED, NULL);
+ eo_do(data, eo_event_callback_call(ELM_SPINNER_EVENT_DELAY_CHANGED, NULL));
return ECORE_CALLBACK_CANCEL;
}
@@ -165,7 +165,7 @@ _value_set(Evas_Object *obj,
if (new_val == sd->val) return EINA_FALSE;
sd->val = new_val;
- evas_object_sma
[EGIT] [core/elementary] master 12/24: elm_panes: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2b65a7ddce9d03a9bb09080de961f9863c685d35
commit 2b65a7ddce9d03a9bb09080de961f9863c685d35
Author: Avi Levin
Date: Sun May 10 11:57:14 2015 +0300
elm_panes: porting evas smart callbacks to eo
---
src/lib/elm_panes.c | 8
src/lib/elm_panes.eo | 4 +---
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 716f233..335fe95 100644
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -137,7 +137,7 @@ _on_clicked(void *data,
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
- evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
+ eo_do(data, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
NULL));
}
static void
@@ -157,7 +157,7 @@ _on_pressed(void *data,
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
- evas_object_smart_callback_call(data, SIG_PRESS, NULL);
+ eo_do(data, eo_event_callback_call(ELM_PANES_EVENT_PRESS, NULL));
}
static void
@@ -167,11 +167,11 @@ _on_unpressed(void *data,
const char *source EINA_UNUSED)
{
ELM_PANES_DATA_GET(data, sd);
- evas_object_smart_callback_call(data, SIG_UNPRESS, NULL);
+ eo_do(data, eo_event_callback_call(ELM_PANES_EVENT_UNPRESS, NULL));
if (sd->double_clicked)
{
-evas_object_smart_callback_call(data, SIG_DOUBLE_CLICKED, NULL);
+eo_do(data,
eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL));
sd->double_clicked = EINA_FALSE;
}
}
diff --git a/src/lib/elm_panes.eo b/src/lib/elm_panes.eo
index ffab1ef..3a9b833 100644
--- a/src/lib/elm_panes.eo
+++ b/src/lib/elm_panes.eo
@@ -1,4 +1,4 @@
-class Elm.Panes (Elm.Layout)
+class Elm.Panes (Elm.Layout, Evas.Clickable_Interface)
{
eo_prefix: elm_obj_panes;
methods {
@@ -276,10 +276,8 @@ class Elm.Panes (Elm.Layout)
Elm.Layout.content_aliases.get;
}
events {
- clicked;
press;
unpress;
- clicked,double;
}
}
--
[EGIT] [core/elementary] master 01/24: elc_multibuttonentry: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e367cbcc211508bb3d0e212a1a4aa8f41f850dd5
commit e367cbcc211508bb3d0e212a1a4aa8f41f850dd5
Author: Avi Levin
Date: Wed May 6 17:33:22 2015 +0300
elc_multibuttonentry: porting evas smart callbacks to eo
---
src/lib/elc_multibuttonentry.c | 90 -
src/lib/elm_multibuttonentry.eo | 2 +-
2 files changed, 53 insertions(+), 39 deletions(-)
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 24cc158..d379c7b 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -240,8 +240,8 @@ _shrink_mode_set(Evas_Object *obj,
evas_object_show(sd->end);
sd->view_state = MULTIBUTTONENTRY_VIEW_SHRINK;
- evas_object_smart_callback_call
-(obj, SIG_EXPAND_STATE_CHANGED, (void *)1);
+ eo_do(obj, eo_event_callback_call
+(ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void
*)1));
break;
}
}
@@ -273,8 +273,9 @@ _shrink_mode_set(Evas_Object *obj,
}
sd->view_state = MULTIBUTTONENTRY_VIEW_NONE;
-evas_object_smart_callback_call
- (obj, SIG_EXPAND_STATE_CHANGED, (void *)(uintptr_t)sd->shrink);
+eo_do(obj, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED,
+ (void *)(uintptr_t)sd->shrink));
}
if (sd->view_state != MULTIBUTTONENTRY_VIEW_SHRINK)
@@ -329,14 +330,16 @@ _elm_multibuttonentry_elm_widget_on_focus(Eo *obj,
Elm_Multibuttonentry_Data *sd
elm_entry_input_panel_show(sd->entry);
}
}
-evas_object_smart_callback_call(obj, SIG_FOCUSED, NULL);
+eo_do(obj, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_FOCUSED, NULL));
}
else
{
_view_update(sd);
elm_entry_input_panel_hide(sd->entry);
-evas_object_smart_callback_call(obj, SIG_UNFOCUSED, NULL);
+eo_do(obj, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_UNFOCUSED, NULL));
}
end:
@@ -360,7 +363,8 @@ _item_del(Elm_Multibuttonentry_Item_Data *item)
sd->items = eina_list_remove(sd->items, eo_it);
elm_box_unpack(sd->box, VIEW(it));
- evas_object_smart_callback_call(obj, SIG_ITEM_DELETED, eo_it);
+ eo_do(obj, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_ITEM_DELETED, eo_it));
evas_object_del(VIEW(it));
@@ -393,7 +397,8 @@ _current_item_state_change(Evas_Object *obj,
{
case MULTIBUTTONENTRY_BUTTON_STATE_SELECTED:
elm_layout_signal_emit(VIEW(item), "elm,state,focused", "elm");
-evas_object_smart_callback_call(obj, SIG_ITEM_SELECTED, EO_OBJ(item));
+eo_do(obj, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_ITEM_SELECTED, EO_OBJ(item)));
break;
case MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT:
default:
@@ -492,7 +497,8 @@ _on_item_clicked(void *data,
_item_select(WIDGET(it), it);
if (sd->selected_it)
- evas_object_smart_callback_call(WIDGET(it), SIG_ITEM_CLICKED, eo_it);
+ eo_do(WIDGET(it), eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_ITEM_CLICKED, eo_it));
}
static void
@@ -528,7 +534,8 @@ _long_press_cb(void *data)
sd->longpress_timer = NULL;
- evas_object_smart_callback_call(WIDGET(it), SIG_ITEM_LONGPRESSED,
EO_OBJ(it));
+ eo_do(WIDGET(it), eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, EO_OBJ(it)));
return ECORE_CALLBACK_CANCEL;
}
@@ -863,7 +870,8 @@ _item_new(Elm_Multibuttonentry_Data *sd,
default:
break;
}
- evas_object_smart_callback_call(obj, SIG_ITEM_ADDED, eo_item);
+ eo_do(obj, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_ITEM_ADDED, eo_item));
return eo_item;
}
@@ -904,7 +912,7 @@ _mouse_clicked_signal_cb(void *data EINA_UNUSED,
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
+ eo_do(obj, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
NULL));
}
static void
@@ -922,9 +930,11 @@ _box_resize_cb(void *data,
evas_object_geometry_get(sd->box, NULL, NULL, &w, &h);
if (sd->h_box < h)
- evas_object_smart_callback_call(sd->parent, SIG_EXPANDED, NULL);
+ eo_do(sd->parent, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_EXPANDED, NULL));
else if (sd->h_box > h)
- evas_object_smart_callback_call(sd->parent, SIG_CONTRACTED, NULL);
+ eo_do(sd->parent, eo_event_callback_call
+ (ELM_MULTIBUTTONENT
[EGIT] [core/elementary] master 17/24: elm_slideshow, elm_plug: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8ac8bb54f477eb153b4e37eb630273e0bfea77ec
commit 8ac8bb54f477eb153b4e37eb630273e0bfea77ec
Author: Avi Levin
Date: Wed May 13 14:47:09 2015 +0300
elm_slideshow, elm_plug: porting evas smart callbacks to eo
---
src/lib/elm_plug.c | 6 +++---
src/lib/elm_plug.eo | 3 +--
src/lib/elm_slideshow.c | 12
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c
index d7f4448..c3c31aa 100644
--- a/src/lib/elm_plug.c
+++ b/src/lib/elm_plug.c
@@ -42,7 +42,7 @@ _elm_plug_disconnected(Ecore_Evas *ee)
{
Evas_Object *plug = ecore_evas_data_get(ee, PLUG_KEY);
EINA_SAFETY_ON_NULL_RETURN(plug);
- evas_object_smart_callback_call(plug, SIG_IMAGE_DELETED, NULL);
+ eo_do(plug, eo_event_callback_call(ELM_PLUG_EVENT_IMAGE_DELETED, NULL));
/* TODO: was a typo. Deprecated, remove in future releases: */
evas_object_smart_callback_call(plug, "image.deleted", NULL);
}
@@ -55,7 +55,7 @@ _elm_plug_resized(Ecore_Evas *ee)
EINA_SAFETY_ON_NULL_RETURN(plug);
ecore_evas_geometry_get(ee, NULL, NULL, &(size.w), &(size.h));
- evas_object_smart_callback_call(plug, SIG_IMAGE_RESIZED, &size);
+ eo_do(plug, eo_event_callback_call(ELM_PLUG_EVENT_IMAGE_RESIZED, &size));
}
EOLIAN static Eina_Bool
@@ -103,7 +103,7 @@ _on_mouse_up(void *data,
if (ev->button != 1) return;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
- evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
+ eo_do(data, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
NULL));
}
EOLIAN static void
diff --git a/src/lib/elm_plug.eo b/src/lib/elm_plug.eo
index 9b41e68..b89be97 100644
--- a/src/lib/elm_plug.eo
+++ b/src/lib/elm_plug.eo
@@ -1,4 +1,4 @@
-class Elm.Plug (Elm.Widget)
+class Elm.Plug (Elm.Widget, Evas.Clickable_Interface)
{
eo_prefix: elm_obj_plug;
data: null;
@@ -45,7 +45,6 @@ class Elm.Plug (Elm.Widget)
Elm.Widget.on_focus;
}
events {
- clicked;
image,deleted;
image,resized; [[ii]]
}
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 87542c0..7d9c454 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -271,7 +271,8 @@ _on_slideshow_end(void *data,
elm_layout_signal_emit(data, "anim,end", "slideshow");
if (emission != NULL)
- evas_object_smart_callback_call(data, SIG_TRANSITION_END,
EO_OBJ(sd->current));
+ eo_do(data, eo_event_callback_call
+ (ELM_SLIDESHOW_EVENT_TRANSITION_END, EO_OBJ(sd->current)));
}
static Eina_Bool
@@ -480,7 +481,8 @@ _elm_slideshow_item_show(Eo *eo_item EINA_UNUSED,
Elm_Slideshow_Item_Data *item)
sd->previous = sd->current;
sd->current = next;
- evas_object_smart_callback_call(WIDGET(item), SIG_CHANGED,
EO_OBJ(sd->current));
+ eo_do(WIDGET(item), eo_event_callback_call
+ (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current)));
}
EOLIAN static void
@@ -517,7 +519,8 @@ _elm_slideshow_next(Eo *obj, Elm_Slideshow_Data *sd)
sd->previous = sd->current;
sd->current = next;
- evas_object_smart_callback_call(obj, SIG_CHANGED, EO_OBJ(sd->current));
+ eo_do(obj, eo_event_callback_call
+ (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current)));
}
EOLIAN static void
@@ -554,7 +557,8 @@ _elm_slideshow_previous(Eo *obj, Elm_Slideshow_Data *sd)
sd->previous = sd->current;
sd->current = prev;
- evas_object_smart_callback_call(obj, SIG_CHANGED, EO_OBJ(sd->current));
+ eo_do(obj, eo_event_callback_call
+ (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current)));
}
EOLIAN static const Eina_List*
--
[EGIT] [core/elementary] master 22/24: elm_calendar, elm_widget: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f119534baa905877700c8063807c2195399ec8d6
commit f119534baa905877700c8063807c2195399ec8d6
Author: Avi Levin
Date: Thu May 14 14:16:53 2015 +0300
elm_calendar, elm_widget: porting evas smart callbacks to eo
---
src/lib/elm_calendar.c | 6 +++---
src/lib/elm_widget.c | 12 +++-
src/lib/elm_widget.eo | 4
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 18574a1..7fd2491 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -681,9 +681,9 @@ _update_data(Evas_Object *obj, Eina_Bool month,
sd->selected_time.tm_mday = maxdays;
_fix_selected_time(sd);
-evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
+eo_do(obj, eo_event_callback_call(ELM_CALENDAR_EVENT_CHANGED, NULL));
}
- evas_object_smart_callback_call(obj, SIG_DISPLAY_CHANGED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_CALENDAR_EVENT_DISPLAY_CHANGED,
NULL));
return EINA_TRUE;
}
@@ -841,7 +841,7 @@ _update_sel_it(Evas_Object *obj,
sd->selected_time.tm_mday = day;
_fix_selected_time(sd);
_select(obj, sel_it);
- evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_CALENDAR_EVENT_CHANGED, NULL));
}
static void
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index e105da4..f8da6fa 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -875,7 +875,7 @@ elm_widget_access(Evas_Object *obj,
}
eo_do(obj, elm_obj_widget_access(is_access));
- evas_object_smart_callback_call(obj, SIG_WIDGET_ACCESS_CHANGED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL));
return ret;
}
@@ -3462,7 +3462,7 @@ _elm_widget_translate(Eo *obj EINA_UNUSED,
Elm_Widget_Smart_Data *_pd EINA_UNUSE
sd->on_translate = EINA_FALSE;
}
#endif
- evas_object_smart_callback_call(obj, SIG_WIDGET_LANG_CHANGED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_WIDGET_EVENT_LANGUAGE_CHANGED, NULL));
return EINA_TRUE;
}
@@ -5547,7 +5547,8 @@ _elm_widget_on_focus(Eo *obj, Elm_Widget_Smart_Data *sd)
{
if (!sd->resize_obj)
evas_object_focus_set(obj, EINA_TRUE);
- evas_object_smart_callback_call(obj, SIG_WIDGET_FOCUSED, NULL);
+ eo_do(obj, eo_event_callback_call
+ (ELM_WIDGET_EVENT_FOCUSED, NULL));
if (_elm_config->atspi_mode &&
!elm_widget_child_can_focus_get(obj))
elm_interface_atspi_accessible_state_changed_signal_emit(obj,
ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
}
@@ -,10 +5556,11 @@ _elm_widget_on_focus(Eo *obj, Elm_Widget_Smart_Data *sd)
{
if (!sd->resize_obj)
evas_object_focus_set(obj, EINA_FALSE);
- evas_object_smart_callback_call(obj, SIG_WIDGET_UNFOCUSED, NULL);
+ eo_do(obj, eo_event_callback_call
+ (ELM_WIDGET_EVENT_UNFOCUSED, NULL));
if (_elm_config->atspi_mode &&
!elm_widget_child_can_focus_get(obj))
elm_interface_atspi_accessible_state_changed_signal_emit(obj,
ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
- }
+}
}
else
return EINA_FALSE;
diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo
index e45bd5f..090cc79 100644
--- a/src/lib/elm_widget.eo
+++ b/src/lib/elm_widget.eo
@@ -840,5 +840,9 @@ abstract Elm.Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Accessible, Elm_Inte
}
events {
moved;
+ focused;
+ unfocused;
+ language,changed;
+ access,changed;
}
}
--
[EGIT] [core/elementary] master 06/24: elm_hover: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f142b4655b8ac7d6c19470e2be82c4ea4275e14c
commit f142b4655b8ac7d6c19470e2be82c4ea4275e14c
Author: Avi Levin
Date: Thu May 7 17:01:09 2015 +0300
elm_hover: porting evas smart callbacks to eo
---
src/lib/elm_hover.c | 14 --
src/lib/elm_hover.eo | 2 ++
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index d568e27..c55905e 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -243,8 +243,8 @@ _elm_hover_smt_sub_re_eval(Evas_Object *obj)
sd->smt_sub->obj = sub;
if (sd->smt_sub != prev)
- evas_object_smart_callback_call
- (obj, SIG_SMART_LOCATION_CHANGED, (void *)sd->smt_sub->swallow);
+ eo_do(obj, eo_event_callback_call
+ (ELM_HOVER_EVENT_SMART_CHANGED, (void *)sd->smt_sub->swallow));
if (elm_widget_mirrored_get(obj))
{
@@ -517,8 +517,9 @@ _hov_dismiss_cb(void *data,
const char *source EINA_UNUSED)
{
evas_object_hide(data);
- evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
- evas_object_smart_callback_call(data, SIG_DISMISSED, NULL);
+ eo_do(data, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+ eo_do(data, eo_event_callback_call(ELM_HOVER_EVENT_DISMISSED, NULL));
}
EOLIAN static void
@@ -560,8 +561,9 @@ _elm_hover_evas_object_smart_del(Eo *obj, Elm_Hover_Data
*sd)
if (evas_object_visible_get(obj))
{
-evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
-evas_object_smart_callback_call(obj, SIG_DISMISSED, NULL);
+eo_do(obj, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+eo_do(obj, eo_event_callback_call(ELM_HOVER_EVENT_DISMISSED, NULL));
}
elm_hover_target_set(obj, NULL);
diff --git a/src/lib/elm_hover.eo b/src/lib/elm_hover.eo
index 0e8b210..3e2d040 100644
--- a/src/lib/elm_hover.eo
+++ b/src/lib/elm_hover.eo
@@ -88,6 +88,8 @@ class Elm.Hover (Elm.Layout, Evas.Clickable_Interface)
events {
focused;
unfocused;
+ smart,changed;
+ dismissed;
}
}
--
[EGIT] [core/elementary] master 14/24: elc_fileselector, elc_fileselector_button: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=3c5297bcfc91bb909e06a05ecc4b601fa5cdd5fc
commit 3c5297bcfc91bb909e06a05ecc4b601fa5cdd5fc
Author: Avi Levin
Date: Sun May 10 17:49:01 2015 +0300
elc_fileselector, elc_fileselector_button: porting evas smart callbacks to
eo
---
src/lib/elc_fileselector.c | 238 +++--
src/lib/elc_fileselector_button.c | 25 ++--
src/lib/elm_fileselector.eo| 9 +-
src/lib/elm_fileselector_button.eo | 3 +-
4 files changed, 174 insertions(+), 101 deletions(-)
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 32d3cff..7c5fb7e 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -58,8 +58,10 @@ static const Elm_Action key_actions[] = {
{NULL, NULL}
};
-static void _ok(void *data, Evas_Object *obj, void *event_info);
-static void _canc(void *data, Evas_Object *obj, void *event_info);
+static Eina_Bool _ok(void *data,
+ Eo *obj, const Eo_Event_Description *desc, void *event_info);
+static Eina_Bool _canc(void *data,
+ Eo *obj, const Eo_Event_Description *desc, void *event_info);
/* final routine on deletion */
static void
@@ -158,14 +160,14 @@ _elm_fileselector_elm_widget_theme_apply(Eo *obj,
Elm_Fileselector_Data *sd)
static Eina_Bool
_key_action_select(Evas_Object *obj, const char *params EINA_UNUSED)
{
- _ok(obj, NULL, NULL);
+ _ok(obj, NULL, NULL, NULL);
return EINA_TRUE;
}
static Eina_Bool
_key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED)
{
- _canc(obj, NULL, NULL);
+ _canc(obj, NULL, NULL, NULL);
return EINA_TRUE;
}
@@ -546,8 +548,8 @@ _signal_first(Listing_Request *lreq)
EINA_LIST_FREE(sd->paths, path) free(path);
}
- evas_object_smart_callback_call
- (lreq->obj, SIG_DIRECTORY_OPEN, (void *)lreq->path);
+ eo_do(lreq->obj, eo_event_callback_call
+ (ELM_FILESELECTOR_EVENT_DIRECTORY_OPEN, (void *)lreq->path));
if (!lreq->parent_it)
{
@@ -705,45 +707,53 @@ _populate(Evas_Object *obj,
}
-static void
+static Eina_Bool
_on_list_expanded(void *data,
- Evas_Object *obj EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info)
{
Elm_Object_Item *it = event_info;
const char *path = elm_object_item_data_get(it);
_populate(data, path, it, NULL);
+
+ return EINA_TRUE;
}
-static void
-_on_list_contracted(void *data EINA_UNUSED,
-Evas_Object *obj EINA_UNUSED,
+static Eina_Bool
+_on_list_contracted(void *data EINA_UNUSED,
+Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info)
{
Elm_Object_Item *it = event_info;
elm_genlist_item_subitems_clear(it);
+
+ return EINA_TRUE;
}
-static void
-_on_list_expand_req(void *data EINA_UNUSED,
-Evas_Object *obj EINA_UNUSED,
+static Eina_Bool
+_on_list_expand_req(void *data EINA_UNUSED,
+Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info)
{
Elm_Object_Item *it = event_info;
elm_genlist_item_expanded_set(it, EINA_TRUE);
+
+ return EINA_TRUE;
}
-static void
-_on_list_contract_req(void *data EINA_UNUSED,
- Evas_Object *obj EINA_UNUSED,
+static Eina_Bool
+_on_list_contract_req(void *data EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info)
{
Elm_Object_Item *it = event_info;
elm_genlist_item_expanded_set(it, EINA_FALSE);
+
+ return EINA_TRUE;
}
static Eina_Bool
@@ -787,9 +797,9 @@ _schedule_populate(Evas_Object *fs,
sd->populate_idler = ecore_idler_add(_populate_do, sdata);
}
-static void
+static Eina_Bool
_on_item_activated(void *data,
- Evas_Object *obj EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info)
{
//This event_info could be a list or gengrid item
@@ -800,18 +810,21 @@ _on_item_activated(void *data,
ELM_FILESELECTOR_DATA_GET(data, sd);
path = elm_object_item_data_get(it);
- if (!path) return;
+ if (!path) return EINA_TRUE;
is_dir = ecore_file_is_dir(path);
if (!is_dir)
{
-evas_object_smart_callback_call(data, SIG_ACTIVATED, (void *)path);
-return;
+eo_do(data, eo_event_callback_call
+ (ELM_FILESELECTOR_EVENT_ACTIVATED, (void *)path));
+return EINA_TRUE;
}
- if (!sd->double_tap_navigation) return;
+ if (!sd->double_tap_navigation) return EINA_TRUE;
_schedule_populate(data, sd, eina_stringshare_add(path), NULL);
+
+ return EINA_TRUE;
}
static void
@@ -842,9
[EGIT] [core/elementary] master 11/24: elm_scroller: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=9bdf0e86ee09d790746dc45f49db8e753463e06e
commit 9bdf0e86ee09d790746dc45f49db8e753463e06e
Author: Avi Levin
Date: Sun May 10 11:50:37 2015 +0300
elm_scroller: porting evas smart callbacks to eo
---
src/lib/elm_scroller.c | 46 ++
src/lib/elm_scroller.eo | 18 +-
2 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 07ec426..98f103b 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -491,140 +491,146 @@ static void
_edge_left_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_LEFT, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_EDGE_LEFT, NULL));
}
static void
_edge_right_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_RIGHT, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_EDGE_RIGHT, NULL));
}
static void
_edge_top_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_TOP, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_EDGE_TOP, NULL));
}
static void
_edge_bottom_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_BOTTOM, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_EDGE_BOTTOM, NULL));
}
static void
_scroll_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL, NULL);
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
}
static void
_scroll_left_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_LEFT, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_SCROLL_LEFT, NULL));
}
static void
_scroll_right_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_RIGHT, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_SCROLL_RIGHT, NULL));
}
static void
_scroll_up_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_UP, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_SCROLL_UP, NULL));
}
static void
_scroll_down_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_DOWN, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_SCROLL_DOWN, NULL));
}
static void
_scroll_anim_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_START, NULL);
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL));
}
static void
_scroll_anim_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_STOP, NULL);
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL));
}
static void
_scroll_drag_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_START, NULL);
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL));
}
static void
_scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_STOP, NULL);
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL));
}
static void
_vbar_drag_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_VBAR_DRAG, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_VBAR_DRAG, NULL));
}
static void
_vbar_press_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_VBAR_PRESS, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_VBAR_PRESS, NULL));
}
static void
_vbar_unpress_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_VBAR_UNPRESS, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_VBAR_UNPRESS, NULL));
}
static void
_hbar_drag_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_HBAR_DRAG, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_HBAR_DRAG, NULL));
}
static void
_hbar_press_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj
[EGIT] [core/elementary] master 07/24: elm_button: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8222ecd252cf20388bf413654c9e15652b47441d
commit 8222ecd252cf20388bf413654c9e15652b47441d
Author: Avi Levin
Date: Thu May 7 17:29:22 2015 +0300
elm_button: porting evas smart callbacks to eo
---
src/lib/elm_button.c | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 7a2be46..d96ee42 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -66,7 +66,8 @@ _activate(Evas_Object *obj)
_elm_access_say(E_("Clicked"));
if (!elm_widget_disabled_get(obj) &&
!evas_object_freeze_events_get(obj))
- evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
+ eo_do(obj, eo_event_callback_call
+(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
}
}
@@ -89,7 +90,8 @@ _elm_button_elm_widget_activate(Eo *obj, Elm_Button_Data *_pd
EINA_UNUSED, Elm_A
if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE;
if (evas_object_freeze_events_get(obj)) return EINA_FALSE;
- evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
+ eo_do(obj, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
return EINA_TRUE;
@@ -196,7 +198,8 @@ _autorepeat_send(void *data)
{
ELM_BUTTON_DATA_GET_OR_RETURN_VAL(data, sd, ECORE_CALLBACK_CANCEL);
- evas_object_smart_callback_call(data, SIG_REPEATED, NULL);
+ eo_do(data, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, NULL));
if (!sd->repeating)
{
sd->timer = NULL;
@@ -236,7 +239,8 @@ _on_pressed_signal(void *data,
(sd->ar_initial_timeout, _autorepeat_initial_send, data);
}
- evas_object_smart_callback_call(data, SIG_PRESSED, NULL);
+ eo_do(data, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, NULL));
}
static void
@@ -249,7 +253,8 @@ _on_unpressed_signal(void *data,
ELM_SAFE_FREE(sd->timer, ecore_timer_del);
sd->repeating = EINA_FALSE;
- evas_object_smart_callback_call(data, SIG_UNPRESSED, NULL);
+ eo_do(data, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED, NULL));
}
static char *
--
[EGIT] [core/elementary] master 15/24: elm_menu: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=160b62e5d239aa5d2378de349c1c514b280e83f2
commit 160b62e5d239aa5d2378de349c1c514b280e83f2
Author: Avi Levin
Date: Wed May 13 18:15:59 2015 +0300
elm_menu: porting evas smart callbacks to eo
---
src/lib/elm_menu.c | 52 +++-
src/lib/elm_menu.eo | 3 +++
2 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index cf5dbf1..ce49793 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -419,14 +419,17 @@ _menu_hide(void *data,
}
}
-static void
+static Eina_Bool
_hover_dismissed_cb(void *data,
-Evas_Object *obj,
+Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
void *event_info)
{
_menu_hide(data, obj, event_info);
- evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
- evas_object_smart_callback_call(data, SIG_DISMISSED, NULL);
+ eo_do(data, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+ eo_do(data, eo_event_callback_call(ELM_MENU_EVENT_DISMISSED, NULL));
+
+ return EINA_TRUE;
}
static void
@@ -509,8 +512,9 @@ _menu_item_inactivate_cb(void *data,
if (item->submenu.open) _submenu_hide(item);
}
-static void
-_block_menu(void *_sd, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+static Eina_Bool
+_block_menu(void *_sd,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
const Eina_List *l;
Elm_Object_Item *eo_current;
@@ -524,10 +528,13 @@ _block_menu(void *_sd, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSE
current->blocked = EINA_TRUE;
elm_object_item_disabled_set(eo_current, EINA_TRUE);
}
+
+ return EINA_TRUE;
}
-static void
-_unblock_menu(void *_sd, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+static Eina_Bool
+_unblock_menu(void *_sd,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
const Eina_List *l;
Elm_Object_Item *eo_current;
@@ -539,6 +546,8 @@ _unblock_menu(void *_sd, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNU
elm_object_item_disabled_set(eo_current, !current->was_enabled);
current->blocked = EINA_FALSE;
}
+
+ return EINA_TRUE;
}
EOLIAN static void
@@ -605,8 +614,8 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item)
{
snprintf(style, sizeof(style), "main_menu_submenu/%s",
elm_widget_style_get(WIDGET(item)));
elm_object_style_set(hv, style);
-evas_object_smart_callback_add(hv, "dismissed",
- _hover_dismissed_cb, WIDGET(item));
+eo_do(hv, eo_event_callback_add
+ (ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, WIDGET(item)));
}
else
{
@@ -667,8 +676,8 @@ _elm_menu_evas_object_smart_add(Eo *obj, Elm_Menu_Data
*priv)
elm_widget_mirrored_set(priv->hv, EINA_FALSE);
elm_object_style_set(priv->hv, "menu/default");
- evas_object_smart_callback_add(priv->hv, "dismissed",
- _hover_dismissed_cb, obj);
+ eo_do(priv->hv, eo_event_callback_add
+ (ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, obj));
priv->bx = elm_box_add(obj);
elm_widget_mirrored_set(priv->bx, EINA_FALSE);
@@ -741,16 +750,17 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar)
if (menu_bar)
{
- evas_object_smart_callback_add(item->submenu.hv, "clicked",
-_hover_dismissed_cb, WIDGET(item));
+ eo_do(item->submenu.hv, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
+_hover_dismissed_cb, WIDGET(item)));
snprintf(style, sizeof(style), "main_menu_submenu//%s",
elm_widget_style_get(obj));
elm_object_style_set(item->submenu.hv, style);
}
else
{
- evas_object_smart_callback_del_full(item->submenu.hv, "clicked",
- _hover_dismissed_cb,
- WIDGET(item));
+ eo_do(item->submenu.hv, eo_event_callback_del(
+ EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
+ _hover_dismissed_cb, WIDGET(item)));
snprintf(style, sizeof(style), "submenu/%s",
elm_widget_style_get(obj));
elm_object_style_set(item->submenu.hv, style);
}
@@ -786,10 +796,10 @@ _elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd)
(sd->hv, ELM_HOVER_AXIS_VERTICAL), sd->bx);
_sizing_eval(obj);
- evas_object_smart_callba
[EGIT] [core/elementary] master 19/24: elm_layout, elm_label: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=95d11bc6e760d9df13499b6c109b33a27890330b
commit 95d11bc6e760d9df13499b6c109b33a27890330b
Author: Avi Levin
Date: Wed May 13 16:46:41 2015 +0300
elm_layout, elm_label: porting evas smart callbacks to eo
---
src/lib/elm_label.c | 2 +-
src/lib/elm_layout.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 4ef320a..33429f8 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -359,7 +359,7 @@ _on_slide_end(void *data, Evas_Object *obj EINA_UNUSED,
if (sd->slide_ellipsis)
eo_do(data, elm_obj_label_ellipsis_set(EINA_TRUE));
- evas_object_smart_callback_call(data, SIG_SLIDE_END, NULL);
+ eo_do(data, eo_event_callback_call(ELM_LABEL_EVENT_SLIDE_END, NULL));
}
EOLIAN static void
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index f089510..7f8ea1a 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -367,7 +367,7 @@ _elm_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data
*sd)
}
if (ret)
- evas_object_smart_callback_call(obj, SIG_THEME_CHANGED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_LAYOUT_EVENT_THEME_CHANGED, NULL));
ret = _visuals_refresh(obj, sd) && ret;
@@ -409,7 +409,7 @@ _elm_layout_elm_widget_on_focus(Eo *obj,
Elm_Layout_Smart_Data *_pd EINA_UNUSED)
{
elm_layout_signal_emit(obj, "elm,action,focus", "elm");
evas_object_focus_set(wd->resize_obj, EINA_TRUE);
-evas_object_smart_callback_call(obj, SIG_LAYOUT_FOCUSED, NULL);
+eo_do(obj, eo_event_callback_call(ELM_LAYOUT_EVENT_FOCUSED, NULL));
if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
elm_interface_atspi_accessible_state_changed_signal_emit(obj,
ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
}
@@ -417,7 +417,7 @@ _elm_layout_elm_widget_on_focus(Eo *obj,
Elm_Layout_Smart_Data *_pd EINA_UNUSED)
{
elm_layout_signal_emit(obj, "elm,action,unfocus", "elm");
evas_object_focus_set(wd->resize_obj, EINA_FALSE);
-evas_object_smart_callback_call(obj, SIG_LAYOUT_UNFOCUSED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_LAYOUT_EVENT_UNFOCUSED, NULL));
if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
elm_interface_atspi_accessible_state_changed_signal_emit(obj,
ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
}
--
[EGIT] [core/elementary] master 10/24: elm_progressbar: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=64ab036fa5f66476f3da748427597c2cb2867782 commit 64ab036fa5f66476f3da748427597c2cb2867782 Author: Avi Levin Date: Thu May 7 18:17:20 2015 +0300 elm_progressbar: porting evas smart callbacks to eo --- src/lib/elm_progressbar.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c index 5d82b4d..1fbaab3 100644 --- a/src/lib/elm_progressbar.c +++ b/src/lib/elm_progressbar.c @@ -403,7 +403,8 @@ _elm_progressbar_part_value_set(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd, c _val_set(obj); _units_set(obj); - evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); + eo_do(obj, eo_event_callback_call + (ELM_PROGRESSBAR_EVENT_CHANGED, NULL)); } EOLIAN static double @@ -435,7 +436,8 @@ _elm_progressbar_value_set(Eo *obj, Elm_Progressbar_Data *sd, double val) sd->progress_status = eina_list_append(sd->progress_status, ps); _val_set(obj); _units_set(obj); - evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); + eo_do(obj, eo_event_callback_call + (ELM_PROGRESSBAR_EVENT_CHANGED, NULL)); } EOLIAN static double --
[EGIT] [core/elementary] master 09/24: elm_diskselector: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=ea1f362d2f0573034a52236f9bf23b62bf25d3e2
commit ea1f362d2f0573034a52236f9bf23b62bf25d3e2
Author: Avi Levin
Date: Thu May 7 18:14:27 2015 +0300
elm_diskselector: porting evas smart callbacks to eo
---
src/lib/elm_diskselector.c | 24 +++-
src/lib/elm_diskselector.eo | 10 +++---
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index 8433a88..a367f34 100644
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -89,7 +89,8 @@ _item_select(Elm_Diskselector_Item_Data *it)
_selected_item_indicate(sd->selected_item);
if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it),
eo_it);
- evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, eo_it);
+ eo_do(WIDGET(it), eo_event_callback_call
+ (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it));
}
static int
@@ -610,7 +611,8 @@ _item_click_cb(void *data,
}
if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it),
eo_it);
- evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED, eo_it);
+ eo_do(WIDGET(it), eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, eo_it));
}
static char *
@@ -1096,31 +1098,35 @@ _scroll_animate_stop_cb(Evas_Object *obj,
if (!it) return;
_item_select(it);
- evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_STOP, EO_OBJ(it));
+ eo_do(data, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, EO_OBJ(it)));
}
static void
_scroll_animate_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call
- (obj, SIG_SCROLL_ANIM_START, elm_diskselector_selected_item_get(obj));
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START,
+ elm_diskselector_selected_item_get(obj)));
}
static void
_scroll_drag_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call
- (obj, SIG_SCROLL_DRAG_START, elm_diskselector_selected_item_get(obj));
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START,
+ elm_diskselector_selected_item_get(obj)));
}
static void
_scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call
- (obj, SIG_SCROLL_DRAG_STOP, elm_diskselector_selected_item_get(obj));
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP,
+ elm_diskselector_selected_item_get(obj)));
}
static void
diff --git a/src/lib/elm_diskselector.eo b/src/lib/elm_diskselector.eo
index 2a6fb12..9c8ff86 100644
--- a/src/lib/elm_diskselector.eo
+++ b/src/lib/elm_diskselector.eo
@@ -1,5 +1,7 @@
class Elm.Diskselector (Elm.Widget, Elm_Interface_Scrollable,
-Elm_Interface_Atspi_Widget_Action)
+Elm_Interface_Atspi_Widget_Action,
+Evas.Clickable_Interface, Evas.Scrollable_Interface,
+Evas.Selectable_Interface)
{
eo_prefix: elm_obj_diskselector;
methods {
@@ -251,12 +253,6 @@ class Elm.Diskselector (Elm.Widget,
Elm_Interface_Scrollable,
Elm_Interface_Atspi_Widget_Action.elm_actions.get;
}
events {
- selected;
- clicked;
- scroll,anim,start;
- scroll,anim,stop;
- scroll,drag,start;
- scroll,drag,stop;
language,changed;
access,changed;
focused;
--
[EGIT] [core/elementary] master 24/24: elm_video: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=18f64b63f94e0a2f719cd89d48485fa8dc680a0b
commit 18f64b63f94e0a2f719cd89d48485fa8dc680a0b
Author: Avi Levin
Date: Mon May 18 14:44:09 2015 +0300
elm_video: porting evas smart callbacks to eo
---
src/lib/elm_video.c | 62 -
1 file changed, 37 insertions(+), 25 deletions(-)
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index 09bb4ce..80aa739 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -134,43 +134,51 @@ _on_size_hints_changed(void *data EINA_UNUSED,
elm_layout_sizing_eval(obj);
}
-static void
+static Eina_Bool
_on_open_done(void *data,
- Evas_Object *obj EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info EINA_UNUSED)
{
elm_layout_signal_emit(data, "elm,video,open", "elm");
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_on_playback_started(void *data,
- Evas_Object *obj EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info EINA_UNUSED)
{
elm_layout_signal_emit(data, "elm,video,play", "elm");
-}
-static void
+ return EINA_TRUE;
+
+}
+static Eina_Bool
_on_playback_finished(void *data,
- Evas_Object *obj EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info EINA_UNUSED)
{
ELM_VIDEO_DATA_GET(data, sd);
emotion_object_play_set(sd->emotion, EINA_FALSE);
elm_layout_signal_emit(data, "elm,video,end", "elm");
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_on_aspect_ratio_updated(void *data,
- Evas_Object *obj EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info EINA_UNUSED)
{
elm_layout_sizing_eval(data);
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_on_title_changed(void *data,
- Evas_Object *obj EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info EINA_UNUSED)
{
const char *title;
@@ -180,14 +188,18 @@ _on_title_changed(void *data,
title = emotion_object_title_get(sd->emotion);
elm_layout_text_set(data, "elm,title", title);
elm_layout_signal_emit(data, "elm,video,title", "elm");
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_on_audio_level_changed(void *data,
-Evas_Object *obj EINA_UNUSED,
+Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info EINA_UNUSED)
{
(void)data;
+
+ return EINA_TRUE;
}
static Eina_Bool
@@ -238,18 +250,18 @@ _elm_video_evas_object_smart_add(Eo *obj, Elm_Video_Data
*priv)
elm_layout_content_set(obj, "elm.swallow.video", priv->emotion);
- evas_object_smart_callback_add
- (priv->emotion, "open_done", _on_open_done, obj);
- evas_object_smart_callback_add
- (priv->emotion, "playback_started", _on_playback_started, obj);
- evas_object_smart_callback_add
- (priv->emotion, "playback_finished", _on_playback_finished, obj);
- evas_object_smart_callback_add
- (priv->emotion, "frame_resize", _on_aspect_ratio_updated, obj);
- evas_object_smart_callback_add
- (priv->emotion, "title_change", _on_title_changed, obj);
- evas_object_smart_callback_add
- (priv->emotion, "audio_level_change", _on_audio_level_changed, obj);
+ eo_do(priv->emotion, eo_event_callback_add
+ (EMOTION_OBJECT_EVENT_OPEN_DONE, _on_open_done, obj));
+ eo_do(priv->emotion, eo_event_callback_add
+ (EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _on_playback_started, obj));
+ eo_do(priv->emotion, eo_event_callback_add
+ (EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _on_playback_finished, obj));
+ eo_do(priv->emotion, eo_event_callback_add
+ (EMOTION_OBJECT_EVENT_FRAME_RESIZE, _on_aspect_ratio_updated, obj));
+ eo_do(priv->emotion, eo_event_callback_add
+ (EMOTION_OBJECT_EVENT_TITLE_CHANGE, _on_title_changed, obj));
+ eo_do(priv->emotion, eo_event_callback_add
+ (EMOTION_OBJECT_EVENT_AUDIO_LEVEL_CHANGE, _on_audio_level_changed, obj));
evas_object_event_callback_add
(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, NULL);
--
[EGIT] [core/elementary] master 16/24: elm_list, elm_win: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=97e878d818f24f43491241b24dfb2406dd557252
commit 97e878d818f24f43491241b24dfb2406dd557252
Author: Avi Levin
Date: Wed May 13 14:34:44 2015 +0300
elm_list, elm_win: porting evas smart callbacks to eo
---
src/lib/elm_list.c | 42 +
src/lib/elm_list.eo | 9 ++-
src/lib/elm_win.c | 78 ++---
src/lib/elm_win.eo | 3 +--
4 files changed, 73 insertions(+), 59 deletions(-)
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 596e519..7c9d086 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -607,7 +607,8 @@ static Eina_Bool _key_action_select(Evas_Object *obj, const
char *params EINA_UN
if (eo_it)
{
ELM_LIST_ITEM_DATA_GET(eo_it, it);
-evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, eo_it);
+eo_do(WIDGET(it), eo_event_callback_call
+ (ELM_LIST_EVENT_ACTIVATED, eo_it));
}
return EINA_TRUE;
@@ -1155,8 +1156,8 @@ _elm_list_item_focused(Elm_Object_Item *eo_it)
focus_raise = edje_object_data_get(VIEW(it), "focusraise");
if ((focus_raise) && (!strcmp(focus_raise, "on")))
evas_object_raise(VIEW(it));
- evas_object_smart_callback_call
- (WIDGET(it), SIG_ITEM_FOCUSED, eo_it);
+ eo_do(WIDGET(it), eo_event_callback_call
+ (ELM_LIST_EVENT_ITEM_FOCUSED, eo_it));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(eo_it,
ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
}
@@ -1183,7 +1184,7 @@ _elm_list_item_unfocused(Elm_Object_Item *eo_it)
}
sd->focused_item = NULL;
- evas_object_smart_callback_call(obj, SIG_ITEM_UNFOCUSED, eo_it);
+ eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_ITEM_UNFOCUSED, eo_it));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(eo_it,
ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
}
@@ -1364,7 +1365,7 @@ _item_highlight(Elm_List_Item_Data *it)
_elm_list_walk(sd);
edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
- evas_object_smart_callback_call(obj, SIG_HIGHLIGHTED, EO_OBJ(it));
+ eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_HIGHLIGHTED, EO_OBJ(it)));
select_raise = edje_object_data_get(VIEW(it), "selectraise");
if ((select_raise) && (!strcmp(select_raise, "on")))
evas_object_raise(VIEW(it));
@@ -1416,7 +1417,7 @@ call:
_elm_list_walk(sd);
if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it),
eo_it);
- evas_object_smart_callback_call(obj, SIG_SELECTED, eo_it);
+ eo_do(obj, eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED,
eo_it));
sd->last_selected_item = eo_it;
_elm_list_unwalk(obj, sd);
@@ -1441,7 +1442,8 @@ _item_unhighlight(Elm_List_Item_Data *it)
_elm_list_walk(sd);
edje_object_signal_emit(VIEW(it), "elm,state,unselected", "elm");
- evas_object_smart_callback_call(obj, SIG_UNHIGHLIGHTED, EO_OBJ(it));
+ eo_do(obj, eo_event_callback_call
+ (ELM_LIST_EVENT_UNHIGHLIGHTED, EO_OBJ(it)));
stacking = edje_object_data_get(VIEW(it), "stacking");
select_raise = edje_object_data_get(VIEW(it), "selectraise");
if ((select_raise) && (!strcmp(select_raise, "on")))
@@ -1482,7 +1484,8 @@ _item_unselect(Elm_List_Item_Data *it)
sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
if (!(it->base->disabled ||
(sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)))
- evas_object_smart_callback_call(WIDGET(it), SIG_UNSELECTED,
EO_OBJ(it));
+ eo_do(WIDGET(it), eo_event_callback_call
+(EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(it)));
}
_elm_list_unwalk(obj, sd);
@@ -1507,28 +1510,28 @@ static void
_edge_left_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_LEFT, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_LEFT, NULL));
}
static void
_edge_right_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_RIGHT, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_RIGHT, NULL));
}
static void
_edge_top_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_TOP, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_TOP, NULL));
}
static void
_edge_bottom_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_BOTTOM, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_BOTTOM, NULL));
}
static Eina_Bool
@@ -1545,7 +1548,8 @@ _long_p
[EGIT] [core/elementary] master 13/24: elm_entry: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8b19745cf5a7c98c50f63bddaa28aa2bcf4c1090
commit 8b19745cf5a7c98c50f63bddaa28aa2bcf4c1090
Author: Avi Levin
Date: Sun May 10 17:50:04 2015 +0300
elm_entry: porting evas smart callbacks to eo
---
src/lib/elm_entry.c | 126 ++-
src/lib/elm_entry.eo | 19 +++-
2 files changed, 92 insertions(+), 53 deletions(-)
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 52d8070..0755404 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -880,7 +880,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data
*sd)
evas_event_thaw(evas_object_evas_get(obj));
evas_event_thaw_eval(evas_object_evas_get(obj));
- evas_object_smart_callback_call(obj, SIG_THEME_CHANGED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_LAYOUT_EVENT_THEME_CHANGED, NULL));
evas_object_unref(obj);
@@ -892,7 +892,7 @@ _cursor_geometry_recalc(Evas_Object *obj)
{
ELM_ENTRY_DATA_GET(obj, sd);
- evas_object_smart_callback_call(obj, SIG_CURSOR_CHANGED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL));
if (!sd->deferred_recalc_job)
{
@@ -1151,7 +1151,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data
*sd)
if (top && top_is_win && sd->input_panel_enable &&
!sd->input_panel_show_on_demand &&
!edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
-evas_object_smart_callback_call(obj, SIG_FOCUSED, NULL);
+eo_do(obj, eo_event_callback_call(ELM_LAYOUT_EVENT_FOCUSED, NULL));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(obj,
ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
_return_key_enabled_check(obj);
@@ -1164,7 +1164,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data
*sd)
if (top && top_is_win && sd->input_panel_enable &&
!edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
-evas_object_smart_callback_call(obj, SIG_UNFOCUSED, NULL);
+eo_do(obj, eo_event_callback_call(ELM_LAYOUT_EVENT_UNFOCUSED, NULL));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(obj,
ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
@@ -1271,9 +1271,9 @@ _hover_del_job(void *data)
sd->hov_deljob = NULL;
}
-static void
+static Eina_Bool
_hover_dismissed_cb(void *data,
-Evas_Object *obj EINA_UNUSED,
+Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info EINA_UNUSED)
{
ELM_ENTRY_DATA_GET(data, sd);
@@ -1292,6 +1292,8 @@ _hover_dismissed_cb(void *data,
elm_widget_scroll_freeze_pop(data);
ecore_job_del(sd->hov_deljob);
sd->hov_deljob = ecore_job_add(_hover_del_job, data);
+
+ return EINA_TRUE;
}
static void
@@ -1397,7 +1399,8 @@ _paste_cb(void *data,
ELM_ENTRY_DATA_GET(data, sd);
- evas_object_smart_callback_call(data, SIG_SELECTION_PASTE, NULL);
+ eo_do(data, eo_event_callback_call
+ (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE, NULL));
sd->selection_asked = EINA_TRUE;
@@ -1448,7 +1451,8 @@ _cut_cb(void *data,
{
ELM_ENTRY_DATA_GET(data, sd);
- evas_object_smart_callback_call(data, SIG_SELECTION_CUT, NULL);
+ eo_do(data, eo_event_callback_call
+ (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CUT, NULL));
/* Store it */
sd->sel_mode = EINA_FALSE;
if (!_elm_config->desktop_entry)
@@ -1470,7 +1474,8 @@ _copy_cb(void *data,
{
ELM_ENTRY_DATA_GET(data, sd);
- evas_object_smart_callback_call(data, SIG_SELECTION_COPY, NULL);
+ eo_do(data, eo_event_callback_call
+ (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_COPY, NULL));
sd->sel_mode = EINA_FALSE;
if (!_elm_config->desktop_entry)
{
@@ -1558,8 +1563,8 @@ _menu_call(Evas_Object *obj)
if (top) elm_hoversel_hover_parent_set(sd->hoversel, top);
-evas_object_smart_callback_add
- (sd->hoversel, "dismissed", _hover_dismissed_cb, obj);
+eo_do(sd->hoversel, eo_event_callback_add
+ (ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, obj));
if (sd->have_selection)
{
if (!sd->password)
@@ -1769,7 +1774,8 @@ _long_press_cb(void *data)
sd->long_pressed = EINA_TRUE;
sd->longpress_timer = NULL;
- evas_object_smart_callback_call(data, SIG_LONGPRESSED, NULL);
+ eo_do(data, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, NULL));
return ECORE_CALLBACK_CANCEL;
}
@@ -1934,7 +19
[EGIT] [core/elementary] master 02/24: elm_frame: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=b25d43fd5a803ecf64850156a86f27c8e1c79353
commit b25d43fd5a803ecf64850156a86f27c8e1c79353
Author: Avi Levin
Date: Tue Jun 9 16:31:38 2015 +0300
elm_frame: porting evas smart callbacks to eo
---
src/lib/elm_frame.c | 22 --
src/lib/elm_frame.eo | 1 -
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index 04f7402..d5ebc1f 100644
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -96,12 +96,13 @@ _elm_frame_elm_widget_focus_direction(Eo *obj EINA_UNUSED,
Elm_Frame_Data *_pd E
}
}
-static void
+static Eina_Bool
_recalc(void *data,
-Evas_Object *obj EINA_UNUSED,
-void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
elm_layout_sizing_eval(data);
+
+ return EINA_TRUE;
}
static void
@@ -113,8 +114,8 @@ _on_recalc_done(void *data,
ELM_FRAME_DATA_GET(data, sd);
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
- evas_object_smart_callback_del
- (wd->resize_obj, "recalc", _recalc);
+ eo_do(wd->resize_obj, eo_event_callback_del
+ (EDJE_OBJECT_EVENT_RECALC, _recalc, data));
sd->anim = EINA_FALSE;
elm_layout_sizing_eval(data);
@@ -133,13 +134,14 @@ _on_frame_clicked(void *data,
if (sd->collapsible)
{
-evas_object_smart_callback_add
- (wd->resize_obj, "recalc", _recalc, data);
+eo_do(wd->resize_obj, eo_event_callback_add(
+ EDJE_OBJECT_EVENT_RECALC, _recalc, data));
elm_layout_signal_emit(data, "elm,action,toggle", "elm");
sd->collapsed++;
sd->anim = EINA_TRUE;
}
- evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
+ eo_do(data, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
}
/* using deferred sizing evaluation, just like the parent */
@@ -249,8 +251,8 @@ _elm_frame_collapse_go(Eo *obj, Elm_Frame_Data *sd,
Eina_Bool collapse)
if (sd->collapsed == collapse) return;
elm_layout_signal_emit(obj, "elm,action,toggle", "elm");
- evas_object_smart_callback_add
- (wd->resize_obj, "recalc", _recalc, obj);
+ eo_do(wd->resize_obj, eo_event_callback_call
+ (EDJE_OBJECT_EVENT_RECALC, obj));
sd->collapsed = collapse;
sd->anim = EINA_TRUE;
}
diff --git a/src/lib/elm_frame.eo b/src/lib/elm_frame.eo
index e6945fa..aa95b68 100644
--- a/src/lib/elm_frame.eo
+++ b/src/lib/elm_frame.eo
@@ -73,7 +73,6 @@ class Elm.Frame (Elm.Layout, Evas.Clickable_Interface)
Elm.Layout.content_aliases.get;
}
events {
- clicked;
language,changed;
access,changed;
}
--
[EGIT] [core/elementary] master 05/24: elm_photocam: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6094814db44d978a0d672d40db36922721a2b82d
commit 6094814db44d978a0d672d40db36922721a2b82d
Author: Avi Levin
Date: Thu May 7 15:44:02 2015 +0300
elm_photocam: porting evas smart callbacks to eo
---
src/lib/elm_photocam.c | 81 -
src/lib/elm_photocam.eo | 15 ++---
2 files changed, 50 insertions(+), 46 deletions(-)
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 7d27230..2456425 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -137,7 +137,7 @@ _calc_job_cb(void *data)
sd->minw = minw;
sd->minh = minh;
-evas_object_smart_callback_call(sd->pan_obj, "changed", NULL);
+eo_do(sd->pan_obj, eo_event_callback_call(ELM_PAN_EVENT_CHANGED,
NULL));
_sizing_eval(obj);
}
sd->calc_job = NULL;
@@ -258,8 +258,8 @@ _grid_load(Evas_Object *obj,
edje_object_signal_emit
(wd->resize_obj,
"elm,state,busy,start", "elm");
- evas_object_smart_callback_call
- (obj, SIG_LOAD_DETAIL, NULL);
+ eo_do(obj, eo_event_callback_call
+(ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL));
}
}
else if ((g->grid[tn].want) && (!visible))
@@ -270,8 +270,8 @@ _grid_load(Evas_Object *obj,
edje_object_signal_emit
(wd->resize_obj,
"elm,state,busy,stop", "elm");
- evas_object_smart_callback_call
- (obj, SIG_LOADED_DETAIL, NULL);
+ eo_do(obj, eo_event_callback_call
+(ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL));
}
g->grid[tn].want = 0;
evas_object_hide(g->grid[tn].img);
@@ -468,8 +468,8 @@ _grid_clear(Evas_Object *obj,
edje_object_signal_emit
(wd->resize_obj,
"elm,state,busy,stop", "elm");
- evas_object_smart_callback_call
- (obj, SIG_LOAD_DETAIL, NULL);
+ eo_do(obj, eo_event_callback_call
+ (ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL));
}
}
}
@@ -501,8 +501,8 @@ _tile_preloaded_cb(void *data,
edje_object_signal_emit
(wd->resize_obj, "elm,state,busy,stop",
"elm");
- evas_object_smart_callback_call
- (wd->obj, SIG_LOADED_DETAIL, NULL);
+ eo_do(wd->obj, eo_event_callback_call
+ (ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL));
}
}
}
@@ -698,13 +698,14 @@ _main_img_preloaded_cb(void *data,
}
ecore_job_del(sd->calc_job);
sd->calc_job = ecore_job_add(_calc_job_cb, data);
- evas_object_smart_callback_call(data, SIG_LOADED, NULL);
+ eo_do(data, eo_event_callback_call(ELM_PHOTOCAM_EVENT_LOADED, NULL));
sd->preload_num--;
if (!sd->preload_num)
{
edje_object_signal_emit
(wd->resize_obj, "elm,state,busy,stop", "elm");
-evas_object_smart_callback_call(obj, SIG_LOADED_DETAIL, NULL);
+eo_do(obj, eo_event_callback_call
+ (ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL));
}
}
@@ -788,7 +789,7 @@ _zoom_anim_cb(void *data)
sd->no_smooth--;
if (!sd->no_smooth) _smooth_update(data);
sd->zoom_animator = NULL;
-evas_object_smart_callback_call(obj, SIG_ZOOM_STOP, NULL);
+eo_do(obj,
eo_event_callback_call(EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL));
}
return go;
@@ -801,7 +802,8 @@ _long_press_cb(void *data)
sd->long_timer = NULL;
sd->longpressed = EINA_TRUE;
- evas_object_smart_callback_call(data, SIG_LONGPRESSED, NULL);
+ eo_do(data, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, NULL));
return ECORE_CALLBACK_CANCEL;
}
@@ -820,9 +822,10 @@ _mouse_down_cb(void *data,
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->on_hold = EINA_TRUE;
else sd->on_hold = EINA_FALSE;
if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
- evas_object_smart_callback_call(data, SIG_CLICKED_DOUBLE, NULL);
+ eo_do(data, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL));
else
- evas_object_smart_callback_call(data, SIG_PRESS, NULL);
+ eo_do(data, eo_event_callback_call(ELM_PHOTOCAM_EVENT_PRESS, NULL));
sd->longpressed = EINA_FALSE;
ecore_tim
[EGIT] [core/elementary] master 04/24: elm_web2: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=41c90235c998a43a35e2ef72e2fd8f947977ebcb
commit 41c90235c998a43a35e2ef72e2fd8f947977ebcb
Author: Avi Levin
Date: Thu May 7 14:51:46 2015 +0300
elm_web2: porting evas smart callbacks to eo
---
src/lib/elm_web.eo | 1 +
src/lib/elm_web2.c | 61 +-
2 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/src/lib/elm_web.eo b/src/lib/elm_web.eo
index e0b8863..a9ff918 100644
--- a/src/lib/elm_web.eo
+++ b/src/lib/elm_web.eo
@@ -675,6 +675,7 @@ class Elm.Web (Elm.Widget)
url,changed; [[s]]
focused;
unfocused;
+ windows,close,request;
}
}
diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index 94e94eb..c37bcd8 100644
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -78,7 +78,7 @@ _view_smart_window_close(Ewk_View_Smart_Data *sd)
ELM_WEB_CHECK(obj);
- evas_object_smart_callback_call(obj, "windows,close,request", NULL);
+ eo_do(obj, eo_event_callback_call(ELM_WEB_EVENT_WINDOWS_CLOSE_REQUEST,
NULL);
}
static void
@@ -194,8 +194,8 @@ _view_smart_popup_menu_show(Ewk_View_Smart_Data *sd,
evas_object_data_set(sd->self, "_select_popup", notify);
- evas_object_smart_callback_add
- (notify, "block,clicked", _popup_dismiss_cb, menu);
+ eo_do(notify, eo_event_callback_add
+ (ELM_NOTIFY_EVENT_BLOCK_CLICKED, _popup_dismiss_cb, menu));
return EINA_TRUE;
}
@@ -212,19 +212,25 @@ _view_smart_popup_menu_hide(Ewk_View_Smart_Data *sd)
return EINA_TRUE;
}
-static void
-_fullscreen_accept(void *data, Evas_Object *obj EINA_UNUSED, void *ev
EINA_UNUSED)
+static Eina_Bool
+_fullscreen_accept(void *data,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Evas_Object *ewk = data;
evas_object_del(evas_object_data_get(ewk, "_fullscreen_permission_popup"));
+
+ return EINA_TRUE;
}
-static void
-_fullscreen_deny(void *data, Evas_Object *obj EINA_UNUSED, void *ev
EINA_UNUSED)
+static Eina_Bool
+_fullscreen_deny(void *data,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Evas_Object *ewk = data;
ewk_view_fullscreen_exit(ewk);
evas_object_del(evas_object_data_get(ewk, "_fullscreen_permission_popup"));
+
+ return EINA_TRUE;
}
static Eina_Bool
@@ -252,12 +258,14 @@ _view_smart_fullscreen_enter(Ewk_View_Smart_Data *sd,
Ewk_Security_Origin *origi
btn = elm_button_add(popup);
elm_object_text_set(btn, "Accept");
elm_object_part_content_set(popup, "button1", btn);
- evas_object_smart_callback_add(btn, "clicked", _fullscreen_accept,
sd->self);
+ eo_do(btn, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _fullscreen_accept, sd->self));
btn = elm_button_add(popup);
elm_object_text_set(btn, "Deny");
elm_object_part_content_set(popup, "button2", btn);
- evas_object_smart_callback_add(btn, "clicked", _fullscreen_deny, sd->self);
+ eo_do(btn, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _fullscreen_deny, sd->self));
evas_object_data_set(sd->self, "_fullscreen_permission_popup", popup);
evas_object_show(popup);
@@ -278,10 +286,9 @@ _view_smart_fullscreen_exit(Ewk_View_Smart_Data *sd)
return EINA_TRUE;
}
-static void
+static Eina_Bool
_bt_close(void *data,
- Evas_Object *obj,
- void *event_info EINA_UNUSED)
+ Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info
EINA_UNUSED)
{
Dialog_Data *d = data;
@@ -296,6 +303,8 @@ _bt_close(void *data,
end:
evas_object_del(d->dialog);
free(d);
+
+ return EINA_TRUE;
}
static Dialog_Data *
@@ -311,8 +320,8 @@ _dialog_new(Evas_Object *web, Eina_Bool inwin_mode)
Evas_Object *bg;
d->dialog = elm_win_add(NULL, "elm-web-popup", ELM_WIN_DIALOG_BASIC);
-evas_object_smart_callback_add
- (d->dialog, "delete,request", _bt_close, d);
+eo_do(d->dialog, eo_event_callback_add
+ (ELM_WIN_EVENT_DELETE_REQUEST, _bt_close, d));
bg = elm_bg_add(d->dialog);
evas_object_size_hint_weight_set
@@ -361,7 +370,8 @@ _dialog_ok_cancel_buttons_add(Dialog_Data *dialog_data)
elm_box_pack_end(bx, bt);
evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_smart_callback_add(bt, "clicked", _bt_close, dialog_data);
+ eo_do(bt, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _bt_close, dialog_data));
evas_object_show(bt);
dialog_data->bt_ok = bt = elm_button_add(
[EGIT] [core/elementary] master 03/24: elm_radio, elm_slider: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=cd8fd5c9c49a07ff6f5db32e94d4676a0b2d4849
commit cd8fd5c9c49a07ff6f5db32e94d4676a0b2d4849
Author: Avi Levin
Date: Tue Jun 9 16:33:29 2015 +0300
elm_radio, elm_slider: porting evas smart callbacks to eo
---
src/lib/elm_radio.c | 4 +++-
src/lib/elm_slider.c | 19 ++-
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index efa57cb..715b5a8 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -109,7 +109,9 @@ _activate(Evas_Object *obj)
if (_elm_config->access_mode)
_elm_access_say(E_("State: On"));
-evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
+eo_do(obj, eo_event_callback_call
+ (ELM_RADIO_EVENT_CHANGED, NULL));
+
}
}
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 8ace028..5d8eafc 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -63,7 +63,7 @@ _delay_change(void *data)
ELM_SLIDER_DATA_GET(data, sd);
sd->delay = NULL;
- evas_object_smart_callback_call(data, SIG_DELAY_CHANGED, NULL);
+ eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_DELAY_CHANGED, NULL));
return ECORE_CALLBACK_CANCEL;
}
@@ -94,7 +94,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
sd->val = val;
if (user_event)
{
- evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SLIDER_EVENT_CHANGED,
NULL));
elm_interface_atspi_accessible_value_changed_signal_emit(obj);
ecore_timer_del(sd->delay);
sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL,
_delay_change, obj);
@@ -241,7 +241,7 @@ _drag_start(void *data,
const char *source EINA_UNUSED)
{
_slider_update(data, EINA_TRUE);
- evas_object_smart_callback_call(data, SIG_DRAG_START, NULL);
+ eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_START,
NULL));
elm_widget_scroll_freeze_push(data);
}
@@ -252,7 +252,7 @@ _drag_stop(void *data,
const char *source EINA_UNUSED)
{
_slider_update(data, EINA_TRUE);
- evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
+ eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_STOP,
NULL));
elm_widget_scroll_freeze_pop(data);
}
@@ -645,7 +645,7 @@ _spacer_down_cb(void *data,
(wd->resize_obj, "elm.dragable.slider",
button_x, button_y);
_slider_update(data, EINA_TRUE);
- evas_object_smart_callback_call(data, SIG_DRAG_START, NULL);
+ eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_START,
NULL));
elm_layout_signal_emit(data, "elm,state,indicator,show", "elm");
}
@@ -682,7 +682,8 @@ _spacer_move_cb(void *data,
{
if (sd->spacer_down) sd->spacer_down = EINA_FALSE;
_slider_update(data, EINA_TRUE);
- evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
+ eo_do(data, eo_event_callback_call
+ (ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL));
if (sd->frozen)
{
elm_widget_scroll_freeze_pop(data);
@@ -725,7 +726,7 @@ _spacer_up_cb(void *data,
if (sd->spacer_down) sd->spacer_down = EINA_FALSE;
_slider_update(data, EINA_TRUE);
- evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
+ eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_STOP,
NULL));
if (sd->frozen)
{
@@ -1236,12 +1237,12 @@
_elm_slider_elm_interface_atspi_value_value_and_text_set(Eo *obj, Elm_Slider_Dat
if (sd->val_min > value) return EINA_FALSE;
if (sd->val_max < value) return EINA_FALSE;
- evas_object_smart_callback_call(obj, SIG_DRAG_START, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_START,
NULL));
sd->val = value;
_visuals_refresh(obj);
sd->val = oldval;
_slider_update(obj, EINA_TRUE);
- evas_object_smart_callback_call(obj, SIG_DRAG_STOP, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL));
return EINA_TRUE;
}
--
