summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-10 13:10:22 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-10 13:21:21 +0900
commit9fdf584d1a476bb444dfe4aad1183342b721a111 (patch)
tree096e7a5012582588d0c2eb09e6c5827485981385
parent79abba52c50840c043e4bb4dced6b533f9cdaebd (diff)
Efl: Rename event flags to processed and scrolling
From on_hold and on_scroll
-rw-r--r--src/lib/efl/interfaces/efl_event_types.eot12
-rw-r--r--src/lib/evas/Evas_Common.h4
-rw-r--r--src/lib/evas/canvas/efl_event_input.eo4
-rw-r--r--src/lib/evas/canvas/efl_event_key.c20
-rw-r--r--src/lib/evas/canvas/efl_event_key.eo8
-rw-r--r--src/lib/evas/canvas/efl_event_pointer.c20
-rw-r--r--src/lib/evas/canvas/efl_event_pointer.eo8
7 files changed, 42 insertions, 34 deletions
diff --git a/src/lib/efl/interfaces/efl_event_types.eot b/src/lib/efl/interfaces/efl_event_types.eot
index 3d52929ea0..41a399a81e 100644
--- a/src/lib/efl/interfaces/efl_event_types.eot
+++ b/src/lib/efl/interfaces/efl_event_types.eot
@@ -30,6 +30,14 @@ enum Efl.Event.Flags
30{ 30{
31 /* Evas.Event_Flags */ 31 /* Evas.Event_Flags */
32 none = 0, [[No fancy flags set]] 32 none = 0, [[No fancy flags set]]
33 on_hold = (1 << 0), [[This event is being delivered but should be put "on hold" until the on hold flag is unset. The event should be used for informational purposes and maybe some indications visually, but not actually perform anything]] 33 processed = (1 << 0), [[This event is being delivered and has been processed,
34 on_scroll = (1 << 1), [[This event flag indicates the event occurs while scrolling; for example, DOWN event occurs during scrolling; the event should be used for informational purposes and maybe some indications visually, but not actually perform anything]] 34 so it should be put "on hold" until the flag is unset.
35 The event should be used for informational purposes
36 and maybe some indications visually, but not
37 actually perform anything.]]
38 scrolling = (1 << 1), [[This event flag indicates the event occurs while
39 scrolling; for example, DOWN event occurs during
40 scrolling. The event should be used for informational
41 purposes and maybe some indications visually, but not
42 actually perform anything.]]
35} 43}
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 5e6a17bc4d..725d12e35d 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -352,8 +352,8 @@ typedef Efl_Pointer_Flags Evas_Button_Flags;
352typedef Efl_Event_Flags Evas_Event_Flags; 352typedef Efl_Event_Flags Evas_Event_Flags;
353 353
354#define EVAS_EVENT_FLAG_NONE EFL_EVENT_FLAGS_NONE 354#define EVAS_EVENT_FLAG_NONE EFL_EVENT_FLAGS_NONE
355#define EVAS_EVENT_FLAG_ON_HOLD EFL_EVENT_FLAGS_ON_HOLD 355#define EVAS_EVENT_FLAG_ON_HOLD EFL_EVENT_FLAGS_PROCESSED
356#define EVAS_EVENT_FLAG_ON_SCROLL EFL_EVENT_FLAGS_ON_SCROLL 356#define EVAS_EVENT_FLAG_ON_SCROLL EFL_EVENT_FLAGS_SCROLLING
357 357
358typedef Efl_Gfx_Size_Hint_Aspect Evas_Aspect_Control; /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set */ 358typedef Efl_Gfx_Size_Hint_Aspect Evas_Aspect_Control; /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set */
359 359
diff --git a/src/lib/evas/canvas/efl_event_input.eo b/src/lib/evas/canvas/efl_event_input.eo
index 6f64da35b5..6e2e6cc759 100644
--- a/src/lib/evas/canvas/efl_event_input.eo
+++ b/src/lib/evas/canvas/efl_event_input.eo
@@ -16,13 +16,13 @@ interface Efl.Event.Input (Efl.Event)
16 flags: Efl.Event.Flags; 16 flags: Efl.Event.Flags;
17 } 17 }
18 } 18 }
19 @property on_hold { 19 @property processed {
20 [[$true if @.event_flags indicates the event is on hold.]] 20 [[$true if @.event_flags indicates the event is on hold.]]
21 values { 21 values {
22 val: bool; 22 val: bool;
23 } 23 }
24 } 24 }
25 @property on_scroll { 25 @property scrolling {
26 [[$true if @.event_flags indicates the event happened while scrolling.]] 26 [[$true if @.event_flags indicates the event happened while scrolling.]]
27 values { 27 values {
28 val: bool; 28 val: bool;
diff --git a/src/lib/evas/canvas/efl_event_key.c b/src/lib/evas/canvas/efl_event_key.c
index 5bb32f7e62..78659f954f 100644
--- a/src/lib/evas/canvas/efl_event_key.c
+++ b/src/lib/evas/canvas/efl_event_key.c
@@ -207,33 +207,33 @@ _efl_event_key_efl_event_input_event_flags_get(Eo *obj EINA_UNUSED, Efl_Event_Ke
207} 207}
208 208
209EOLIAN static void 209EOLIAN static void
210_efl_event_key_efl_event_input_on_hold_set(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, Eina_Bool val) 210_efl_event_key_efl_event_input_processed_set(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, Eina_Bool val)
211{ 211{
212 if (val) 212 if (val)
213 pd->event_flags |= EFL_EVENT_FLAGS_ON_HOLD; 213 pd->event_flags |= EFL_EVENT_FLAGS_PROCESSED;
214 else 214 else
215 pd->event_flags &= ~EFL_EVENT_FLAGS_ON_HOLD; 215 pd->event_flags &= ~EFL_EVENT_FLAGS_PROCESSED;
216} 216}
217 217
218EOLIAN static Eina_Bool 218EOLIAN static Eina_Bool
219_efl_event_key_efl_event_input_on_hold_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd) 219_efl_event_key_efl_event_input_processed_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd)
220{ 220{
221 return !!(pd->event_flags & EFL_EVENT_FLAGS_ON_HOLD); 221 return !!(pd->event_flags & EFL_EVENT_FLAGS_PROCESSED);
222} 222}
223 223
224EOLIAN static void 224EOLIAN static void
225_efl_event_key_efl_event_input_on_scroll_set(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, Eina_Bool val) 225_efl_event_key_efl_event_input_scrolling_set(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, Eina_Bool val)
226{ 226{
227 if (val) 227 if (val)
228 pd->event_flags |= EFL_EVENT_FLAGS_ON_SCROLL; 228 pd->event_flags |= EFL_EVENT_FLAGS_SCROLLING;
229 else 229 else
230 pd->event_flags &= ~EFL_EVENT_FLAGS_ON_SCROLL; 230 pd->event_flags &= ~EFL_EVENT_FLAGS_SCROLLING;
231} 231}
232 232
233EOLIAN static Eina_Bool 233EOLIAN static Eina_Bool
234_efl_event_key_efl_event_input_on_scroll_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd) 234_efl_event_key_efl_event_input_scrolling_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd)
235{ 235{
236 return !!(pd->event_flags & EFL_EVENT_FLAGS_ON_SCROLL); 236 return !!(pd->event_flags & EFL_EVENT_FLAGS_SCROLLING);
237} 237}
238 238
239EOLIAN static void 239EOLIAN static void
diff --git a/src/lib/evas/canvas/efl_event_key.eo b/src/lib/evas/canvas/efl_event_key.eo
index f702ccebe7..9ca75151b3 100644
--- a/src/lib/evas/canvas/efl_event_key.eo
+++ b/src/lib/evas/canvas/efl_event_key.eo
@@ -62,10 +62,10 @@ class Efl.Event.Key (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input)
62 Efl.Event.Input.fake.get; 62 Efl.Event.Input.fake.get;
63 Efl.Event.Input.event_flags.set; 63 Efl.Event.Input.event_flags.set;
64 Efl.Event.Input.event_flags.get; 64 Efl.Event.Input.event_flags.get;
65 Efl.Event.Input.on_hold.set; 65 Efl.Event.Input.processed.set;
66 Efl.Event.Input.on_hold.get; 66 Efl.Event.Input.processed.get;
67 Efl.Event.Input.on_scroll.set; 67 Efl.Event.Input.scrolling.set;
68 Efl.Event.Input.on_scroll.get; 68 Efl.Event.Input.scrolling.get;
69 Efl.Event.Input.device.set; 69 Efl.Event.Input.device.set;
70 Efl.Event.Input.device.get; 70 Efl.Event.Input.device.get;
71 Efl.Input.State.modifier_enabled.get; 71 Efl.Input.State.modifier_enabled.get;
diff --git a/src/lib/evas/canvas/efl_event_pointer.c b/src/lib/evas/canvas/efl_event_pointer.c
index 33a734ae8e..d102c5c580 100644
--- a/src/lib/evas/canvas/efl_event_pointer.c
+++ b/src/lib/evas/canvas/efl_event_pointer.c
@@ -377,33 +377,33 @@ _efl_event_pointer_triple_click_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data
377} 377}
378 378
379EOLIAN static void 379EOLIAN static void
380_efl_event_pointer_efl_event_input_on_hold_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Eina_Bool val) 380_efl_event_pointer_efl_event_input_processed_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Eina_Bool val)
381{ 381{
382 if (val) 382 if (val)
383 pd->event_flags |= EFL_EVENT_FLAGS_ON_HOLD; 383 pd->event_flags |= EFL_EVENT_FLAGS_PROCESSED;
384 else 384 else
385 pd->event_flags &= ~EFL_EVENT_FLAGS_ON_HOLD; 385 pd->event_flags &= ~EFL_EVENT_FLAGS_PROCESSED;
386} 386}
387 387
388EOLIAN static Eina_Bool 388EOLIAN static Eina_Bool
389_efl_event_pointer_efl_event_input_on_hold_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 389_efl_event_pointer_efl_event_input_processed_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd)
390{ 390{
391 return !!(pd->event_flags & EFL_EVENT_FLAGS_ON_HOLD); 391 return !!(pd->event_flags & EFL_EVENT_FLAGS_PROCESSED);
392} 392}
393 393
394EOLIAN static void 394EOLIAN static void
395_efl_event_pointer_efl_event_input_on_scroll_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Eina_Bool val) 395_efl_event_pointer_efl_event_input_scrolling_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Eina_Bool val)
396{ 396{
397 if (val) 397 if (val)
398 pd->event_flags |= EFL_EVENT_FLAGS_ON_SCROLL; 398 pd->event_flags |= EFL_EVENT_FLAGS_SCROLLING;
399 else 399 else
400 pd->event_flags &= ~EFL_EVENT_FLAGS_ON_SCROLL; 400 pd->event_flags &= ~EFL_EVENT_FLAGS_SCROLLING;
401} 401}
402 402
403EOLIAN static Eina_Bool 403EOLIAN static Eina_Bool
404_efl_event_pointer_efl_event_input_on_scroll_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 404_efl_event_pointer_efl_event_input_scrolling_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd)
405{ 405{
406 return !!(pd->event_flags & EFL_EVENT_FLAGS_ON_SCROLL); 406 return !!(pd->event_flags & EFL_EVENT_FLAGS_SCROLLING);
407} 407}
408 408
409EOLIAN static Eina_Bool 409EOLIAN static Eina_Bool
diff --git a/src/lib/evas/canvas/efl_event_pointer.eo b/src/lib/evas/canvas/efl_event_pointer.eo
index 31d8b092a9..2a9e7c8046 100644
--- a/src/lib/evas/canvas/efl_event_pointer.eo
+++ b/src/lib/evas/canvas/efl_event_pointer.eo
@@ -137,10 +137,10 @@ class Efl.Event.Pointer (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input)
137 Efl.Event.Input.fake.get; 137 Efl.Event.Input.fake.get;
138 Efl.Event.Input.event_flags.set; 138 Efl.Event.Input.event_flags.set;
139 Efl.Event.Input.event_flags.get; 139 Efl.Event.Input.event_flags.get;
140 Efl.Event.Input.on_hold.set; 140 Efl.Event.Input.processed.set;
141 Efl.Event.Input.on_hold.get; 141 Efl.Event.Input.processed.get;
142 Efl.Event.Input.on_scroll.set; 142 Efl.Event.Input.scrolling.set;
143 Efl.Event.Input.on_scroll.get; 143 Efl.Event.Input.scrolling.get;
144 Efl.Event.Input.device.set; 144 Efl.Event.Input.device.set;
145 Efl.Event.Input.device.get; 145 Efl.Event.Input.device.get;
146 Efl.Input.State.modifier_enabled.get; 146 Efl.Input.State.modifier_enabled.get;