aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas/canvas/efl_canvas_object.eo
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-05-16 11:16:28 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-05-16 20:47:48 +0900
commit2d6f53f2b938432bed9989fcc9d49f81ac5474cc (patch)
tree79a3373906aaf97ee77a0909d10d9a25ac8d8bef /src/lib/evas/canvas/efl_canvas_object.eo
parentevas: Remove evas_key_modifier_mask_get from EO (diff)
downloadefl-2d6f53f2b938432bed9989fcc9d49f81ac5474cc.tar.gz
evas: Replace Evas.Modifier_Mask with Efl.Input enums
This removes Evas.Modifier_Mask from EO. This introduces two new types instead: - Efl.Input.Modifier - Efl.Input.Lock Those are enums, not strings, containing all the known and currently supported lock and modifier keys. The enums are bit masks. This effectively removes the ability for an application to create and handle specific modifier or lock keys - with EO API (legacy compatibility is unchanged, of course). I wonder who ever required this?
Diffstat (limited to 'src/lib/evas/canvas/efl_canvas_object.eo')
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo36
1 files changed, 10 insertions, 26 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index 61ef44e542..62b8e5672d 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -551,25 +551,17 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
See also @.key_ungrab, @.key_focus.get, @.key_focus.set,
\@ref evas_focus_get, \@ref evas_key_modifier_add.
]]
- /* FIXME-doc
- Example code follows.
- @dontinclude evas-events.c
- @skip if (d.focus)
- @until else
-
- See the full example @ref Example_Evas_Events "here".
- */
-
return: bool @warn_unused; [[$true if the call succeeded, $false otherwise.]]
params {
@in keyname: string @nonull; [[The key to request events for.]]
- @in modifiers: Evas.Modifier_Mask; [[A mask of modifiers that must be
- present to trigger the event.]]
- @in not_modifiers: Evas.Modifier_Mask; [[A mask of modifiers that must
- not be present to trigger the event.]]
+ @in modifiers: Efl.Input.Modifier; [[A combinaison of modifier
+ keys that must be present to trigger the event.]]
+ @in not_modifiers: Efl.Input.Modifier; [[A combinaison of modifier
+ keys that must not be present to trigger the event.]]
@in exclusive: bool; [[Request that the $obj is the only object
receiving the $keyname events.]]
}
+ legacy: null;
}
key_ungrab {
[[Removes the grab on $keyname key events by $obj.
@@ -578,25 +570,17 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
$not_modifiers match.
See also @.key_grab, @.key_focus.get, @.key_focus.set,
- \@ref evas_focus_get.
+ and the legacy API evas_focus_get.
]]
- /* FIXME-doc
- Example code follows.
- @dontinclude evas-events.c
- @skip got here by key grabs
- @until }
-
- See the full example @ref Example_Evas_Events "here".
- */
params {
@in keyname: string @nonull; [[The key the grab is set for.]]
- @in modifiers: Evas.Modifier_Mask; [[A mask of modifiers that must be
+ @in modifiers: Efl.Input.Modifier; [[A mask of modifiers that must be
present to trigger the event.]]
- @in not_modifiers: Evas.Modifier_Mask; [[A mask of modifiers that mus
+ @in not_modifiers: Efl.Input.Modifier; [[A mask of modifiers that must
not not be present to trigger
- the event.
- ]]
+ the event.]]
}
+ legacy: null;
}
@property no_render {
get {