minor refactoring

Change-Id: I49734aef6cf22667c3765197f3f963a1fa3dce17

diff --git a/include/flat_navi.h b/include/flat_navi.h
index 601ee1cd06217b0ffcd1047b40e6b5a4af079c35..270252fc101e1c271537520caecce82ce4f794ad 100644 (file)
--- a/include/flat_navi.h
+++ b/include/flat_navi.h
@@ -123,7 +123,7 @@ AtspiAccessible *flat_navi_context_current_get(Flat_Navi_Context *ctx);
  * @param ctx Flat_Navi_Context
  * @param target new current Flat_Navi_Context object
  *
- * @return EINA_TRUE is operation successed, EINA_FALSE otherwise
+ * EINA_TRUE on success, EINA_FALSE otherwise
  */
 Eina_Bool flat_navi_context_current_set(Flat_Navi_Context *ctx, AtspiAccessible *target);
 

diff --git a/src/app_tracker.c b/src/app_tracker.c
index 961f925510a2635ffffbb0da1e47bf0564f72ae1..3f30324414c59aa38bf5405e5653fce5299c2528 100644 (file)
--- a/src/app_tracker.c
+++ b/src/app_tracker.c
@@ -17,6 +17,7 @@
 #include "app_tracker.h"
 #include "screen_reader_tts.h"
 #include "screen_reader_vconf.h"
+#include "screen_reader_utils.h"
 #include "logger.h"
 #include <ctype.h>
 #ifndef X11_ENABLED
@@ -38,7 +39,7 @@ typedef struct {
 typedef struct {
        AppTrackerEventCB func;
        AtspiAccessible *root;
-       void *user_data;
+       Flat_Navi_Context *user_data;
 } EventCallbackData;
 
 #define APP_TRACKER_INVACTIVITY_TIMEOUT 200
@@ -53,64 +54,24 @@ struct _app_tracker_data {
 #endif
 };
 
-static int _is_descendant(AtspiAccessible * ancestor, AtspiAccessible * descendant)
+static int _is_descendant(AtspiAccessible *ancestor, AtspiAccessible *descendant)
 {
        return 1;
-
-#if 0
-       do {
-               if (ancestor == descendant)
-                       return 1;
-       }
-       while ((descendant = atspi_accessible_get_parent(descendant, NULL)) != NULL);
-
-       return 0;
-#endif
 }
 
-static Eina_Bool _object_has_modal_state(AtspiAccessible * obj)
+static Eina_Bool _object_has_modal_state(AtspiAccessible *obj)
 {
-       if (!obj)
-               return EINA_FALSE;
-
-       Eina_Bool ret = EINA_FALSE;
-
-       AtspiStateSet *ss = atspi_accessible_get_state_set(obj);
-
-       if (atspi_state_set_contains(ss, ATSPI_STATE_MODAL))
-               ret = EINA_TRUE;
-       g_object_unref(ss);
-       return ret;
+       return widget_has_state(obj, ATSPI_STATE_MODAL);
 }
 
-static Eina_Bool _object_has_showing_state(AtspiAccessible * obj)
+static Eina_Bool _object_has_showing_state(AtspiAccessible *obj)
 {
-       if (!obj)
-               return EINA_FALSE;
-
-       Eina_Bool ret = EINA_FALSE;
-
-       AtspiStateSet *ss = atspi_accessible_get_state_set(obj);
-
-       if (atspi_state_set_contains(ss, ATSPI_STATE_SHOWING))
-               ret = EINA_TRUE;
-       g_object_unref(ss);
-       return ret;
+       return widget_has_state(obj, ATSPI_STATE_SHOWING);
 }
 
-static Eina_Bool _object_has_highlighted_state(AtspiAccessible * obj)
+static Eina_Bool _object_has_highlighted_state(AtspiAccessible *obj)
 {
-       if (!obj)
-               return EINA_FALSE;
-
-       Eina_Bool ret = EINA_FALSE;
-
-       AtspiStateSet *ss = atspi_accessible_get_state_set(obj);
-
-       if (atspi_state_set_contains(ss, ATSPI_STATE_HIGHLIGHTED))
-               ret = EINA_TRUE;
-       g_object_unref(ss);
-       return ret;
+       return widget_has_state(obj, ATSPI_STATE_HIGHLIGHTED);
 }
 
 static void _subtree_callbacks_call(SubTreeRootData * std)
@@ -595,6 +556,16 @@ static void _free_rootdata(gpointer data)
        g_free(std);
 }
 
+App_Tracker_Data *app_tracker_create()
+{
+       return calloc(1, sizeof(App_Tracker_Data));
+}
+
+void app_tracker_destroy(App_Tracker_Data *app)
+{
+       free(app);
+}
+
 void app_tracker_shutdown(App_Tracker_Data *app_tracker_ctx)
 {
        DEBUG("[START]");
@@ -632,14 +603,14 @@ void app_tracker_shutdown(App_Tracker_Data *app_tracker_ctx)
 
        g_list_free_full(app_tracker_ctx->_roots, _free_rootdata);
        app_tracker_ctx->_roots = NULL;
-       free(app_tracker_ctx);
+       app_tracker_destroy(app_tracker_ctx);
        DEBUG("[END]");
 }
 
 App_Tracker_Data *app_tracker_init(void)
 {
        DEBUG("[START]");
-       App_Tracker_Data *app_tracker_ctx = calloc(1, sizeof(App_Tracker_Data));
+       App_Tracker_Data *app_tracker_ctx = app_tracker_create();
 
        if (app_tracker_ctx == NULL) {
                ERROR("NULL context parameter");