jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=a4f915de6b6f76ae9c6b6859a3548edf6fec033b
commit a4f915de6b6f76ae9c6b6859a3548edf6fec033b
Author: Daniel Zaoui <daniel.za...@samsung.com>
Date: Wed Mar 19 13:42:15 2014 +0200
Eolian: Integration of Atspi Window Interface
---
src/lib/Makefile.am | 10 +++++++---
src/lib/elm_atspi_bridge.c | 6 +++---
src/lib/elm_atspi_object.c | 34 ++++------------------------------
src/lib/elm_atspi_object_eo.h | 3 +++
src/lib/elm_interface_atspi_window.eo | 9 +++++++++
5 files changed, 26 insertions(+), 36 deletions(-)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index d9fa325..13d354c 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -551,7 +551,9 @@ BUILT_SOURCES = \
elm_app_server_view.eo.c \
elm_app_server_view.eo.h \
elm_interface_atspi_component.eo.c \
- elm_interface_atspi_component.eo.h
+ elm_interface_atspi_component.eo.h \
+ elm_interface_atspi_window.eo.c \
+ elm_interface_atspi_window.eo.h
EXTRA_DIST += \
elm_widget.eo \
@@ -567,7 +569,8 @@ EXTRA_DIST += \
elm_app_client_view.eo \
elm_app_server.eo \
elm_app_server_view.eo \
- elm_interface_atspi_component.eo
+ elm_interface_atspi_component.eo \
+ elm_interface_atspi_window.eo
nodist_includesunstable_HEADERS = \
elm_widget.eo.h \
@@ -583,5 +586,6 @@ nodist_includesunstable_HEADERS = \
elm_app_client_view.eo.h \
elm_app_server.eo.h \
elm_app_server_view.eo.h \
- elm_interface_atspi_component.eo.h
+ elm_interface_atspi_component.eo.h \
+ elm_interface_atspi_window.eo.h
diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c
index 35cf0a9..088c135 100644
--- a/src/lib/elm_atspi_bridge.c
+++ b/src/lib/elm_atspi_bridge.c
@@ -901,7 +901,7 @@ _cache_object_register_interfaces(const char *path,
Elm_Atspi_Object *node)
if (eo_isa(node, ELM_INTERFACE_ATSPI_COMPONENT_CLASS))
eldbus_service_interface_register(_a11y_bus, path, &component_iface_desc);
- if (eo_isa(node, ELM_ATSPI_WINDOW_INTERFACE))
+ if (eo_isa(node, ELM_INTERFACE_ATSPI_WINDOW_CLASS))
{
window = eldbus_service_interface_register(_a11y_bus, path,
&window_iface_desc);
eo_do(node, eo_base_data_set("window_event_interface", window, NULL));
@@ -1296,9 +1296,9 @@ _handle_atspi_event(void *data EINA_UNUSED,
Elm_Atspi_Object *ao, const Eo_Event
_send_signal_children_changed(ao, event_info, ATSPI_OBJECT_CHILD_ADDED);
else if (desc == EV_ATSPI_OBJ_CHILD_DEL)
_send_signal_children_changed(ao, event_info, ATSPI_OBJECT_CHILD_REMOVED);
- else if (desc == EV_ATSPI_OBJ_WINDOW_ACTIVATED)
+ else if (desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_ACTIVATED)
_send_signal_window(ao, ATSPI_WINDOW_EVENT_ACTIVATE);
- else if (desc == EV_ATSPI_OBJ_WINDOW_DEACTIVATED)
+ else if (desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DEACTIVATED)
_send_signal_window(ao, ATSPI_WINDOW_EVENT_DEACTIVATE);
return EINA_TRUE;
diff --git a/src/lib/elm_atspi_object.c b/src/lib/elm_atspi_object.c
index 7a3fd64..bf53f95 100644
--- a/src/lib/elm_atspi_object.c
+++ b/src/lib/elm_atspi_object.c
@@ -143,12 +143,6 @@ EAPI const Eo_Event_Description _EV_ATSPI_OBJ_CHILD_DEL =
EAPI const Eo_Event_Description _EV_ATSPI_OBJ_STATE_CHANGED =
EO_EVENT_DESCRIPTION("state,changed", "Called when accessible object
state has changed.");
-EAPI const Eo_Event_Description _EV_ATSPI_OBJ_WINDOW_ACTIVATED =
- EO_EVENT_DESCRIPTION("widnow,created", "Called when new window has
been activated. (unfocuesed)");
-
-EAPI const Eo_Event_Description _EV_ATSPI_OBJ_WINDOW_DEACTIVATED =
- EO_EVENT_DESCRIPTION("widnow,created", "Called when new window has
been deactivated (unfocused).");
-
static void
_eo_emit_state_changed_event(void *data, Evas *e EINA_UNUSED, Evas_Object *eo
EINA_UNUSED, void *event_info EINA_UNUSED)
{
@@ -548,28 +542,8 @@ _elm_interface_atspi_component_contains(Eo *obj
EINA_UNUSED, void *_pd EINA_UNUS
return EINA_FALSE;
}
-// Window Interface
-
-static const Eo_Event_Description *window_event_desc[] = {
- EV_ATSPI_OBJ_WINDOW_ACTIVATED,
- EV_ATSPI_OBJ_WINDOW_DEACTIVATED,
- NULL
-};
-
-static const Eo_Class_Description window_interface_desc = {
- EO_VERSION,
- "Elm_Atspi_Window_Interface",
- EO_CLASS_TYPE_INTERFACE,
- EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0),
- window_event_desc,
- 0,
- NULL,
- NULL
-};
-
-EO_DEFINE_CLASS(elm_atspi_window_interface_get, &window_interface_desc, NULL,
NULL);
+#include "elm_interface_atspi_window.eo.c"
-/// Elm_Atspi_Widget base class
static void
_emit_atspi_state_changed_focused_event(void *data, Evas_Object *eo
EINA_UNUSED, void *event_info EINA_UNUSED)
{
@@ -838,14 +812,14 @@ static void
_win_focused(void *data, Evas_Object *eo EINA_UNUSED, void *event_info
EINA_UNUSED)
{
Elm_Atspi_Object *ao = data;
- eo_do(ao, eo_event_callback_call(EV_ATSPI_OBJ_WINDOW_ACTIVATED, NULL,
NULL));
+ eo_do(ao,
eo_event_callback_call(ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_ACTIVATED, NULL,
NULL));
}
static void
_win_unfocused(void *data, Evas_Object *eo EINA_UNUSED, void *event_info
EINA_UNUSED)
{
Elm_Atspi_Object *ao = data;
- eo_do(ao, eo_event_callback_call(EV_ATSPI_OBJ_WINDOW_DEACTIVATED, NULL,
NULL));
+ eo_do(ao,
eo_event_callback_call(ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DEACTIVATED,
NULL, NULL));
}
static void
@@ -912,7 +886,7 @@ static const Eo_Class_Description win_class_desc = {
NULL
};
-EO_DEFINE_CLASS(elm_atspi_win_obj_class_get, &win_class_desc,
ELM_ATSPI_WIDGET_CLASS, ELM_ATSPI_WINDOW_INTERFACE, NULL);
+EO_DEFINE_CLASS(elm_atspi_win_obj_class_get, &win_class_desc,
ELM_ATSPI_WIDGET_CLASS, ELM_INTERFACE_ATSPI_WINDOW_CLASS, NULL);
Elm_Atspi_Object*
_elm_atspi_root_object_get(void)
diff --git a/src/lib/elm_atspi_object_eo.h b/src/lib/elm_atspi_object_eo.h
index c02d5ce..33e8396 100644
--- a/src/lib/elm_atspi_object_eo.h
+++ b/src/lib/elm_atspi_object_eo.h
@@ -74,6 +74,8 @@ enum
/* Component Interface - END */
/* Window Interface */
+#include "elm_interface_atspi_window.eo.h"
+#if 0
#define ELM_ATSPI_WINDOW_INTERFACE elm_atspi_window_interface_get()
const Eo_Class *elm_atspi_window_interface_get(void) EINA_CONST;
@@ -82,6 +84,7 @@ extern const Eo_Event_Description
_EV_ATSPI_OBJ_WINDOW_ACTIVATED;
extern const Eo_Event_Description _EV_ATSPI_OBJ_WINDOW_DEACTIVATED;
#define EV_ATSPI_OBJ_WINDOW_DEACTIVATED (&(_EV_ATSPI_OBJ_WINDOW_DEACTIVATED))
+#endif
/* Window Interface - END */
/* Action Interface */
diff --git a/src/lib/elm_interface_atspi_window.eo
b/src/lib/elm_interface_atspi_window.eo
new file mode 100644
index 0000000..2661196
--- /dev/null
+++ b/src/lib/elm_interface_atspi_window.eo
@@ -0,0 +1,9 @@
+interface Elm_Interface_Atspi_Window ()
+{
+ data: null;
+ events {
+ window,activated; /*@ Called when new window has been activated.
(unfocuesed) */
+ window,deactivated; /*@ Called when new window has been deactivated
(unfocused). */
+ }
+
+}
--
