summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-03-08 09:02:30 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-03-08 09:02:30 -0500
commita007badbed3972f86bdd09dd974fbfbbde5bc20d (patch)
tree48f55dafbc2f9e42f3b2e1af77d517a383f4ed3d
parentc876ac52d91806bfc6440b10387ccb91e6a75abf (diff)
efl_canvas_scene: rename event from focus,* to scene_focus,*
Summary: This event can just be renamed, no need to handle legacy. The reason for this, that this event is used to map to EVAS_CALLBACK_ enum fields, which means, the legacy names of the event does not matter. ref T7476 Reviewers: cedric, segfaultxavi, zmike, stefan_schmidt Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7476 Differential Revision: https://phab.enlightenment.org/D8242
-rw-r--r--src/lib/edje/edje_entry.c8
-rw-r--r--src/lib/efl/interfaces/efl_canvas_scene.eo4
-rw-r--r--src/lib/elementary/efl_ui_win.c12
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c4
4 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index 5783fabbc7..b5397b2c91 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -2889,9 +2889,9 @@ _edje_entry_init(Edje *ed)
2889 _edje_key_down_cb, ed); 2889 _edje_key_down_cb, ed);
2890 evas_object_event_callback_add(ed->obj, EVAS_CALLBACK_KEY_UP, 2890 evas_object_event_callback_add(ed->obj, EVAS_CALLBACK_KEY_UP,
2891 _edje_key_up_cb, ed); 2891 _edje_key_up_cb, ed);
2892 efl_event_callback_add(ed->base.evas, EFL_CANVAS_SCENE_EVENT_FOCUS_IN, 2892 efl_event_callback_add(ed->base.evas, EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_IN,
2893 _evas_focus_in_cb, ed); 2893 _evas_focus_in_cb, ed);
2894 efl_event_callback_add(ed->base.evas, EFL_CANVAS_SCENE_EVENT_FOCUS_OUT, 2894 efl_event_callback_add(ed->base.evas, EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_OUT,
2895 _evas_focus_out_cb, ed); 2895 _evas_focus_out_cb, ed);
2896} 2896}
2897 2897
@@ -2910,9 +2910,9 @@ _edje_entry_shutdown(Edje *ed)
2910 _edje_key_down_cb); 2910 _edje_key_down_cb);
2911 evas_object_event_callback_del(ed->obj, EVAS_CALLBACK_KEY_UP, 2911 evas_object_event_callback_del(ed->obj, EVAS_CALLBACK_KEY_UP,
2912 _edje_key_up_cb); 2912 _edje_key_up_cb);
2913 efl_event_callback_del(ed->base.evas, EFL_CANVAS_SCENE_EVENT_FOCUS_IN, 2913 efl_event_callback_del(ed->base.evas, EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_IN,
2914 _evas_focus_in_cb, ed); 2914 _evas_focus_in_cb, ed);
2915 efl_event_callback_del(ed->base.evas, EFL_CANVAS_SCENE_EVENT_FOCUS_OUT, 2915 efl_event_callback_del(ed->base.evas, EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_OUT,
2916 _evas_focus_out_cb, ed); 2916 _evas_focus_out_cb, ed);
2917} 2917}
2918 2918
diff --git a/src/lib/efl/interfaces/efl_canvas_scene.eo b/src/lib/efl/interfaces/efl_canvas_scene.eo
index 75b64d54f3..c5b4f16a26 100644
--- a/src/lib/efl/interfaces/efl_canvas_scene.eo
+++ b/src/lib/efl/interfaces/efl_canvas_scene.eo
@@ -224,8 +224,8 @@ interface @beta Efl.Canvas.Scene
224 } 224 }
225 } 225 }
226 events { 226 events {
227 focus,in: Efl.Input.Focus; [[Called when canvas got focus]] 227 scene,focus,in: Efl.Input.Focus; [[Called when scene got focus]]
228 focus,out: Efl.Input.Focus; [[Called when canvas lost focus]] 228 scene,focus,out: Efl.Input.Focus; [[Called when scene lost focus]]
229 object,focus,in: Efl.Input.Focus; [[Called when object got focus]] 229 object,focus,in: Efl.Input.Focus; [[Called when object got focus]]
230 object,focus,out: Efl.Input.Focus; [[Called when object lost focus]] 230 object,focus,out: Efl.Input.Focus; [[Called when object lost focus]]
231 render,pre: void; [[Called when pre render happens]] 231 render,pre: void; [[Called when pre render happens]]
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 4989adf344..553e42aed9 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2025,7 +2025,7 @@ _elm_win_evas_focus_in(void *data,
2025 Eo *win = data; 2025 Eo *win = data;
2026 2026
2027 _elm_win_throttle_ok = EINA_TRUE; 2027 _elm_win_throttle_ok = EINA_TRUE;
2028 efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_FOCUS_IN, NULL); 2028 efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_IN, NULL);
2029} 2029}
2030 2030
2031static void 2031static void
@@ -2035,7 +2035,7 @@ _elm_win_evas_focus_out(void *data,
2035{ 2035{
2036 Eo *win = data; 2036 Eo *win = data;
2037 2037
2038 efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_FOCUS_OUT, NULL); 2038 efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_OUT, NULL);
2039} 2039}
2040 2040
2041static void 2041static void
@@ -2170,13 +2170,13 @@ _win_event_add_cb(void *data, const Efl_Event *ev)
2170 evas_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_PRE, 2170 evas_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_PRE,
2171 _elm_win_evas_render_pre, win); 2171 _elm_win_evas_render_pre, win);
2172 } 2172 }
2173 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_FOCUS_IN) 2173 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_IN)
2174 { 2174 {
2175 if (!(sd->event_forward.focus_in++)) 2175 if (!(sd->event_forward.focus_in++))
2176 evas_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_IN, 2176 evas_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_IN,
2177 _elm_win_evas_focus_in, win); 2177 _elm_win_evas_focus_in, win);
2178 } 2178 }
2179 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_FOCUS_OUT) 2179 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_OUT)
2180 { 2180 {
2181 if (!(sd->event_forward.focus_out++)) 2181 if (!(sd->event_forward.focus_out++))
2182 evas_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_OUT, 2182 evas_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_OUT,
@@ -2301,13 +2301,13 @@ _win_event_del_cb(void *data, const Efl_Event *ev)
2301 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_RENDER_PRE, 2301 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_RENDER_PRE,
2302 _elm_win_evas_render_pre, win); 2302 _elm_win_evas_render_pre, win);
2303 } 2303 }
2304 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_FOCUS_IN) 2304 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_IN)
2305 { 2305 {
2306 if (!(--sd->event_forward.focus_in)) 2306 if (!(--sd->event_forward.focus_in))
2307 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_FOCUS_IN, 2307 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_FOCUS_IN,
2308 _elm_win_evas_focus_in, win); 2308 _elm_win_evas_focus_in, win);
2309 } 2309 }
2310 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_FOCUS_OUT) 2310 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_OUT)
2311 { 2311 {
2312 if (!(--sd->event_forward.focus_out)) 2312 if (!(--sd->event_forward.focus_out))
2313 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_FOCUS_OUT, 2313 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_FOCUS_OUT,
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index c8cbb56640..724eaa390f 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -57,8 +57,8 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST,
57 EFL_EVENT_HOLD, 57 EFL_EVENT_HOLD,
58 EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, 58 EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
59 EFL_GFX_IMAGE_EVENT_PRELOAD, 59 EFL_GFX_IMAGE_EVENT_PRELOAD,
60 EFL_CANVAS_SCENE_EVENT_FOCUS_IN, 60 EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_IN,
61 EFL_CANVAS_SCENE_EVENT_FOCUS_OUT, 61 EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_OUT,
62 EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE, 62 EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE,
63 EVAS_CANVAS_EVENT_RENDER_FLUSH_POST, 63 EVAS_CANVAS_EVENT_RENDER_FLUSH_POST,
64 EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_IN, 64 EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_IN,