summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorJee-Yong Um <jc9.um@samsung.com>2017-02-07 15:08:19 -0800
committerCedric BAIL <cedric@osg.samsung.com>2017-02-07 15:14:54 -0800
commit57c14f1c55fc6fa9338c0291db66307bfeca305b (patch)
tree58c845f3e8ed5f19990c62b22ffa4990cd74e897 /src/lib/edje
parent9fa4a5fb6dc5b616e67a6b47042b62c9dfcab167 (diff)
edje: fix cached edje modification issue
Summary: _edje_part_***_set/get (for mouse_events, repeat_events, ignore_flags, mask_flags) overwrite cached edje value. These behaviors affect all edje object added after these changes, and result in not intended. @fix Reviewers: jpeg, cedric Subscribers: akanad, woohyun Differential Revision: https://phab.enlightenment.org/D4362 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_callbacks.c26
-rw-r--r--src/lib/edje/edje_embryo.c16
-rw-r--r--src/lib/edje/edje_entry.c20
-rw-r--r--src/lib/edje/edje_load.c9
-rw-r--r--src/lib/edje/edje_private.h20
-rw-r--r--src/lib/edje/edje_util.c40
6 files changed, 69 insertions, 62 deletions
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 88154891fa..ac6f52c9eb 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -68,10 +68,10 @@ _edje_mouse_in_signal_cb(void *data, const Efl_Event *event)
68 rp = evas_object_data_get(event->object, "real_part"); 68 rp = evas_object_data_get(event->object, "real_part");
69 if (rp) 69 if (rp)
70 { 70 {
71 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags)) 71 if (!(ev->event_flags) || !(rp->ignore_flags & ev->event_flags))
72 _edje_seat_emit(ed, ev->device, "mouse,in", rp->part->name); 72 _edje_seat_emit(ed, ev->device, "mouse,in", rp->part->name);
73 73
74 ev->event_flags |= rp->part->mask_flags; 74 ev->event_flags |= rp->mask_flags;
75 } 75 }
76} 76}
77 77
@@ -87,10 +87,10 @@ _edje_mouse_out_signal_cb(void *data, const Efl_Event *event)
87 rp = evas_object_data_get(event->object, "real_part"); 87 rp = evas_object_data_get(event->object, "real_part");
88 if (rp) 88 if (rp)
89 { 89 {
90 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags)) 90 if (!(ev->event_flags) || !(rp->ignore_flags & ev->event_flags))
91 _edje_seat_emit(ed, ev->device, "mouse,out", rp->part->name); 91 _edje_seat_emit(ed, ev->device, "mouse,out", rp->part->name);
92 92
93 ev->event_flags |= rp->part->mask_flags; 93 ev->event_flags |= rp->mask_flags;
94 } 94 }
95} 95}
96 96
@@ -108,7 +108,7 @@ _edje_mouse_down_signal_cb(void *data, const Efl_Event *event)
108 rp = evas_object_data_get(event->object, "real_part"); 108 rp = evas_object_data_get(event->object, "real_part");
109 if (!rp) return; 109 if (!rp) return;
110 110
111 ignored = rp->part->ignore_flags & ev->event_flags; 111 ignored = rp->ignore_flags & ev->event_flags;
112 112
113 _edje_ref(ed); 113 _edje_ref(ed);
114 _edje_util_freeze(ed); 114 _edje_util_freeze(ed);
@@ -160,7 +160,7 @@ _edje_mouse_down_signal_cb(void *data, const Efl_Event *event)
160 _edje_util_thaw(ed); 160 _edje_util_thaw(ed);
161 _edje_unref(ed); 161 _edje_unref(ed);
162 162
163 ev->event_flags |= rp->part->mask_flags; 163 ev->event_flags |= rp->mask_flags;
164} 164}
165 165
166static void 166static void
@@ -177,7 +177,7 @@ _edje_mouse_up_signal_cb(void *data, const Efl_Event *event)
177 rp = evas_object_data_get(event->object, "real_part"); 177 rp = evas_object_data_get(event->object, "real_part");
178 if (!rp) return; 178 if (!rp) return;
179 179
180 ignored = rp->part->ignore_flags & ev->event_flags; 180 ignored = rp->ignore_flags & ev->event_flags;
181 181
182 _edje_ref(ed); 182 _edje_ref(ed);
183 _edje_util_freeze(ed); 183 _edje_util_freeze(ed);
@@ -234,7 +234,7 @@ _edje_mouse_up_signal_cb(void *data, const Efl_Event *event)
234 _edje_util_thaw(ed); 234 _edje_util_thaw(ed);
235 _edje_unref(ed); 235 _edje_unref(ed);
236 236
237 ev->event_flags |= rp->part->mask_flags; 237 ev->event_flags |= rp->mask_flags;
238} 238}
239 239
240static void 240static void
@@ -254,7 +254,7 @@ _edje_mouse_move_signal_cb(void *data, const Efl_Event *event)
254 rp = ed->table_parts[rp->part->dragable.event_id % ed->table_parts_size]; 254 rp = ed->table_parts[rp->part->dragable.event_id % ed->table_parts_size];
255 } 255 }
256 256
257 ignored = rp->part->ignore_flags & ev->event_flags; 257 ignored = rp->ignore_flags & ev->event_flags;
258 258
259 _edje_ref(ed); 259 _edje_ref(ed);
260 if ((!ev->event_flags) || (!ignored)) 260 if ((!ev->event_flags) || (!ignored))
@@ -344,7 +344,7 @@ _edje_mouse_move_signal_cb(void *data, const Efl_Event *event)
344 _edje_unref(ed); 344 _edje_unref(ed);
345 _edje_util_thaw(ed); 345 _edje_util_thaw(ed);
346 346
347 ev->event_flags |= rp->part->mask_flags; 347 ev->event_flags |= rp->mask_flags;
348} 348}
349 349
350static void 350static void
@@ -360,7 +360,7 @@ _edje_mouse_wheel_signal_cb(void *data, const Efl_Event *event)
360 rp = evas_object_data_get(event->object, "real_part"); 360 rp = evas_object_data_get(event->object, "real_part");
361 if (rp) 361 if (rp)
362 { 362 {
363 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags)) 363 if (!(ev->event_flags) || !(rp->ignore_flags & ev->event_flags))
364 { 364 {
365 snprintf(buf, sizeof(buf), "mouse,wheel,%i,%i", 365 snprintf(buf, sizeof(buf), "mouse,wheel,%i,%i",
366 ev->wheel.dir == EFL_ORIENT_HORIZONTAL ? 1 : 0, 366 ev->wheel.dir == EFL_ORIENT_HORIZONTAL ? 1 : 0,
@@ -368,7 +368,7 @@ _edje_mouse_wheel_signal_cb(void *data, const Efl_Event *event)
368 _edje_seat_emit(ed, ev->device, buf, rp->part->name); 368 _edje_seat_emit(ed, ev->device, buf, rp->part->name);
369 } 369 }
370 370
371 ev->event_flags |= rp->part->mask_flags; 371 ev->event_flags |= rp->mask_flags;
372 } 372 }
373} 373}
374 374
diff --git a/src/lib/edje/edje_embryo.c b/src/lib/edje/edje_embryo.c
index c7c70f750e..e6963b6fcb 100644
--- a/src/lib/edje/edje_embryo.c
+++ b/src/lib/edje/edje_embryo.c
@@ -3572,7 +3572,7 @@ _edje_embryo_fn_set_mouse_events(Embryo_Program *ep, Embryo_Cell *params)
3572 rp = ed->table_parts[part_id % ed->table_parts_size]; 3572 rp = ed->table_parts[part_id % ed->table_parts_size];
3573 3573
3574 if (rp) 3574 if (rp)
3575 _edje_part_mouse_events_set(ed, rp, params[2]); 3575 _edje_real_part_mouse_events_set(ed, rp, params[2]);
3576 3576
3577 return 0; 3577 return 0;
3578} 3578}
@@ -3594,7 +3594,7 @@ _edje_embryo_fn_get_mouse_events(Embryo_Program *ep, Embryo_Cell *params)
3594 rp = ed->table_parts[part_id % ed->table_parts_size]; 3594 rp = ed->table_parts[part_id % ed->table_parts_size];
3595 3595
3596 if (rp) 3596 if (rp)
3597 return (Embryo_Cell)_edje_var_int_get(ed, (int)_edje_part_mouse_events_get(ed, rp)); 3597 return (Embryo_Cell)_edje_var_int_get(ed, (int)_edje_real_part_mouse_events_get(ed, rp));
3598 3598
3599 return 0; 3599 return 0;
3600 3600
@@ -3617,7 +3617,7 @@ _edje_embryo_fn_set_repeat_events(Embryo_Program *ep, Embryo_Cell *params)
3617 rp = ed->table_parts[part_id % ed->table_parts_size]; 3617 rp = ed->table_parts[part_id % ed->table_parts_size];
3618 3618
3619 if (rp) 3619 if (rp)
3620 _edje_part_repeat_events_set(ed, rp, params[2]); 3620 _edje_real_part_repeat_events_set(ed, rp, params[2]);
3621 3621
3622 return 0; 3622 return 0;
3623} 3623}
@@ -3639,7 +3639,7 @@ _edje_embryo_fn_get_repeat_events(Embryo_Program *ep, Embryo_Cell *params)
3639 rp = ed->table_parts[part_id % ed->table_parts_size]; 3639 rp = ed->table_parts[part_id % ed->table_parts_size];
3640 3640
3641 if (rp) 3641 if (rp)
3642 return (Embryo_Cell)_edje_var_int_get(ed, (int)_edje_part_repeat_events_get(ed, rp)); 3642 return (Embryo_Cell)_edje_var_int_get(ed, (int)_edje_real_part_repeat_events_get(ed, rp));
3643 3643
3644 return 0; 3644 return 0;
3645 3645
@@ -3662,7 +3662,7 @@ _edje_embryo_fn_set_ignore_flags(Embryo_Program *ep, Embryo_Cell *params)
3662 rp = ed->table_parts[part_id % ed->table_parts_size]; 3662 rp = ed->table_parts[part_id % ed->table_parts_size];
3663 3663
3664 if (rp) 3664 if (rp)
3665 _edje_part_ignore_flags_set(ed, rp, params[2]); 3665 _edje_real_part_ignore_flags_set(ed, rp, params[2]);
3666 3666
3667 return 0; 3667 return 0;
3668} 3668}
@@ -3684,7 +3684,7 @@ _edje_embryo_fn_get_ignore_flags(Embryo_Program *ep, Embryo_Cell *params)
3684 rp = ed->table_parts[part_id % ed->table_parts_size]; 3684 rp = ed->table_parts[part_id % ed->table_parts_size];
3685 3685
3686 if (rp) 3686 if (rp)
3687 return (Embryo_Cell)_edje_var_int_get(ed, (int)_edje_part_ignore_flags_get(ed, rp)); 3687 return (Embryo_Cell)_edje_var_int_get(ed, (int)_edje_real_part_ignore_flags_get(ed, rp));
3688 3688
3689 return 0; 3689 return 0;
3690 3690
@@ -3707,7 +3707,7 @@ _edje_embryo_fn_set_mask_flags(Embryo_Program *ep, Embryo_Cell *params)
3707 rp = ed->table_parts[part_id % ed->table_parts_size]; 3707 rp = ed->table_parts[part_id % ed->table_parts_size];
3708 3708
3709 if (rp) 3709 if (rp)
3710 _edje_part_mask_flags_set(ed, rp, params[2]); 3710 _edje_real_part_mask_flags_set(ed, rp, params[2]);
3711 3711
3712 return 0; 3712 return 0;
3713} 3713}
@@ -3729,7 +3729,7 @@ _edje_embryo_fn_get_mask_flags(Embryo_Program *ep, Embryo_Cell *params)
3729 rp = ed->table_parts[part_id % ed->table_parts_size]; 3729 rp = ed->table_parts[part_id % ed->table_parts_size];
3730 3730
3731 if (rp) 3731 if (rp)
3732 return (Embryo_Cell)_edje_var_int_get(ed, (int)_edje_part_mask_flags_get(ed, rp)); 3732 return (Embryo_Cell)_edje_var_int_get(ed, (int)_edje_real_part_mask_flags_get(ed, rp));
3733 3733
3734 return 0; 3734 return 0;
3735 3735
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index 785f0c8d8c..2f59eae47c 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -832,7 +832,7 @@ _edje_anchor_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EIN
832 (en->select_allow)) 832 (en->select_allow))
833 return; 833 return;
834 834
835 ignored = rp->part->ignore_flags & ev->event_flags; 835 ignored = rp->ignore_flags & ev->event_flags;
836 if ((!ev->event_flags) || (!ignored)) 836 if ((!ev->event_flags) || (!ignored))
837 { 837 {
838 n = an->name; 838 n = an->name;
@@ -855,7 +855,7 @@ _edje_anchor_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EIN
855 evas_textblock_cursor_format_prepend(an->end, "</>"); 855 evas_textblock_cursor_format_prepend(an->end, "</>");
856 } 856 }
857 } 857 }
858 ev->event_flags |= rp->part->mask_flags; 858 ev->event_flags |= rp->mask_flags;
859} 859}
860 860
861static void 861static void
@@ -874,7 +874,7 @@ _edje_anchor_mouse_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
874 (!rp->typedata.text)) return; 874 (!rp->typedata.text)) return;
875 875
876 en = rp->typedata.text->entry_data; 876 en = rp->typedata.text->entry_data;
877 ignored = rp->part->ignore_flags & ev->event_flags; 877 ignored = rp->ignore_flags & ev->event_flags;
878 n = an->name; 878 n = an->name;
879 if (!n) n = ""; 879 if (!n) n = "";
880 len = 200 + strlen(n); 880 len = 200 + strlen(n);
@@ -914,7 +914,7 @@ _edje_anchor_mouse_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
914 snprintf(buf, len, "anchor,mouse,clicked,%i,%s", ev->button, n); 914 snprintf(buf, len, "anchor,mouse,clicked,%i,%s", ev->button, n);
915 _edje_emit(ed, buf, rp->part->name); 915 _edje_emit(ed, buf, rp->part->name);
916 } 916 }
917 ev->event_flags |= rp->part->mask_flags; 917 ev->event_flags |= rp->mask_flags;
918} 918}
919 919
920static void 920static void
@@ -936,7 +936,7 @@ _edje_anchor_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EIN
936 (en->select_allow)) 936 (en->select_allow))
937 return; 937 return;
938 938
939 ignored = rp->part->ignore_flags & ev->event_flags; 939 ignored = rp->ignore_flags & ev->event_flags;
940 if ((!ev->event_flags) || (!ignored)) 940 if ((!ev->event_flags) || (!ignored))
941 { 941 {
942 n = an->name; 942 n = an->name;
@@ -946,7 +946,7 @@ _edje_anchor_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EIN
946 snprintf(buf, len, "anchor,mouse,move,%s", n); 946 snprintf(buf, len, "anchor,mouse,move,%s", n);
947 _edje_emit(ed, buf, rp->part->name); 947 _edje_emit(ed, buf, rp->part->name);
948 } 948 }
949 ev->event_flags |= rp->part->mask_flags; 949 ev->event_flags |= rp->mask_flags;
950} 950}
951 951
952static void 952static void
@@ -960,7 +960,7 @@ _edje_anchor_mouse_in_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
960 size_t len; 960 size_t len;
961 int ignored; 961 int ignored;
962 962
963 ignored = rp->part->ignore_flags & ev->event_flags; 963 ignored = rp->ignore_flags & ev->event_flags;
964 if ((!ev->event_flags) || (!ignored)) 964 if ((!ev->event_flags) || (!ignored))
965 { 965 {
966 /* set to allow handling in elementary, in case we have 966 /* set to allow handling in elementary, in case we have
@@ -974,7 +974,7 @@ _edje_anchor_mouse_in_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
974 snprintf(buf, len, "anchor,mouse,in,%s", n); 974 snprintf(buf, len, "anchor,mouse,in,%s", n);
975 _edje_emit(ed, buf, rp->part->name); 975 _edje_emit(ed, buf, rp->part->name);
976 } 976 }
977 ev->event_flags |= rp->part->mask_flags; 977 ev->event_flags |= rp->mask_flags;
978} 978}
979 979
980static void 980static void
@@ -988,7 +988,7 @@ _edje_anchor_mouse_out_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA
988 int ignored; 988 int ignored;
989 Edje *ed = an->en->ed; 989 Edje *ed = an->en->ed;
990 990
991 ignored = rp->part->ignore_flags & ev->event_flags; 991 ignored = rp->ignore_flags & ev->event_flags;
992 if ((!ev->event_flags) || (!ignored)) 992 if ((!ev->event_flags) || (!ignored))
993 { 993 {
994 /* set to allow handling in elementary, in case we have 994 /* set to allow handling in elementary, in case we have
@@ -1002,7 +1002,7 @@ _edje_anchor_mouse_out_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA
1002 snprintf(buf, len, "anchor,mouse,out,%s", n); 1002 snprintf(buf, len, "anchor,mouse,out,%s", n);
1003 _edje_emit(ed, buf, rp->part->name); 1003 _edje_emit(ed, buf, rp->part->name);
1004 } 1004 }
1005 ev->event_flags |= rp->part->mask_flags; 1005 ev->event_flags |= rp->mask_flags;
1006} 1006}
1007 1007
1008static void 1008static void
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 0f5424badd..aa9c14c276 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -1192,13 +1192,16 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
1192 evas_object_smart_member_add(rp->object, ed->obj); 1192 evas_object_smart_member_add(rp->object, ed->obj);
1193 1193
1194 // evas_object_layer_set(rp->object, evas_object_layer_get(ed->obj)); 1194 // evas_object_layer_set(rp->object, evas_object_layer_get(ed->obj));
1195 rp->mouse_events = ep->mouse_events;
1196 rp->repeat_events = ep->repeat_events;
1197
1195 if (ep->type != EDJE_PART_TYPE_SWALLOW && ep->type != EDJE_PART_TYPE_GROUP && ep->type != EDJE_PART_TYPE_EXTERNAL) 1198 if (ep->type != EDJE_PART_TYPE_SWALLOW && ep->type != EDJE_PART_TYPE_GROUP && ep->type != EDJE_PART_TYPE_EXTERNAL)
1196 { 1199 {
1197 if (ep->mouse_events) 1200 if (rp->mouse_events)
1198 { 1201 {
1199 _edje_callbacks_add(rp->object, ed, rp); 1202 _edje_callbacks_add(rp->object, ed, rp);
1200 if (ep->repeat_events) 1203 if (rp->repeat_events)
1201 evas_object_repeat_events_set(rp->object, 1); 1204 evas_object_repeat_events_set(rp->object, rp->repeat_events);
1202 1205
1203 if (ep->pointer_mode != EVAS_OBJECT_POINTER_MODE_AUTOGRAB) 1206 if (ep->pointer_mode != EVAS_OBJECT_POINTER_MODE_AUTOGRAB)
1204 evas_object_pointer_mode_set(rp->object, ep->pointer_mode); 1207 evas_object_pointer_mode_set(rp->object, ep->pointer_mode);
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index b100365c25..11243a5459 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -2028,9 +2028,13 @@ struct _Edje_Real_Part
2028#endif 2028#endif
2029 char clicked_button; // 1 2029 char clicked_button; // 1
2030 unsigned char type; // 1 2030 unsigned char type; // 1
2031 Evas_Event_Flags ignore_flags;
2032 Evas_Event_Flags mask_flags;
2031 unsigned char calculated : 2; // 1 2033 unsigned char calculated : 2; // 1
2032 unsigned char calculating : 2; // 0 2034 unsigned char calculating : 2; // 0
2033 Eina_Bool still_in : 1; // 0 2035 Eina_Bool still_in : 1; // 0
2036 unsigned char mouse_events : 1;
2037 unsigned char repeat_events : 1;
2034#ifdef EDJE_CALC_CACHE 2038#ifdef EDJE_CALC_CACHE
2035 Eina_Bool invalidate : 1; // 0 2039 Eina_Bool invalidate : 1; // 0
2036#endif 2040#endif
@@ -3077,14 +3081,14 @@ void _animation_get(Eo *obj, void *_pd, va_list *list);
3077void edje_signal_init(void); 3081void edje_signal_init(void);
3078void edje_signal_shutdown(void); 3082void edje_signal_shutdown(void);
3079 3083
3080Eina_Bool _edje_part_mouse_events_get(Edje *ed, Edje_Real_Part *rp); 3084Eina_Bool _edje_real_part_mouse_events_get(Edje *ed, Edje_Real_Part *rp);
3081void _edje_part_mouse_events_set(Edje *ed, Edje_Real_Part *rp, Eina_Bool mouse_events); 3085void _edje_real_part_mouse_events_set(Edje *ed, Edje_Real_Part *rp, Eina_Bool mouse_events);
3082Eina_Bool _edje_part_repeat_events_get(Edje *ed, Edje_Real_Part *rp); 3086Eina_Bool _edje_real_part_repeat_events_get(Edje *ed, Edje_Real_Part *rp);
3083void _edje_part_repeat_events_set(Edje *ed, Edje_Real_Part *rp, Eina_Bool repeat_events); 3087void _edje_real_part_repeat_events_set(Edje *ed, Edje_Real_Part *rp, Eina_Bool repeat_events);
3084Evas_Event_Flags _edje_part_ignore_flags_get(Edje *ed, Edje_Real_Part *rp); 3088Evas_Event_Flags _edje_real_part_ignore_flags_get(Edje *ed, Edje_Real_Part *rp);
3085void _edje_part_ignore_flags_set(Edje *ed, Edje_Real_Part *rp, Evas_Event_Flags ignore_flags); 3089void _edje_real_part_ignore_flags_set(Edje *ed, Edje_Real_Part *rp, Evas_Event_Flags ignore_flags);
3086Evas_Event_Flags _edje_part_mask_flags_get(Edje *ed, Edje_Real_Part *rp); 3090Evas_Event_Flags _edje_real_part_mask_flags_get(Edje *ed, Edje_Real_Part *rp);
3087void _edje_part_mask_flags_set(Edje *ed, Edje_Real_Part *rp, Evas_Event_Flags mask_flags); 3091void _edje_real_part_mask_flags_set(Edje *ed, Edje_Real_Part *rp, Evas_Event_Flags mask_flags);
3088 3092
3089/* part containers: box */ 3093/* part containers: box */
3090Eo *_edje_box_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp); 3094Eo *_edje_box_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp);
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 8eb729b41e..d8a29fe369 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -6288,10 +6288,10 @@ _edje_real_part_swallow(Edje *ed,
6288 if (hints_update) 6288 if (hints_update)
6289 _edje_real_part_swallow_hints_update(rp); 6289 _edje_real_part_swallow_hints_update(rp);
6290 6290
6291 if (rp->part->mouse_events) 6291 if (rp->mouse_events)
6292 { 6292 {
6293 _edje_callbacks_add(obj_swallow, ed, rp); 6293 _edje_callbacks_add(obj_swallow, ed, rp);
6294 evas_object_repeat_events_set(obj_swallow, rp->part->repeat_events); 6294 evas_object_repeat_events_set(obj_swallow, rp->repeat_events);
6295 if (rp->part->pointer_mode != EVAS_OBJECT_POINTER_MODE_AUTOGRAB) 6295 if (rp->part->pointer_mode != EVAS_OBJECT_POINTER_MODE_AUTOGRAB)
6296 evas_object_pointer_mode_set(obj_swallow, rp->part->pointer_mode); 6296 evas_object_pointer_mode_set(obj_swallow, rp->part->pointer_mode);
6297 evas_object_pass_events_set(obj_swallow, 0); 6297 evas_object_pass_events_set(obj_swallow, 0);
@@ -6513,21 +6513,21 @@ edje_object_part_object_name_get(const Evas_Object *obj)
6513} 6513}
6514 6514
6515Eina_Bool 6515Eina_Bool
6516_edje_part_mouse_events_get(Edje *ed EINA_UNUSED, Edje_Real_Part *rp) 6516_edje_real_part_mouse_events_get(Edje *ed EINA_UNUSED, Edje_Real_Part *rp)
6517{ 6517{
6518 if (!rp) return EINA_FALSE; 6518 if (!rp) return EINA_FALSE;
6519 6519
6520 return rp->part->mouse_events; 6520 return rp->mouse_events;
6521} 6521}
6522 6522
6523void 6523void
6524_edje_part_mouse_events_set(Edje *ed EINA_UNUSED, Edje_Real_Part *rp, Eina_Bool mouse_events) 6524_edje_real_part_mouse_events_set(Edje *ed EINA_UNUSED, Edje_Real_Part *rp, Eina_Bool mouse_events)
6525{ 6525{
6526 if (!rp) return; 6526 if (!rp) return;
6527 6527
6528 rp->part->mouse_events = !!mouse_events; 6528 rp->mouse_events = !!mouse_events;
6529 6529
6530 if (mouse_events) 6530 if (rp->mouse_events)
6531 { 6531 {
6532 evas_object_pass_events_set(rp->object, 0); 6532 evas_object_pass_events_set(rp->object, 0);
6533 _edje_callbacks_add(rp->object, ed, rp); 6533 _edje_callbacks_add(rp->object, ed, rp);
@@ -6540,56 +6540,56 @@ _edje_part_mouse_events_set(Edje *ed EINA_UNUSED, Edje_Real_Part *rp, Eina_Bool
6540} 6540}
6541 6541
6542Eina_Bool 6542Eina_Bool
6543_edje_part_repeat_events_get(Edje *ed EINA_UNUSED, Edje_Real_Part *rp) 6543_edje_real_part_repeat_events_get(Edje *ed EINA_UNUSED, Edje_Real_Part *rp)
6544{ 6544{
6545 if (!rp) return EINA_FALSE; 6545 if (!rp) return EINA_FALSE;
6546 6546
6547 return rp->part->repeat_events; 6547 return rp->repeat_events;
6548} 6548}
6549 6549
6550void 6550void
6551_edje_part_repeat_events_set(Edje *ed EINA_UNUSED, Edje_Real_Part *rp, Eina_Bool repeat_events) 6551_edje_real_part_repeat_events_set(Edje *ed EINA_UNUSED, Edje_Real_Part *rp, Eina_Bool repeat_events)
6552{ 6552{
6553 if (!rp) return; 6553 if (!rp) return;
6554 6554
6555 rp->part->repeat_events = !!repeat_events; 6555 rp->repeat_events = !!repeat_events;
6556 6556
6557 if (repeat_events) 6557 if (rp->repeat_events)
6558 evas_object_repeat_events_set(rp->object, 1); 6558 evas_object_repeat_events_set(rp->object, 1);
6559 else 6559 else
6560 evas_object_repeat_events_set(rp->object, 0); 6560 evas_object_repeat_events_set(rp->object, 0);
6561} 6561}
6562 6562
6563Evas_Event_Flags 6563Evas_Event_Flags
6564_edje_part_ignore_flags_get(Edje *ed EINA_UNUSED, Edje_Real_Part *rp) 6564_edje_real_part_ignore_flags_get(Edje *ed EINA_UNUSED, Edje_Real_Part *rp)
6565{ 6565{
6566 if (!rp) return EVAS_EVENT_FLAG_NONE; 6566 if (!rp) return EVAS_EVENT_FLAG_NONE;
6567 6567
6568 return rp->part->ignore_flags; 6568 return rp->ignore_flags;
6569} 6569}
6570 6570
6571void 6571void
6572_edje_part_ignore_flags_set(Edje *ed EINA_UNUSED, Edje_Real_Part *rp, Evas_Event_Flags ignore_flags) 6572_edje_real_part_ignore_flags_set(Edje *ed EINA_UNUSED, Edje_Real_Part *rp, Evas_Event_Flags ignore_flags)
6573{ 6573{
6574 if (!rp) return; 6574 if (!rp) return;
6575 6575
6576 rp->part->ignore_flags = ignore_flags; 6576 rp->ignore_flags = ignore_flags;
6577} 6577}
6578 6578
6579Evas_Event_Flags 6579Evas_Event_Flags
6580_edje_part_mask_flags_get(Edje *ed EINA_UNUSED, Edje_Real_Part *rp) 6580_edje_real_part_mask_flags_get(Edje *ed EINA_UNUSED, Edje_Real_Part *rp)
6581{ 6581{
6582 if (!rp) return EVAS_EVENT_FLAG_NONE; 6582 if (!rp) return EVAS_EVENT_FLAG_NONE;
6583 6583
6584 return rp->part->mask_flags; 6584 return rp->mask_flags;
6585} 6585}
6586 6586
6587void 6587void
6588_edje_part_mask_flags_set(Edje *ed EINA_UNUSED, Edje_Real_Part *rp, Evas_Event_Flags mask_flags) 6588_edje_real_part_mask_flags_set(Edje *ed EINA_UNUSED, Edje_Real_Part *rp, Evas_Event_Flags mask_flags)
6589{ 6589{
6590 if (!rp) return; 6590 if (!rp) return;
6591 6591
6592 rp->part->mask_flags = mask_flags; 6592 rp->mask_flags = mask_flags;
6593} 6593}
6594 6594
6595/* Legacy APIs */ 6595/* Legacy APIs */