forked from enlightenment/efl
evas: Remove Evas.Modifier from EO
Similar to the previous patch with Evas.Lock Ref T5312
This commit is contained in:
parent
054aa012c4
commit
4c81e0c5b9
|
@ -101,6 +101,19 @@ EAPI Evas_Engine_Info *evas_engine_info_get(const Evas *obj);
|
||||||
*/
|
*/
|
||||||
typedef struct _Evas_Lock Evas_Lock;
|
typedef struct _Evas_Lock Evas_Lock;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An opaque type containing information on which modifier keys are registered
|
||||||
|
* in an Evas canvas.
|
||||||
|
*/
|
||||||
|
typedef struct _Evas_Modifier Evas_Modifier;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A bitmask of modifier keys.
|
||||||
|
*
|
||||||
|
* See evas_key_modifier_mask_get() for the keyname to bit conversion.
|
||||||
|
*/
|
||||||
|
typedef unsigned long long Evas_Modifier_Mask;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @}
|
* @}
|
||||||
*/
|
*/
|
||||||
|
@ -871,11 +884,23 @@ EAPI void evas_event_refeed_event(Evas *obj, void *event_copy, Evas_
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A bitmask of modifier keys.
|
* @brief Returns a handle to the list of modifier keys registered in the
|
||||||
|
* canvas @c e.
|
||||||
*
|
*
|
||||||
* See evas_key_modifier_mask_get() for the keyname to bit conversion.
|
* This is required to check for which modifiers are set at a given time with
|
||||||
|
* the @ref evas_key_modifier_is_set function.
|
||||||
|
*
|
||||||
|
* See also @ref evas_key_modifier_add, @ref evas_key_modifier_del,
|
||||||
|
* @ref evas_key_modifier_on, @ref evas_key_modifier_off,
|
||||||
|
* @ref evas_seat_key_modifier_on, @ref evas_seat_key_modifier_off.
|
||||||
|
*
|
||||||
|
* @return An Evas_Modifier handle to query Evas' keys subsystem with @ref
|
||||||
|
* evas_key_modifier_is_set or @ref evas_seat_key_modifier_is_set, or @c null
|
||||||
|
* on error.
|
||||||
|
*
|
||||||
|
* @ingroup Evas_Canvas
|
||||||
*/
|
*/
|
||||||
typedef unsigned long long Evas_Modifier_Mask;
|
EAPI const Evas_Modifier *evas_key_modifier_get(const Evas *obj) EINA_WARN_UNUSED_RESULT;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Creates a bit mask from the @c keyname modifier key. Values returned
|
* @brief Creates a bit mask from the @c keyname modifier key. Values returned
|
||||||
|
|
|
@ -352,24 +352,6 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
|
||||||
]]
|
]]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@property key_modifier {
|
|
||||||
get {
|
|
||||||
[[Returns a handle to the list of modifier keys registered in
|
|
||||||
the canvas $e.
|
|
||||||
|
|
||||||
This is required to check for which modifiers are set at a
|
|
||||||
given time with the \@ref evas_key_modifier_is_set function.
|
|
||||||
|
|
||||||
See also @.key_modifier_add, @.key_modifier_del,
|
|
||||||
@.key_modifier_on, @.key_modifier_off, @.seat_key_modifier_on,
|
|
||||||
@.seat_key_modifier_off.
|
|
||||||
]]
|
|
||||||
return: ptr(const(Evas.Modifier)) @warn_unused; [[
|
|
||||||
An Evas_Modifier handle to query Evas' keys subsystem
|
|
||||||
with \@ref evas_key_modifier_is_set or \@ref evas_seat_key_modifier_is_set, or $null on error.
|
|
||||||
]]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@property pointer_button_down_mask_by_device {
|
@property pointer_button_down_mask_by_device {
|
||||||
[[Returns a bitmask with the mouse buttons currently pressed,
|
[[Returns a bitmask with the mouse buttons currently pressed,
|
||||||
set to 1.]]
|
set to 1.]]
|
||||||
|
|
|
@ -31,9 +31,10 @@ evas_key_lock_number(const Evas_Lock *l, const char *keyname)
|
||||||
|
|
||||||
/* public calls */
|
/* public calls */
|
||||||
|
|
||||||
EOLIAN const Evas_Modifier*
|
EAPI const Evas_Modifier*
|
||||||
_evas_canvas_key_modifier_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e)
|
evas_key_modifier_get(const Evas *eo_e)
|
||||||
{
|
{
|
||||||
|
EVAS_LEGACY_API(eo_e, e, NULL);
|
||||||
return &(e->modifiers);
|
return &(e->modifiers);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
struct Evas.Modifier; [[An opaque type containing information on which modifier keys are registered in an Evas canvas]]
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// All the below types are for Evas 3D
|
// All the below types are for Evas 3D
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue