forked from enlightenment/efl
elm: rename Elm.Interface.Atspi.Window => Efl.Access.Window
Reviewers: cedric, jpeg Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5162
This commit is contained in:
parent
9f7786544e
commit
dfd17229fd
|
@ -37,7 +37,7 @@ elm_public_eolian_files = \
|
||||||
lib/elementary/elm_interface_atspi_text.eo \
|
lib/elementary/elm_interface_atspi_text.eo \
|
||||||
lib/elementary/efl_access_value.eo \
|
lib/elementary/efl_access_value.eo \
|
||||||
lib/elementary/elm_interface_atspi_widget_action.eo \
|
lib/elementary/elm_interface_atspi_widget_action.eo \
|
||||||
lib/elementary/elm_interface_atspi_window.eo \
|
lib/elementary/efl_access_window.eo \
|
||||||
lib/elementary/elm_interface_fileselector.eo \
|
lib/elementary/elm_interface_fileselector.eo \
|
||||||
lib/elementary/elm_interface_scrollable.eo \
|
lib/elementary/elm_interface_scrollable.eo \
|
||||||
lib/elementary/elm_label.eo \
|
lib/elementary/elm_label.eo \
|
||||||
|
@ -220,7 +220,7 @@ includesunstable_HEADERS = \
|
||||||
lib/elementary/elm_interface_atspi_accessible.h \
|
lib/elementary/elm_interface_atspi_accessible.h \
|
||||||
lib/elementary/elm_interface_atspi_text.h \
|
lib/elementary/elm_interface_atspi_text.h \
|
||||||
lib/elementary/elm_interface_atspi_widget_action.h \
|
lib/elementary/elm_interface_atspi_widget_action.h \
|
||||||
lib/elementary/elm_interface_atspi_window.h \
|
lib/elementary/efl_access_window.h \
|
||||||
lib/elementary/elm_interface_fileselector.h \
|
lib/elementary/elm_interface_fileselector.h \
|
||||||
lib/elementary/elm_interface_scrollable.h \
|
lib/elementary/elm_interface_scrollable.h \
|
||||||
lib/elementary/elm_interfaces.h \
|
lib/elementary/elm_interfaces.h \
|
||||||
|
@ -618,7 +618,7 @@ lib_elementary_libelementary_la_SOURCES = \
|
||||||
lib/elementary/elm_interface_atspi_text.c \
|
lib/elementary/elm_interface_atspi_text.c \
|
||||||
lib/elementary/efl_access_value.c \
|
lib/elementary/efl_access_value.c \
|
||||||
lib/elementary/elm_interface_atspi_widget_action.c \
|
lib/elementary/elm_interface_atspi_widget_action.c \
|
||||||
lib/elementary/elm_interface_atspi_window.c \
|
lib/elementary/efl_access_window.c \
|
||||||
lib/elementary/elm_interface_fileselector.c \
|
lib/elementary/elm_interface_fileselector.c \
|
||||||
lib/elementary/elm_interface_scrollable.c \
|
lib/elementary/elm_interface_scrollable.c \
|
||||||
lib/elementary/elm_inwin.c \
|
lib/elementary/elm_inwin.c \
|
||||||
|
|
|
@ -6,4 +6,4 @@
|
||||||
#include "elm_widget.h"
|
#include "elm_widget.h"
|
||||||
#include "elm_priv.h"
|
#include "elm_priv.h"
|
||||||
|
|
||||||
#include "elm_interface_atspi_window.eo.c"
|
#include "efl_access_window.eo.c"
|
|
@ -1,6 +1,6 @@
|
||||||
interface Elm.Interface.Atspi.Window ()
|
interface Efl.Access.Window ()
|
||||||
{
|
{
|
||||||
[[Elementary AT-SPI window interface]]
|
[[Elementary accessible window interface]]
|
||||||
events {
|
events {
|
||||||
window,created; [[Called when new window has been created.]]
|
window,created; [[Called when new window has been created.]]
|
||||||
window,destroyed; [[Called when window has been destroyed.]]
|
window,destroyed; [[Called when window has been destroyed.]]
|
|
@ -0,0 +1,56 @@
|
||||||
|
#ifndef EFL_ACCESS_WINDOW_H
|
||||||
|
#define EFL_ACCESS_WINDOW_H
|
||||||
|
|
||||||
|
#ifdef EFL_BETA_API_SUPPORT
|
||||||
|
#ifdef EFL_EO_API_SUPPORT
|
||||||
|
|
||||||
|
#include "efl_access_window.eo.h"
|
||||||
|
#endif
|
||||||
|
#ifndef EFL_NOLEGACY_API_SUPPORT
|
||||||
|
#include "efl_access_window.eo.legacy.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emits 'Window:Activated' accessible signal.
|
||||||
|
*/
|
||||||
|
#define efl_access_window_activated_signal_emit(obj) \
|
||||||
|
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emits 'Window:Deactivated' accessible signal.
|
||||||
|
*/
|
||||||
|
#define efl_access_window_deactivated_signal_emit(obj) \
|
||||||
|
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emits 'Window:Created' accessible signal.
|
||||||
|
*/
|
||||||
|
#define efl_access_window_created_signal_emit(obj) \
|
||||||
|
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emits 'Window:Destroyed' accessible signal.
|
||||||
|
*/
|
||||||
|
#define efl_access_window_destroyed_signal_emit(obj) \
|
||||||
|
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emits 'Window:Maximized' accessible signal.
|
||||||
|
*/
|
||||||
|
#define efl_access_window_maximized_signal_emit(obj) \
|
||||||
|
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emits 'Window:Minimized' accessible signal.
|
||||||
|
*/
|
||||||
|
#define efl_access_window_minimized_signal_emit(obj) \
|
||||||
|
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emits 'Window:Restored' accessible signal.
|
||||||
|
*/
|
||||||
|
#define efl_access_window_restored_signal_emit(obj) \
|
||||||
|
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
#endif
|
|
@ -1247,7 +1247,7 @@ _elm_win_focus_in(Ecore_Evas *ee)
|
||||||
|
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
{
|
{
|
||||||
elm_interface_atspi_window_activated_signal_emit(obj);
|
efl_access_window_activated_signal_emit(obj);
|
||||||
elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_ACTIVE, EINA_TRUE);
|
elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_ACTIVE, EINA_TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1281,7 +1281,7 @@ _elm_win_focus_out(Ecore_Evas *ee)
|
||||||
|
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
{
|
{
|
||||||
elm_interface_atspi_window_deactivated_signal_emit(obj);
|
efl_access_window_deactivated_signal_emit(obj);
|
||||||
elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_ACTIVE, EINA_FALSE);
|
elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_ACTIVE, EINA_FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1553,13 +1553,13 @@ _elm_win_state_change(Ecore_Evas *ee)
|
||||||
{
|
{
|
||||||
efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_ICONIFIED, NULL);
|
efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_ICONIFIED, NULL);
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
elm_interface_atspi_window_minimized_signal_emit(obj);
|
efl_access_window_minimized_signal_emit(obj);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_NORMAL, NULL);
|
efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_NORMAL, NULL);
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
elm_interface_atspi_window_restored_signal_emit(obj);
|
efl_access_window_restored_signal_emit(obj);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ch_sticky)
|
if (ch_sticky)
|
||||||
|
@ -1600,13 +1600,13 @@ _elm_win_state_change(Ecore_Evas *ee)
|
||||||
{
|
{
|
||||||
efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_MAXIMIZED, NULL);
|
efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_MAXIMIZED, NULL);
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
elm_interface_atspi_window_maximized_signal_emit(obj);
|
efl_access_window_maximized_signal_emit(obj);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_UNMAXIMIZED, NULL);
|
efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_UNMAXIMIZED, NULL);
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
elm_interface_atspi_window_restored_signal_emit(obj);
|
efl_access_window_restored_signal_emit(obj);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ch_profile)
|
if (ch_profile)
|
||||||
|
@ -2287,7 +2287,7 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
{
|
{
|
||||||
Eo *root;
|
Eo *root;
|
||||||
elm_interface_atspi_window_created_signal_emit(obj);
|
efl_access_window_created_signal_emit(obj);
|
||||||
root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
|
root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
|
||||||
if (root)
|
if (root)
|
||||||
elm_interface_atspi_accessible_children_changed_added_signal_emit(root, obj);
|
elm_interface_atspi_accessible_children_changed_added_signal_emit(root, obj);
|
||||||
|
@ -2350,7 +2350,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
|
||||||
{
|
{
|
||||||
Eo *root;
|
Eo *root;
|
||||||
root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
|
root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
|
||||||
elm_interface_atspi_window_destroyed_signal_emit(obj);
|
efl_access_window_destroyed_signal_emit(obj);
|
||||||
if (root)
|
if (root)
|
||||||
elm_interface_atspi_accessible_children_changed_del_signal_emit(root, obj);
|
elm_interface_atspi_accessible_children_changed_del_signal_emit(root, obj);
|
||||||
}
|
}
|
||||||
|
@ -2805,7 +2805,7 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
|
||||||
if (sd->autodel_clear) *(sd->autodel_clear) = -1;
|
if (sd->autodel_clear) *(sd->autodel_clear) = -1;
|
||||||
|
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
elm_interface_atspi_window_destroyed_signal_emit(obj);
|
efl_access_window_destroyed_signal_emit(obj);
|
||||||
|
|
||||||
_elm_win_list = eina_list_remove(_elm_win_list, obj);
|
_elm_win_list = eina_list_remove(_elm_win_list, obj);
|
||||||
_elm_win_count--;
|
_elm_win_count--;
|
||||||
|
@ -3038,7 +3038,7 @@ _elm_win_delete_request(Ecore_Evas *ee)
|
||||||
evas_object_hide(obj);
|
evas_object_hide(obj);
|
||||||
ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
|
ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
elm_interface_atspi_window_destroyed_signal_emit(obj);
|
efl_access_window_destroyed_signal_emit(obj);
|
||||||
ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
|
ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
|
||||||
if (autodel) evas_object_del(obj);
|
if (autodel) evas_object_del(obj);
|
||||||
else sd->autodel_clear = NULL;
|
else sd->autodel_clear = NULL;
|
||||||
|
@ -5289,7 +5289,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
|
||||||
|
|
||||||
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_WINDOW);
|
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_WINDOW);
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
elm_interface_atspi_window_created_signal_emit(obj);
|
efl_access_window_created_signal_emit(obj);
|
||||||
|
|
||||||
// attach config API
|
// attach config API
|
||||||
efl_composite_attach(obj, efl_provider_find(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS));
|
efl_composite_attach(obj, efl_provider_find(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS));
|
||||||
|
@ -6632,10 +6632,10 @@ _on_atspi_bus_connected(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUS
|
||||||
* receive all org.a11y.window events and could keep track of active
|
* receive all org.a11y.window events and could keep track of active
|
||||||
* windows whithin system.
|
* windows whithin system.
|
||||||
*/
|
*/
|
||||||
elm_interface_atspi_window_created_signal_emit(win);
|
efl_access_window_created_signal_emit(win);
|
||||||
if (elm_win_focus_get(win))
|
if (elm_win_focus_get(win))
|
||||||
{
|
{
|
||||||
elm_interface_atspi_window_activated_signal_emit(win);
|
efl_access_window_activated_signal_emit(win);
|
||||||
/** Reemit focused event to inform atspi clients about currently
|
/** Reemit focused event to inform atspi clients about currently
|
||||||
* focused object **/
|
* focused object **/
|
||||||
unsigned int order = 0;
|
unsigned int order = 0;
|
||||||
|
@ -6645,7 +6645,7 @@ _on_atspi_bus_connected(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUS
|
||||||
elm_interface_atspi_accessible_state_changed_signal_emit(target, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
|
elm_interface_atspi_accessible_state_changed_signal_emit(target, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
elm_interface_atspi_window_deactivated_signal_emit(win);
|
efl_access_window_deactivated_signal_emit(win);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -157,7 +157,7 @@ enum Efl.Ui.Win.Move_Resize_Mode
|
||||||
right = (1 << 4) [[Start resizing window to the right]]
|
right = (1 << 4) [[Start resizing window to the right]]
|
||||||
}
|
}
|
||||||
|
|
||||||
class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
|
class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window,
|
||||||
Elm.Interface.Atspi_Component, Elm.Interface.Atspi_Widget_Action,
|
Elm.Interface.Atspi_Component, Elm.Interface.Atspi_Widget_Action,
|
||||||
Efl.Container, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
|
Efl.Container, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
|
||||||
Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part, Efl.Ui.Focus.Manager )
|
Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part, Efl.Ui.Focus.Manager )
|
||||||
|
|
|
@ -44,7 +44,7 @@ EAPI void register_elm_interface_atspi_selection(v8::Handle<v8::Object> global,
|
||||||
EAPI void register_elm_interface_atspi_text(v8::Handle<v8::Object> global, v8::Isolate* isolate);
|
EAPI void register_elm_interface_atspi_text(v8::Handle<v8::Object> global, v8::Isolate* isolate);
|
||||||
EAPI void register_elm_interface_atspi_value(v8::Handle<v8::Object> global, v8::Isolate* isolate);
|
EAPI void register_elm_interface_atspi_value(v8::Handle<v8::Object> global, v8::Isolate* isolate);
|
||||||
EAPI void register_elm_interface_atspi_widget_action(v8::Handle<v8::Object> global, v8::Isolate* isolate);
|
EAPI void register_elm_interface_atspi_widget_action(v8::Handle<v8::Object> global, v8::Isolate* isolate);
|
||||||
EAPI void register_elm_interface_atspi_window(v8::Handle<v8::Object> global, v8::Isolate* isolate);
|
EAPI void register_efl_access_window(v8::Handle<v8::Object> global, v8::Isolate* isolate);
|
||||||
EAPI void register_elm_interface_fileselector(v8::Handle<v8::Object> global, v8::Isolate* isolate);
|
EAPI void register_elm_interface_fileselector(v8::Handle<v8::Object> global, v8::Isolate* isolate);
|
||||||
EAPI void register_elm_interface_scrollable(v8::Handle<v8::Object> global, v8::Isolate* isolate);
|
EAPI void register_elm_interface_scrollable(v8::Handle<v8::Object> global, v8::Isolate* isolate);
|
||||||
EAPI void register_elm_pan(v8::Handle<v8::Object> global, v8::Isolate* isolate);
|
EAPI void register_elm_pan(v8::Handle<v8::Object> global, v8::Isolate* isolate);
|
||||||
|
@ -209,7 +209,7 @@ void init(v8::Handle<v8::Object> exports)
|
||||||
::register_elm_interface_atspi_text(exports, v8::Isolate::GetCurrent());
|
::register_elm_interface_atspi_text(exports, v8::Isolate::GetCurrent());
|
||||||
::register_elm_interface_atspi_value(exports, v8::Isolate::GetCurrent());
|
::register_elm_interface_atspi_value(exports, v8::Isolate::GetCurrent());
|
||||||
::register_elm_interface_atspi_widget_action(exports, v8::Isolate::GetCurrent());
|
::register_elm_interface_atspi_widget_action(exports, v8::Isolate::GetCurrent());
|
||||||
::register_elm_interface_atspi_window(exports, v8::Isolate::GetCurrent());
|
::register_efl_access_window(exports, v8::Isolate::GetCurrent());
|
||||||
::register_elm_interface_fileselector(exports, v8::Isolate::GetCurrent());
|
::register_elm_interface_fileselector(exports, v8::Isolate::GetCurrent());
|
||||||
::register_elm_interface_scrollable(exports, v8::Isolate::GetCurrent());
|
::register_elm_interface_scrollable(exports, v8::Isolate::GetCurrent());
|
||||||
elm::register_inwin(exports, v8::Isolate::GetCurrent());
|
elm::register_inwin(exports, v8::Isolate::GetCurrent());
|
||||||
|
|
|
@ -157,13 +157,13 @@ static const Elm_Atspi_Bridge_Event_Handler event_handlers[] = {
|
||||||
{ ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, _active_descendant_changed_signal_send},
|
{ ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, _active_descendant_changed_signal_send},
|
||||||
{ ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ADDED, _on_object_add},
|
{ ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ADDED, _on_object_add},
|
||||||
{ ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_REMOVED, _on_object_del},
|
{ ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_REMOVED, _on_object_del},
|
||||||
{ ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_CREATED, _window_signal_send},
|
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, _window_signal_send},
|
||||||
{ ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DESTROYED, _window_signal_send},
|
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, _window_signal_send},
|
||||||
{ ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_ACTIVATED, _window_signal_send},
|
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, _window_signal_send},
|
||||||
{ ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DEACTIVATED, _window_signal_send},
|
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, _window_signal_send},
|
||||||
{ ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MAXIMIZED, _window_signal_send},
|
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, _window_signal_send},
|
||||||
{ ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MINIMIZED, _window_signal_send},
|
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, _window_signal_send},
|
||||||
{ ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_RESTORED, _window_signal_send},
|
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, _window_signal_send},
|
||||||
{ ELM_INTERFACE_ATSPI_SELECTION_EVENT_SELECTION_CHANGED, _selection_signal_send},
|
{ ELM_INTERFACE_ATSPI_SELECTION_EVENT_SELECTION_CHANGED, _selection_signal_send},
|
||||||
{ ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, _text_caret_moved_send },
|
{ ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, _text_caret_moved_send },
|
||||||
{ ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_INSERTED, _text_text_inserted_send },
|
{ ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_INSERTED, _text_text_inserted_send },
|
||||||
|
@ -3975,19 +3975,19 @@ _window_signal_send(void *data, const Efl_Event *event)
|
||||||
|
|
||||||
ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
|
ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
|
||||||
|
|
||||||
if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_CREATED)
|
if (event->desc == EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED)
|
||||||
type = ATSPI_WINDOW_EVENT_CREATE;
|
type = ATSPI_WINDOW_EVENT_CREATE;
|
||||||
else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DESTROYED)
|
else if (event->desc == EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED)
|
||||||
type = ATSPI_WINDOW_EVENT_DESTROY;
|
type = ATSPI_WINDOW_EVENT_DESTROY;
|
||||||
else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DEACTIVATED)
|
else if (event->desc == EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED)
|
||||||
type = ATSPI_WINDOW_EVENT_DEACTIVATE;
|
type = ATSPI_WINDOW_EVENT_DEACTIVATE;
|
||||||
else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_ACTIVATED)
|
else if (event->desc == EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED)
|
||||||
type = ATSPI_WINDOW_EVENT_ACTIVATE;
|
type = ATSPI_WINDOW_EVENT_ACTIVATE;
|
||||||
else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MAXIMIZED)
|
else if (event->desc == EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED)
|
||||||
type = ATSPI_WINDOW_EVENT_MAXIMIZE;
|
type = ATSPI_WINDOW_EVENT_MAXIMIZE;
|
||||||
else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MINIMIZED)
|
else if (event->desc == EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED)
|
||||||
type = ATSPI_WINDOW_EVENT_MINIMIZE;
|
type = ATSPI_WINDOW_EVENT_MINIMIZE;
|
||||||
else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_RESTORED)
|
else if (event->desc == EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED)
|
||||||
type = ATSPI_WINDOW_EVENT_RESTORE;
|
type = ATSPI_WINDOW_EVENT_RESTORE;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,56 +0,0 @@
|
||||||
#ifndef ELM_INTERFACE_ATSPI_WINDOW_H
|
|
||||||
#define ELM_INTERFACE_ATSPI_WINDOW_H
|
|
||||||
|
|
||||||
#ifdef EFL_BETA_API_SUPPORT
|
|
||||||
#ifdef EFL_EO_API_SUPPORT
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Emits ATSPI 'Window:Activated' dbus signal.
|
|
||||||
*/
|
|
||||||
#define elm_interface_atspi_window_activated_signal_emit(obj) \
|
|
||||||
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_ACTIVATED, NULL);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Emits ATSPI 'Window:Deactivated' dbus signal.
|
|
||||||
*/
|
|
||||||
#define elm_interface_atspi_window_deactivated_signal_emit(obj) \
|
|
||||||
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Emits ATSPI 'Window:Created' dbus signal.
|
|
||||||
*/
|
|
||||||
#define elm_interface_atspi_window_created_signal_emit(obj) \
|
|
||||||
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_CREATED, NULL);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Emits ATSPI 'Window:Destroyed' dbus signal.
|
|
||||||
*/
|
|
||||||
#define elm_interface_atspi_window_destroyed_signal_emit(obj) \
|
|
||||||
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DESTROYED, NULL);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Emits ATSPI 'Window:Maximized' dbus signal.
|
|
||||||
*/
|
|
||||||
#define elm_interface_atspi_window_maximized_signal_emit(obj) \
|
|
||||||
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Emits ATSPI 'Window:Minimized' dbus signal.
|
|
||||||
*/
|
|
||||||
#define elm_interface_atspi_window_minimized_signal_emit(obj) \
|
|
||||||
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MINIMIZED, NULL);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Emits ATSPI 'Window:Restored' dbus signal.
|
|
||||||
*/
|
|
||||||
#define elm_interface_atspi_window_restored_signal_emit(obj) \
|
|
||||||
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_RESTORED, NULL);
|
|
||||||
|
|
||||||
#include "elm_interface_atspi_window.eo.h"
|
|
||||||
#endif
|
|
||||||
#ifndef EFL_NOLEGACY_API_SUPPORT
|
|
||||||
#include "elm_interface_atspi_window.eo.legacy.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
#endif
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "elm_interface_atspi_accessible.h"
|
#include "elm_interface_atspi_accessible.h"
|
||||||
#include "elm_interface_atspi_text.h"
|
#include "elm_interface_atspi_text.h"
|
||||||
#include "elm_interface_atspi_widget_action.h"
|
#include "elm_interface_atspi_widget_action.h"
|
||||||
#include "elm_interface_atspi_window.h"
|
#include "efl_access_window.h"
|
||||||
|
|
||||||
#ifdef EFL_EO_API_SUPPORT
|
#ifdef EFL_EO_API_SUPPORT
|
||||||
#include "elm_interface_scrollable.h"
|
#include "elm_interface_scrollable.h"
|
||||||
|
|
Loading…
Reference in New Issue