code formatting update 02/129902/1
authorMariusz Wachowicz <m.wachowicz@partner.samsung.com>
Thu, 18 May 2017 09:33:22 +0000 (11:33 +0200)
committerMariusz Wachowicz <m.wachowicz@partner.samsung.com>
Thu, 18 May 2017 09:33:22 +0000 (11:33 +0200)
glitch in pre-commit removed

Change-Id: I05aa69e23116f6e435b46ab76fd5f1c2eea66ac0

31 files changed:
include/app_tracker.h
include/common_helpers.h
include/dbus_direct_reading_adapter.h
include/etest.h
include/flat_navi.h
include/keyboard_tracker.h
include/navigator.h
include/screen_reader.h
include/screen_reader_gestures.h
include/screen_reader_tts.h
include/screen_reader_utils.h
include/smart_notification.h
src/app_tracker.c
src/dbus_direct_reading_adapter.c
src/dbus_gesture_adapter.c
src/flat_navi.c
src/keyboard_tracker.c
src/main.c
src/navigator.c
src/screen_reader.c
src/screen_reader_gestures.c
src/screen_reader_switch.c
src/screen_reader_system.c
src/screen_reader_tts.c
src/screen_reader_utils.c
src/screen_reader_vconf.c
src/smart_notification.c
src/window_tracker.c
tests/atspi/atspi.c
tests/atspi/atspi.h
tests/smart_navi_suite.c

index beaf2461bb9f2d4b4c8e80390a806c0b72dcfce2..288f2dd6cb95649d81a2a7e19478254d68e97dd8 100644 (file)
@@ -15,15 +15,15 @@ typedef void (*AppTrackerEventCB)(AtspiAccessible *root, void *user_data);
 /**
  * @brief Callback used to get string containing default label
  */
-typedef char(*DefaultLabelCB)(AtspiAccessible *root, AtspiAccessible *obj);
+typedef char *(*DefaultLabelCB)(AtspiAccessible *root, AtspiAccessible *obj);
 
- /**
- * @brief Register listener on given event type.
- *
- * @param obj AtspiAccessible application object type
- * @param cb callback type
- * @param user_data pointer passed to cb function.
- */
+/**
+* @brief Register listener on given event type.
+*
+* @param obj AtspiAccessible application object type
+* @param cb callback type
+* @param user_data pointer passed to cb function.
+*/
 void app_tracker_callback_register(AtspiAccessible *app, AppTrackerEventCB cb, void *user_data);
 
 /**
@@ -50,8 +50,8 @@ void app_tracker_new_obj_highlighted_callback_unregister(AppTrackerEventCB cb, A
  * @return init count.
  */
 App_Tracker_Data *app_tracker_init(Service_Data *sd,
-                                       AppTrackerEventCB view_content_changed_cb,
-                                       DefaultLabelCB default_label_cb);
+                                                                  AppTrackerEventCB view_content_changed_cb,
+                                                                  DefaultLabelCB default_label_cb);
 
 /**
  * @brief Shutdown app tracker module
index dc4814ff39a2efa8a46bbd0b17ec7a249fe2198e..d58681d82f79c0ca45dc9f693607760b17acb311 100644 (file)
@@ -5,48 +5,48 @@
 
 #ifdef DEBUG
 #define PLOG(fmt, ...) \
-               fprintf(stderr, "<D> %s(%d) --> ", __FUNCTION__, __LINE__); \
-               fprintf(stderr, fmt, ##__VA_ARGS__);\
-               fprintf(stderr, "\n");\
-               LOGD(fmt, ##__VA_ARGS__);
+       fprintf(stderr, "<D> %s(%d) --> ", __FUNCTION__, __LINE__); \
+       fprintf(stderr, fmt, ##__VA_ARGS__);\
+       fprintf(stderr, "\n");\
+       LOGD(fmt, ##__VA_ARGS__);
 
 #define PLOGD(fmt, ...) \
-               PLOG(fmt, ##__VA_ARGS__)
+       PLOG(fmt, ##__VA_ARGS__)
 
 #define PLOGW(fmt, ...) \
-               fprintf(stderr, "<W> %s(%d) --> ", __FUNCTION__, __LINE__); \
-               fprintf(stderr, fmt, ##__VA_ARGS__);\
-               fprintf(stderr, "\n");\
-               LOGD(fmt, ##__VA_ARGS__);
+       fprintf(stderr, "<W> %s(%d) --> ", __FUNCTION__, __LINE__); \
+       fprintf(stderr, fmt, ##__VA_ARGS__);\
+       fprintf(stderr, "\n");\
+       LOGD(fmt, ##__VA_ARGS__);
 
 #define PLOGE(fmt, ...) \
-               fprintf(stderr, "<E> %s(%d) --> ", __FUNCTION__, __LINE__); \
-               fprintf(stderr, fmt, ##__VA_ARGS__);\
-               fprintf(stderr, "\n");\
-               LOGD(fmt, ##__VA_ARGS__);
+       fprintf(stderr, "<E> %s(%d) --> ", __FUNCTION__, __LINE__); \
+       fprintf(stderr, fmt, ##__VA_ARGS__);\
+       fprintf(stderr, "\n");\
+       LOGD(fmt, ##__VA_ARGS__);
 
 #define PLOGI(fmt, ...) \
-               fprintf(stderr, "<I> %s(%d) --> ", __FUNCTION__, __LINE__); \
-               fprintf(stderr, fmt, ##__VA_ARGS__);\
-               fprintf(stderr, "\n");\
-               LOGD(fmt, ##__VA_ARGS__);
+       fprintf(stderr, "<I> %s(%d) --> ", __FUNCTION__, __LINE__); \
+       fprintf(stderr, fmt, ##__VA_ARGS__);\
+       fprintf(stderr, "\n");\
+       LOGD(fmt, ##__VA_ARGS__);
 
 #else
 
 #define PLOG(fmt, ...) \
-               LOGD(fmt, ##__VA_ARGS__);
+       LOGD(fmt, ##__VA_ARGS__);
 
 #define PLOGD(fmt, ...) \
-               PLOG(fmt, ##__VA_ARGS__);
+       PLOG(fmt, ##__VA_ARGS__);
 
 #define PLOGW(fmt, ...) \
-               LOGW(fmt, ##__VA_ARGS__);
+       LOGW(fmt, ##__VA_ARGS__);
 
 #define PLOGE(fmt, ...) \
-               LOGE(fmt, ##__VA_ARGS__);
+       LOGE(fmt, ##__VA_ARGS__);
 
 #define PLOGI(fmt, ...) \
-               LOGI(fmt, ##__VA_ARGS__);
+       LOGI(fmt, ##__VA_ARGS__);
 
 #endif
 
index d37e52e0f62880e977eb030365a495494b0ba72f..045c82514342744e95d18c8765a623b90120e51b 100644 (file)
 #define DBUS_DIRECT_READING_ADAPTER_H_
 
 enum _Signal {
-    READING_STARTED = 0,
-    READING_STOPPED = 1,
-    READING_CANCELLED = 2,
-    READING_SKIPPED = 3
+       READING_STARTED = 0,
+       READING_STOPPED = 1,
+       READING_CANCELLED = 2,
+       READING_SKIPPED = 3
 };
 
 typedef enum _Signal Signal;
@@ -35,14 +35,14 @@ const char *get_signal_name(const Signal signal);
 
 Reading_Adapter *dbus_direct_reading_init(void);
 
- /**
 * @brief Shutdown eldbus.
 *
 * Function unregisters all intefaces of the object and decrements
 * connection reference count.
-       *
-       * @param Reading_Adapter pointer
 */
+/**
+ * @brief Shutdown eldbus.
+ *
+ * Function unregisters all intefaces of the object and decrements
+ * connection reference count.
+*
+* @param Reading_Adapter pointer
+ */
 
 void dbus_direct_reading_shutdown(Reading_Adapter *ra_data);
 
index 69b14fc857d6c7a00cbd7a121713ebfc66de20d3..04ce36f909abec540025998afcb5f7d629d9afa8 100644 (file)
@@ -6,9 +6,8 @@
 #include <Elementary.h>
 #include <Evas.h>
 
-struct appdata
-{
-   Evas_Object *win;
+struct appdata {
+       Evas_Object *win;
 };
 
 #endif
\ No newline at end of file
index 45d1c538c34fc26dc2f844c3fc69fb152370f00e..9ec69cada757951d3cddcdc6629665a9caffa0d9 100644 (file)
@@ -142,7 +142,7 @@ Eina_Bool flat_navi_context_current_set(Flat_Navi_Context *ctx, AtspiAccessible
  *
  * @note current element will be first of line.
  */
-Eina_Bool flat_navi_context_current_at_x_y_set(Flat_Navi_Context *ctx, gint x_cord, gint y_cord , AtspiAccessible **obj);
+Eina_Bool flat_navi_context_current_at_x_y_set(Flat_Navi_Context *ctx, gint x_cord, gint y_cord, AtspiAccessible **obj);
 
 /**
  * @brief Returns the first item in context without changing the context;
index f12a4006ce653b4d8e0373293797f60dea2f1125..ac18cb2b065ee90ef10bac9e369ae42664c3470b 100644 (file)
@@ -13,7 +13,7 @@
  * @note Registers asynchronic listener on back button.
  * @note Keyboard gesture recognition and broadcasting on dbus is unused and should be removed.
  */
-Keyboard_Tracker_Datakeyboard_tracker_init(void);
+Keyboard_Tracker_Data *keyboard_tracker_init(void);
 
 /**
  * @param ktd internal data struct
@@ -22,18 +22,17 @@ Keyboard_Tracker_Data* keyboard_tracker_init(void);
  */
 void keyboard_tracker_shutdown(Keyboard_Tracker_Data *ktd);
 
-enum _Key
-{
-   KEY_LEFT,
-   KEY_RIGHT,
-   KEY_UP,
-   KEY_DOWN,
-   KEY_COUNT
+enum _Key {
+       KEY_LEFT,
+       KEY_RIGHT,
+       KEY_UP,
+       KEY_DOWN,
+       KEY_COUNT
 };
 
 typedef enum _Key Key;
 
-typedef void (*Keyboard_Tracker_Cb) (void *data, Key k);
+typedef void (*Keyboard_Tracker_Cb)(void *data, Key k);
 
 #ifndef X11_ENABLED
 
index 39431b8285864b39e52d2c19b60003701d40ffe2..391138aaea23fb9e829c44bb114ba12c728274b7 100644 (file)
@@ -9,7 +9,7 @@
 
 void _widget_scroll(Service_Data *sd, Gesture_Info *gi);
 void navigator_get_scroll_pos(Navigator_Data *nd, int *x, int *y);
-char *generate_what_to_read(AtspiAccessible * obj, Screen_Reader_Vconf_Data_t *vconf_data);
+char *generate_what_to_read(AtspiAccessible *obj, Screen_Reader_Vconf_Data_t *vconf_data);
 AtspiAccessible *navigator_get_current_object(Navigator_Data *nd);
 
 #ifndef SCREEN_READER_TV
index 4e80fd6fd1e2629f4c075e70c5e3a855c5110404..9ac8bf9bd2d5a5768701619d5a2fe78c4d484e80 100644 (file)
 #define TEXT_INSERT_SIG "object:text-changed:insert"
 #define TEXT_DELETE_SIG "object:text-changed:delete"
 
-typedef struct
-{
-   char *language;
-   int voice_type;
+typedef struct {
+       char *language;
+       int voice_type;
 } Voice_Info;
 
-typedef void (*Window_Tracker_Cb) (void *data, AtspiAccessible *window);
+typedef void (*Window_Tracker_Cb)(void *data, AtspiAccessible *window);
 
-typedef enum
-{
+typedef enum {
        read_as_xml,
        read_as_plain,
        dont_read
@@ -62,11 +60,10 @@ typedef struct _Keyboard_Tracker_Data Keyboard_Tracker_Data;
 
 typedef struct _Smart_Notification_Data Smart_Notification_Data;
 
-typedef struct _Service_Data
-{
+typedef struct _Service_Data {
        Navigator_Data *navigator_data;
        Flat_Navi_Context *flat_navi_context;
-       Keyboard_Tracker_Datakeyboard_tracker_data;
+       Keyboard_Tracker_Data *keyboard_tracker_data;
        Window_Tracker_Data *window_tracker_data;
        Smart_Notification_Data *smart_notification_data;
        Screen_Reader_Gestures_Data *screen_reader_gestures_ctx;
index 57bf6d2d094e28756d9588766959c71fbabf61f9..8cd0ca2bee6884e8ed68c8f56a07ede1629ed25a 100644 (file)
 /**
  * @brief Accessibility gestures
  */
-enum _Gesture
-{
-   ONE_FINGER_HOVER,
-   TWO_FINGERS_HOVER,
-   THREE_FINGERS_HOVER,
-   ONE_FINGER_FLICK_LEFT,
-   ONE_FINGER_FLICK_RIGHT,
-   ONE_FINGER_FLICK_UP,
-   ONE_FINGER_FLICK_DOWN,
-   TWO_FINGERS_FLICK_LEFT,
-   TWO_FINGERS_FLICK_RIGHT,
-   TWO_FINGERS_FLICK_UP,
-   TWO_FINGERS_FLICK_DOWN,
-   THREE_FINGERS_FLICK_LEFT,
-   THREE_FINGERS_FLICK_RIGHT,
-   THREE_FINGERS_FLICK_UP,
-   THREE_FINGERS_FLICK_DOWN,
-   ONE_FINGER_SINGLE_TAP,
-   ONE_FINGER_DOUBLE_TAP,
-   ONE_FINGER_TRIPLE_TAP,
-   TWO_FINGERS_SINGLE_TAP,
-   TWO_FINGERS_DOUBLE_TAP,
-   TWO_FINGERS_TRIPLE_TAP,
-   THREE_FINGERS_SINGLE_TAP,
-   THREE_FINGERS_DOUBLE_TAP,
-   THREE_FINGERS_TRIPLE_TAP,
-   ONE_FINGER_FLICK_LEFT_RETURN,
-   ONE_FINGER_FLICK_RIGHT_RETURN,
-   ONE_FINGER_FLICK_UP_RETURN,
-   ONE_FINGER_FLICK_DOWN_RETURN,
-   TWO_FINGERS_FLICK_LEFT_RETURN,
-   TWO_FINGERS_FLICK_RIGHT_RETURN,
-   TWO_FINGERS_FLICK_UP_RETURN,
-   TWO_FINGERS_FLICK_DOWN_RETURN,
-   THREE_FINGERS_FLICK_LEFT_RETURN,
-   THREE_FINGERS_FLICK_RIGHT_RETURN,
-   THREE_FINGERS_FLICK_UP_RETURN,
-   THREE_FINGERS_FLICK_DOWN_RETURN,
-   GESTURES_COUNT,
+enum _Gesture {
+       ONE_FINGER_HOVER,
+       TWO_FINGERS_HOVER,
+       THREE_FINGERS_HOVER,
+       ONE_FINGER_FLICK_LEFT,
+       ONE_FINGER_FLICK_RIGHT,
+       ONE_FINGER_FLICK_UP,
+       ONE_FINGER_FLICK_DOWN,
+       TWO_FINGERS_FLICK_LEFT,
+       TWO_FINGERS_FLICK_RIGHT,
+       TWO_FINGERS_FLICK_UP,
+       TWO_FINGERS_FLICK_DOWN,
+       THREE_FINGERS_FLICK_LEFT,
+       THREE_FINGERS_FLICK_RIGHT,
+       THREE_FINGERS_FLICK_UP,
+       THREE_FINGERS_FLICK_DOWN,
+       ONE_FINGER_SINGLE_TAP,
+       ONE_FINGER_DOUBLE_TAP,
+       ONE_FINGER_TRIPLE_TAP,
+       TWO_FINGERS_SINGLE_TAP,
+       TWO_FINGERS_DOUBLE_TAP,
+       TWO_FINGERS_TRIPLE_TAP,
+       THREE_FINGERS_SINGLE_TAP,
+       THREE_FINGERS_DOUBLE_TAP,
+       THREE_FINGERS_TRIPLE_TAP,
+       ONE_FINGER_FLICK_LEFT_RETURN,
+       ONE_FINGER_FLICK_RIGHT_RETURN,
+       ONE_FINGER_FLICK_UP_RETURN,
+       ONE_FINGER_FLICK_DOWN_RETURN,
+       TWO_FINGERS_FLICK_LEFT_RETURN,
+       TWO_FINGERS_FLICK_RIGHT_RETURN,
+       TWO_FINGERS_FLICK_UP_RETURN,
+       TWO_FINGERS_FLICK_DOWN_RETURN,
+       THREE_FINGERS_FLICK_LEFT_RETURN,
+       THREE_FINGERS_FLICK_RIGHT_RETURN,
+       THREE_FINGERS_FLICK_UP_RETURN,
+       THREE_FINGERS_FLICK_DOWN_RETURN,
+       GESTURES_COUNT,
 };
 typedef enum _Gesture Gesture;
 
-typedef struct
-{
-   Gesture type;         // Type of recognized gesture
-   int x_beg, x_end;     // (x,y) coordinates when gesture begin (screen coords)
-   int y_beg, y_end;     // (x,y) coordinates when gesture ends (screen coords)
-   pid_t pid;            // pid of process on which gesture took place.
-   int state;            // 0 - begin, 1 - ongoing, 2 - ended, 3 - aborted
-   int event_time;
+typedef struct {
+       Gesture type;         // Type of recognized gesture
+       int x_beg, x_end;     // (x,y) coordinates when gesture begin (screen coords)
+       int y_beg, y_end;     // (x,y) coordinates when gesture ends (screen coords)
+       pid_t pid;            // pid of process on which gesture took place.
+       int state;            // 0 - begin, 1 - ongoing, 2 - ended, 3 - aborted
+       int event_time;
 } Gesture_Info;
 
 /**
@@ -109,7 +107,7 @@ void end_scroll(int x, int y, Screen_Reader_Gestures_Data *gestures_ctx);
 #ifdef X11_ENABLED
 Ecore_X_Window top_window_get(int x, int y, Screen_Reader_Gestures_Data *gestures_ctx);
 #else
-Ecore_Wl_Window *top_window_get (int x, int y);
+Ecore_Wl_Window *top_window_get(int x, int y);
 #endif
 
 #endif
index 80ef23dbea1ba2efccc7034c785bd9a2e9c8389a..0080257a288917d18e332c9e5fd5ce4e615ac223 100644 (file)
@@ -8,7 +8,7 @@
 #define TEXT_CUT_SIZE 300
 
 extern tts_h h_tts;
-extern charlanguage;
+extern char *language;
 extern int voice;
 extern int speed;
 
@@ -36,7 +36,7 @@ typedef void (*utterance_completed_f)(void);
 
 Screen_Reader_Tts_Data_t *tts_init(void);
 void tts_shutdown(Screen_Reader_Tts_Data_t *tts_data);
-void state_changed_cb(tts_h tts, tts_state_e previous, tts_state_e current, voiduser_data);
+void state_changed_cb(tts_h tts, tts_state_e previous, tts_state_e current, void *user_data);
 /**
  * @brief Requests discardable, asynchronous (queued) reading of given text.
  *
index e2e3bba376891520cadb7c19b9d57e02a1048700..71525fcaa0259683001f59c0f7b82e0dfa1b52e3 100644 (file)
  *
  * @see _get_objects_attributes(), generate_what_to_read(), atspi_accessible_get_attributes()
  */
-enum Reading_Info
-{
-   ACCESSIBLE_READING_INFO_TYPE_NAME = 1 << 0,
-   ACCESSIBLE_READING_INFO_TYPE_ROLE = 1 << 1,
-   ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION = 1 << 2,
-   ACCESSIBLE_READING_INFO_TYPE_STATE = 1 << 3
+enum Reading_Info {
+       ACCESSIBLE_READING_INFO_TYPE_NAME = 1 << 0,
+       ACCESSIBLE_READING_INFO_TYPE_ROLE = 1 << 1,
+       ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION = 1 << 2,
+       ACCESSIBLE_READING_INFO_TYPE_STATE = 1 << 3
 };
 
 /*
@@ -98,7 +97,7 @@ const char *get_debug_object_info_implementation(AtspiAccessible *obj, const cha
  *
  * @note returned string should be freed
  */
-char *generate_description_trait(AtspiAccessible * obj);
+char *generate_description_trait(AtspiAccessible *obj);
 
 /*
  * @brief Determines if passed object has defined action
@@ -118,7 +117,7 @@ Eina_Bool widget_has_action(AtspiAccessible *obj, const char *action_name);
  *
  * @note returned string should be freed
  */
-char *generate_state_trait(AtspiAccessible * obj);
+char *generate_state_trait(AtspiAccessible *obj);
 
 /**
  * @brief Generates verbal description of object's role
@@ -129,7 +128,7 @@ char *generate_state_trait(AtspiAccessible * obj);
  *
  * @note returned string should be freed
  */
-char *generate_role_trait(AtspiAccessible * obj);
+char *generate_role_trait(AtspiAccessible *obj);
 
 /**
  * @brief Generates specific text for objects being in defined relation with passed object
index 753a98c2ef1100d55105285617b90762b7c8b24d..bef171f764895191896193c92253633770f1b5b0 100644 (file)
  *
  * @REALIZED_ITEMS_NOTIFICATION_EVENT
  */
-enum _Notification_Type
-{
-   FOCUS_CHAIN_END_NOTIFICATION_EVENT,
-   REALIZED_ITEMS_NOTIFICATION_EVENT,
-   HIGHLIGHT_NOTIFICATION_EVENT,
-   HIGHLIGHT_NOTIFICATION_EVENT_ACTIONABLE,
-   ACTION_NOTIFICATION_EVENT,
-   CONTEXTUAL_MENU_NOTIFICATION_EVENT,
-   LONG_PRESS_NOTIFICATION_EVENT,
-   WINDOW_STATE_CHANGE_NOTIFICATION_EVENT
+enum _Notification_Type {
+       FOCUS_CHAIN_END_NOTIFICATION_EVENT,
+       REALIZED_ITEMS_NOTIFICATION_EVENT,
+       HIGHLIGHT_NOTIFICATION_EVENT,
+       HIGHLIGHT_NOTIFICATION_EVENT_ACTIONABLE,
+       ACTION_NOTIFICATION_EVENT,
+       CONTEXTUAL_MENU_NOTIFICATION_EVENT,
+       LONG_PRESS_NOTIFICATION_EVENT,
+       WINDOW_STATE_CHANGE_NOTIFICATION_EVENT
 };
 
 typedef enum _Notification_Type Notification_Type;
 
-struct _Smart_Notification_Data{
+struct _Smart_Notification_Data {
        Eina_Bool status;
 };
 
index 05775af635bf59ebbe34a8a3815bf042dfae62ee..f58762757589e5df9eb9ddc5740714b6cdfecdae 100644 (file)
 #endif
 
 #define GERROR_CHECK(error)\
-  if (error)\
-   {\
-     ERROR("Error_log:%s",error->message);\
-     g_error_free(error);\
-     error = NULL;\
-   }
+       if (error)\
+       {\
+               ERROR("Error_log:%s",error->message);\
+               g_error_free(error);\
+               error = NULL;\
+       }
 
 typedef struct {
        AppTrackerEventCB func;
@@ -113,7 +113,7 @@ static gboolean _on_timeout_read_default_label(gpointer data)
 
 static gboolean _on_timeout_rebuild_navigation_context(gpointer user_data)
 {
-       DEBUG("[START]");
+       DEBUG("[START]");
        if (!user_data) {
                ERROR("Invalid parameter. Required NOT NULL parameter user_data is NULL");
                return FALSE;
@@ -127,7 +127,7 @@ static gboolean _on_timeout_rebuild_navigation_context(gpointer user_data)
                        active_window_context->view_content_changed_ecd->func(root, active_window_context->view_content_changed_ecd->user_data);
        }
        active_window_context->timer = 0;
-       DEBUG("[END]");
+       DEBUG("[END]");
        return FALSE;
 }
 
@@ -205,7 +205,7 @@ static void _read_value(AtspiValue *value, Screen_Reader_Tts_Data_t *tts_data)
        tts_speak(buf, EINA_TRUE, tts_data);
 }
 
-static unsigned short int _get_objects_attributes(AtspiAccessibleobj)
+static unsigned short int _get_objects_attributes(AtspiAccessible *obj)
 {
        char **list;
        unsigned int n = 0;
@@ -233,7 +233,7 @@ static unsigned short int _get_objects_attributes(AtspiAccessible* obj)
        }
        if (!hash_table || !reading_info) {
                attribute = attribute | (ACCESSIBLE_READING_INFO_TYPE_NAME) |
-                               (ACCESSIBLE_READING_INFO_TYPE_ROLE) | (ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION) | (ACCESSIBLE_READING_INFO_TYPE_STATE);
+                                       (ACCESSIBLE_READING_INFO_TYPE_ROLE) | (ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION) | (ACCESSIBLE_READING_INFO_TYPE_STATE);
        }
        if (reading_info) g_free(reading_info);
        if (hash_table) g_hash_table_unref(hash_table);
@@ -266,7 +266,7 @@ static Eina_Bool _pop_modal_and_speak(Service_Data *sd)
                                g_source_remove(active_window_context->default_label_timer);
                        active_window_context->default_label_timer = g_timeout_add(APP_TRACKER_INVACTIVITY_TIMEOUT, _on_timeout_read_default_label, sd);
                }
-               DEBUG("[END]");
+               DEBUG("[END]");
                return EINA_TRUE;
        } else {
                DEBUG("[END] Trying to pop modal from empty stack");
@@ -341,29 +341,26 @@ static void _on_atspi_event_cb(AtspiEvent *event, void *user_data)
                else if (atspi_accessible_get_role(event->source, NULL) == ATSPI_ROLE_WINDOW) {
                        if (rect) {
                                if (rect->width > rect->height)
-                                       tts_speak (_("IDS_ACCS_OPT_LANDSCAPE_VIEW_TTS"), EINA_TRUE, tts_data);
+                                       tts_speak(_("IDS_ACCS_OPT_LANDSCAPE_VIEW_TTS"), EINA_TRUE, tts_data);
                                else
-                                       tts_speak (_("IDS_ACCS_OPT_PORTRAIT_VIEW_TTS"), EINA_TRUE, tts_data);
+                                       tts_speak(_("IDS_ACCS_OPT_PORTRAIT_VIEW_TTS"), EINA_TRUE, tts_data);
                                DEBUG("Window geometry: %d %d", rect->width, rect->height);
                        }
                }
        }
 #endif
 #ifndef SCREEN_READER_TV
-       if (!strcmp(event->type, "object:visible-data-changed"))
-       {
+       if (!strcmp(event->type, "object:visible-data-changed")) {
                AtspiComponent *comp = NULL;
                AtspiRect *rect = NULL;
                AtspiAccessible *child_iter = NULL;
                Gesture_Info *gi = navigator_get_gesture_info(sd->navigator_data);
                memset(gi, 0, sizeof(Gesture_Info));
-               if ((atspi_accessible_get_role(event->source, NULL) == ATSPI_ROLE_SCROLL_PANE))
-               {
+               if ((atspi_accessible_get_role(event->source, NULL) == ATSPI_ROLE_SCROLL_PANE)) {
                        child_iter = atspi_accessible_get_child_at_index(event->source, 0, NULL);
                        if (child_iter)
                                comp = atspi_accessible_get_component_iface(child_iter);
-                       if (comp)
-                       {
+                       if (comp) {
                                rect = atspi_component_get_extents(comp, ATSPI_COORD_TYPE_SCREEN, NULL);
                                if (rect) {
                                        gi->state = 2;
@@ -393,19 +390,18 @@ static void _on_atspi_event_cb(AtspiEvent *event, void *user_data)
                }
                if (!strcmp(event->type, "object:text-changed:delete") && (atspi_accessible_get_role(event->source, NULL) == ATSPI_ROLE_ENTRY)) {
                        char buf[256] = "\0";
-                       char buf_deleted[256] ="\0";
+                       char buf_deleted[256] = "\0";
                        const gchar *text = NULL;
                        char *etext = NULL;
                        AtspiText *iface_text = NULL;
                        text = g_value_get_string(&event->any_data);
                        if ((event->detail2 == 1) && isupper((int)*text)) {
                                snprintf(buf, sizeof(buf), _("IDS_ACCS_OPT_CAPITAL_PS_TTS"), text);
-                       }
-                       else {
+                       } else {
                                strncat(buf, text, sizeof(buf) - strlen(buf) - 1);
                        }
                        strncat(buf, " ", sizeof(buf) - strlen(buf) - 1);
-                       snprintf(buf_deleted, sizeof(buf_deleted), _("IDS_ACCS_TBOPT_PS_DELETED"),"");
+                       snprintf(buf_deleted, sizeof(buf_deleted), _("IDS_ACCS_TBOPT_PS_DELETED"), "");
                        strncat(buf, buf_deleted, sizeof(buf) - strlen(buf) - 1);
                        if (event->detail1 == 0) {
                                iface_text = atspi_accessible_get_text_iface(event->source);
@@ -452,8 +448,7 @@ static void _on_atspi_event_cb(AtspiEvent *event, void *user_data)
                        AtspiValue *value_interface = atspi_accessible_get_value_iface(event->source);
                        _read_value(value_interface, tts_data);
                        g_object_unref(value_interface);
-               }
-               else if (role == ATSPI_ROLE_FILLER) {
+               } else if (role == ATSPI_ROLE_FILLER) {
                        gchar *name = atspi_accessible_get_name(event->source, NULL);
                        tts_speak_customized(name, EINA_TRUE, EINA_TRUE, event->source, tts_data);
                        g_free(name);
@@ -503,8 +498,7 @@ static void _on_atspi_event_cb(AtspiEvent *event, void *user_data)
                                strncat(buf, _("IDS_ACCS_BODY_SELECTED_TTS"), sizeof(buf) - strlen(buf) - 1);
                                tts_speak(buf, EINA_TRUE, tts_data);
                        }
-               }
-               else if (atspi_accessible_get_role(event->source, NULL) == ATSPI_ROLE_LIST_ITEM) {
+               } else if (atspi_accessible_get_role(event->source, NULL) == ATSPI_ROLE_LIST_ITEM) {
                        AtspiStateSet *state_set = atspi_accessible_get_state_set(event->source);
                        if (event->detail1 && atspi_state_set_contains(state_set, ATSPI_STATE_SHOWING)) {
                                snprintf(buf, sizeof(buf) - 1, name);
@@ -530,8 +524,7 @@ static void _on_atspi_event_cb(AtspiEvent *event, void *user_data)
                                g_object_unref(parent_state_set);
                        }
                        g_object_unref(state_set);
-               }
-               else {
+               } else {
                        strncat(buf, _("IDS_ACCS_BODY_DOUBLE_TAP_TO_SELECT_TTS"), sizeof(buf) - strlen(buf)  - 1);
                        tts_speak(buf, EINA_TRUE, tts_data);
                }
@@ -553,7 +546,7 @@ static void _on_atspi_event_cb(AtspiEvent *event, void *user_data)
                new_highlighted_obj = NULL;
        }
        if (!strcmp("object:state-changed:showing", event->type) ||
-               !strcmp("object:state-changed:visible", event->type)) {
+                       !strcmp("object:state-changed:visible", event->type)) {
                SubTreeRootData *active_window_context = app->active_window_context;
 
                if (!active_window_context) {
@@ -581,7 +574,7 @@ static void _on_atspi_event_cb(AtspiEvent *event, void *user_data)
                        g_object_ref(event->source);
                        active_window_context->modals = g_list_prepend(active_window_context->modals, event->source);
                } else if (flat_navi_context_current_get(sd->flat_navi_context) == event->source
-                               && !strcmp("object:state-changed:showing", event->type) && !event->detail1) {
+                                  && !strcmp("object:state-changed:showing", event->type) && !event->detail1) {
                        // current object in active window navigation context became not showing, handle this as default label case
                        // first read the default label
                        want_reschedule_default_label_reading = EINA_TRUE;
@@ -602,7 +595,7 @@ static void _on_atspi_event_cb(AtspiEvent *event, void *user_data)
                        active_window_context->timer = g_timeout_add(APP_TRACKER_INVACTIVITY_TIMEOUT, _on_timeout_rebuild_navigation_context, active_window_context);
                }
        }
-       DEBUG("[END]");
+       DEBUG("[END]");
 }
 
 static void clear(gpointer d)
@@ -627,25 +620,25 @@ static AtspiAccessible *_get_showing_modal_descendant(AtspiAccessible *root)
                atspi_state_set_add(states, ATSPI_STATE_VISIBLE);
                DEBUG("GET MODAL: STATE SET PREPARED");
                AtspiMatchRule *rule = atspi_match_rule_new(states,
-                       ATSPI_Collection_MATCH_ALL,
-                       NULL, // do not match attributes
-                       ATSPI_Collection_MATCH_INVALID,
-                       NULL, // do not match roles
-                       ATSPI_Collection_MATCH_INVALID,
-                       NULL, // do not match interfaces
-                       ATSPI_Collection_MATCH_INVALID,
-                       FALSE); // make positive match
+                                                          ATSPI_Collection_MATCH_ALL,
+                                                          NULL, // do not match attributes
+                                                          ATSPI_Collection_MATCH_INVALID,
+                                                          NULL, // do not match roles
+                                                          ATSPI_Collection_MATCH_INVALID,
+                                                          NULL, // do not match interfaces
+                                                          ATSPI_Collection_MATCH_INVALID,
+                                                          FALSE); // make positive match
                if (rule) {
                        DEBUG("GET MODAL: MATCHING RULE PREPARED");
                        AtspiCollection *col_iface = atspi_accessible_get_collection_iface(root);
                        if (col_iface) {
                                DEBUG("GET MODAL: GOT INTERFACE");
                                GArray *result = atspi_collection_get_matches(col_iface,
-                                       rule,
-                                       ATSPI_Collection_SORT_ORDER_CANONICAL,
-                                       1, // the number of results to return
-                                       TRUE, // not supported by AT-SPI2 API
-                                       &err);
+                                                                rule,
+                                                                ATSPI_Collection_SORT_ORDER_CANONICAL,
+                                                                1, // the number of results to return
+                                                                TRUE, // not supported by AT-SPI2 API
+                                                                &err);
                                GERROR_CHECK(err);
                                if (result) {
                                        DEBUG("GET MODAL: QUERY PERFORMED");
@@ -662,7 +655,7 @@ static AtspiAccessible *_get_showing_modal_descendant(AtspiAccessible *root)
                }
                g_object_unref(states);
        }
-       DEBUG("[END]");
+       DEBUG("[END]");
        return ret;
 }
 
@@ -823,7 +816,7 @@ App_Tracker_Data *app_tracker_init(Service_Data *sd, AppTrackerEventCB view_cont
        if (_app_tracker_init_internal(sd, view_content_changed_cb, default_label_cb)) {
                ERROR("app tracker init internal has failed");
                app_tracker_destroy(app);
-               DEBUG("[END]");
+               DEBUG("[END]");
                return NULL;
        }
        DEBUG("[END]");
@@ -850,8 +843,8 @@ static void app_tracker_switch_active_window_context(void *data, AtspiAccessible
                ERROR("app_tracker module used without initialization");
                return;
        }
-       DEBUG("switching active window context (%p) from root %s to root %s",active_window_context,
-               get_debug_object_info(active_window_context->root), get_debug_object_info(root));
+       DEBUG("switching active window context (%p) from root %s to root %s", active_window_context,
+                 get_debug_object_info(active_window_context->root), get_debug_object_info(root));
        if (!root) {
                ERROR("Invalid parameter. root is NULL. No top window found!");
                return;
@@ -871,7 +864,7 @@ static void app_tracker_switch_active_window_context(void *data, AtspiAccessible
        DEBUG("Computed default label = %s", active_window_context->default_label);
        DEBUG("Modals %p length %d", active_window_context->modals, g_list_length(active_window_context->modals));
        // speak if no modals
-       if(!active_window_context->modals->data) {
+       if (!active_window_context->modals->data) {
                if (active_window_context->default_label_timer)
                        g_source_remove(active_window_context->default_label_timer);
                DEBUG("Reschedule default label timer in active window context");
@@ -924,10 +917,10 @@ Eina_Bool app_tracker_active_window_context_is_valid(App_Tracker_Data *app_track
                return EINA_FALSE;
        }
        Service_Data *sd = active_window_context->view_content_changed_ecd->user_data;
-       if (!flat_navi_is_valid(sd->flat_navi_context, NULL)){
+       if (!flat_navi_is_valid(sd->flat_navi_context, NULL)) {
                DEBUG("flat navi context is not valid");
                return EINA_FALSE;
        }
-               return EINA_TRUE;
+       return EINA_TRUE;
 
 }
index 507112578572ad399560021d9367148eae445046..8f279b8280e2ec5f3451da12a36a420fe33ae4e9 100644 (file)
@@ -31,19 +31,25 @@ struct _direct_reading_data {
        Eldbus_Message *msg;
 };
 
-const char *get_signal_name(const Signal signal) {
+const char *get_signal_name(const Signal signal)
+{
 
        switch (signal) {
-       case READING_STARTED:
-               { return "ReadingStarted"; }
-       case READING_STOPPED:
-               { return "ReadingStopped"; }
-       case READING_CANCELLED:
-               { return "ReadingCancelled"; }
-       case READING_SKIPPED:
-               { return "ReadingSkipped"; }
-       default:
-               { return "UnknownSignal"; }
+       case READING_STARTED: {
+               return "ReadingStarted";
+       }
+       case READING_STOPPED: {
+               return "ReadingStopped";
+       }
+       case READING_CANCELLED: {
+               return "ReadingCancelled";
+       }
+       case READING_SKIPPED: {
+               return "ReadingSkipped";
+       }
+       default: {
+               return "UnknownSignal";
+       }
        }
 }
 
@@ -169,7 +175,7 @@ void _get_a11y_address(void *data, const Eldbus_Message *msg, Eldbus_Pending *pe
                        if (ra_data->iface) {
                                DEBUG("RequestName start");
                                eldbus_name_request(ra_data->conn, BUS, ELDBUS_NAME_REQUEST_FLAG_DO_NOT_QUEUE,
-                                                   on_name_request, NULL);
+                                                                       on_name_request, NULL);
                                DEBUG("RequestName end");
                        } else {
                                ERROR("Failed to register %s interface", INTERFACE);
@@ -224,11 +230,10 @@ Reading_Adapter *dbus_direct_reading_init(void)
        if (ra_data->session != NULL && ret != 0)
                eldbus_connection_unref(ra_data->session);
 
-       if(ret == 0) {
+       if (ret == 0) {
                DEBUG("[END]");
                return ra_data;
-       }
-       else {
+       } else {
                ERROR("Initialization has failed");
                free(ra_data);
                return NULL;
index 9a359e7f13f62a59157682379d5db48be6482f19..03b5e76260b8b29af50ef1b083e4a3e4a6c37c08 100644 (file)
@@ -51,7 +51,7 @@ void _on_get_a11y_address(void *data, const Eldbus_Message *msg, Eldbus_Pending
        const char *errname, *errmsg;
        Gesture_Adapter *ga_data = data;
 
-       if(ga_data == NULL)
+       if (ga_data == NULL)
                return;
 
        if (eldbus_message_error_get(msg, &errname, &errmsg)) {
@@ -78,7 +78,7 @@ void _on_get_a11y_address(void *data, const Eldbus_Message *msg, Eldbus_Pending
 
        eldbus_name_request(ga_data->conn, E_A11Y_SERVICE_BUS_NAME, ELDBUS_NAME_REQUEST_FLAG_DO_NOT_QUEUE, NULL, NULL);
 
- end:
+end:
        eldbus_connection_unref(ga_data->session);
 
 
@@ -109,11 +109,11 @@ Gesture_Adapter *dbus_gesture_adapter_init(void)
        DEBUG("[END]");
        return ga_data;
 
- fail_send:
+fail_send:
        eldbus_message_unref(ga_data->msg);
        free(ga_data);
        return NULL;
- fail_msg:
+fail_msg:
        eldbus_connection_unref(ga_data->session);
        free(ga_data);
        return NULL;
@@ -122,7 +122,7 @@ Gesture_Adapter *dbus_gesture_adapter_init(void)
 void dbus_gesture_adapter_shutdown(Gesture_Adapter *ga_data)
 {
        DEBUG("[START]");
-       if(ga_data == NULL)
+       if (ga_data == NULL)
                return;
 
        if (ga_data->service)
index d632c497d3619285a3a638ecf54b1efc00a1d1b9..db046b74f7012c42b22e1d49a946ac2d65b7bd6b 100644 (file)
@@ -139,38 +139,37 @@ static Eina_Bool _accept_object(AtspiAccessible *obj)
        AtspiRole r = atspi_accessible_get_role(obj, NULL);
 
        switch (r) {
-               case ATSPI_ROLE_APPLICATION:
-               case ATSPI_ROLE_FILLER:
-               case ATSPI_ROLE_SCROLL_PANE:
-               case ATSPI_ROLE_SPLIT_PANE:
-               case ATSPI_ROLE_WINDOW:
-               case ATSPI_ROLE_IMAGE:
-               case ATSPI_ROLE_LIST:
-               case ATSPI_ROLE_ICON:
-               case ATSPI_ROLE_TOOL_BAR:
-               case ATSPI_ROLE_REDUNDANT_OBJECT:
-               case ATSPI_ROLE_COLOR_CHOOSER:
-               case ATSPI_ROLE_PANEL:
-               case ATSPI_ROLE_TREE_TABLE:
-               case ATSPI_ROLE_PAGE_TAB_LIST:
-               case ATSPI_ROLE_PAGE_TAB:
-               case ATSPI_ROLE_SPIN_BUTTON:
-               case ATSPI_ROLE_INPUT_METHOD_WINDOW:
-               case ATSPI_ROLE_EMBEDDED:
-               case ATSPI_ROLE_INVALID:
-               case ATSPI_ROLE_NOTIFICATION:
-                       DEBUG("END - rejected because of role: %d", r);
-                       return EINA_FALSE;
-                       break;
-               default:
-                       break;
+       case ATSPI_ROLE_APPLICATION:
+       case ATSPI_ROLE_FILLER:
+       case ATSPI_ROLE_SCROLL_PANE:
+       case ATSPI_ROLE_SPLIT_PANE:
+       case ATSPI_ROLE_WINDOW:
+       case ATSPI_ROLE_IMAGE:
+       case ATSPI_ROLE_LIST:
+       case ATSPI_ROLE_ICON:
+       case ATSPI_ROLE_TOOL_BAR:
+       case ATSPI_ROLE_REDUNDANT_OBJECT:
+       case ATSPI_ROLE_COLOR_CHOOSER:
+       case ATSPI_ROLE_PANEL:
+       case ATSPI_ROLE_TREE_TABLE:
+       case ATSPI_ROLE_PAGE_TAB_LIST:
+       case ATSPI_ROLE_PAGE_TAB:
+       case ATSPI_ROLE_SPIN_BUTTON:
+       case ATSPI_ROLE_INPUT_METHOD_WINDOW:
+       case ATSPI_ROLE_EMBEDDED:
+       case ATSPI_ROLE_INVALID:
+       case ATSPI_ROLE_NOTIFICATION:
+               DEBUG("END - rejected because of role: %d", r);
+               return EINA_FALSE;
+               break;
+       default:
+               break;
        }
 
        // When given accessibility object is controlled by other object we consider
        // it as not "user-presentable" on and skip it in navigation tree
        AtspiAccessible *relation = _get_object_in_relation(obj, ATSPI_RELATION_CONTROLLED_BY);
-       if (relation)
-       {
+       if (relation) {
                g_object_unref(relation);
                return EINA_FALSE;
        }
@@ -335,26 +334,25 @@ Eina_Bool flat_navi_context_current_at_x_y_set(Flat_Navi_Context *ctx, gint x_co
                        DEBUG("Found object %s, role %s", atspi_accessible_get_name(obj, NULL), atspi_accessible_get_role_name(obj, NULL));
                        Eina_Bool contains_ret = EINA_FALSE;
                        AtspiAccessible *relation_obj = _get_object_in_relation(obj, ATSPI_RELATION_CONTROLLED_BY);
-                       if(relation_obj) {
+                       if (relation_obj) {
                                AtspiComponent *component_relation_obj = atspi_accessible_get_component_iface(relation_obj);
                                contains_ret = atspi_component_contains(component_relation_obj, x_cord, y_cord, ATSPI_COORD_TYPE_WINDOW, NULL);
                                g_object_unref(component_relation_obj);
-                               if(contains_ret) {
+                               if (contains_ret) {
                                        g_clear_object(&obj);
                                        obj = relation_obj;
-                               }
-                               else {
+                               } else {
                                        g_clear_object(&relation_obj);
                                }
                        }
 
                        if (_accept_object(obj) && atspi_accessible_get_role(obj, NULL) != ATSPI_ROLE_PAGE_TAB) {
                                DEBUG("Object  %s with role %s fulfills highlight conditions",
-                                       atspi_accessible_get_name(obj, NULL), atspi_accessible_get_role_name(obj, NULL));
+                                         atspi_accessible_get_name(obj, NULL), atspi_accessible_get_role_name(obj, NULL));
                                if (youngest_ancestor_in_context)
                                        g_object_unref(youngest_ancestor_in_context);
                                youngest_ancestor_in_context = g_object_ref(obj);
-                               if(contains_ret)
+                               if (contains_ret)
                                        look_for_next_descendant = EINA_FALSE;
                        }
                } else {
@@ -370,7 +368,7 @@ Eina_Bool flat_navi_context_current_at_x_y_set(Flat_Navi_Context *ctx, gint x_co
                        update_target = flat_navi_context_current_set(ctx, youngest_ancestor_in_context);
                if (update_target) {
                        DEBUG("Setting highlight to object %s with role %s",
-                               atspi_accessible_get_name(youngest_ancestor_in_context, NULL), atspi_accessible_get_role_name(youngest_ancestor_in_context, NULL));
+                                 atspi_accessible_get_name(youngest_ancestor_in_context, NULL), atspi_accessible_get_role_name(youngest_ancestor_in_context, NULL));
                        *target = youngest_ancestor_in_context;
                        ret = EINA_TRUE;
                }
@@ -398,7 +396,7 @@ static Eina_Bool _has_next_sibling(AtspiAccessible *obj, int next_sibling_idx_mo
        return ret;
 }
 
-AtspiAccessible *_directional_depth_first_search(AtspiAccessible *root, AtspiAccessible *start, int next_sibling_idx_modifier, Eina_Bool(*stop_condition) (AtspiAccessible *))
+AtspiAccessible *_directional_depth_first_search(AtspiAccessible *root, AtspiAccessible *start, int next_sibling_idx_modifier, Eina_Bool(*stop_condition)(AtspiAccessible *))
 {
        Eina_Bool start_is_defunct = EINA_FALSE;
        AtspiStateSet *ss;
@@ -413,8 +411,8 @@ AtspiAccessible *_directional_depth_first_search(AtspiAccessible *root, AtspiAcc
        }
 
        AtspiAccessible *node = (start && !start_is_defunct)
-               ? g_object_ref(start)
-               : (root ? g_object_ref(root) : NULL);
+                                                       ? g_object_ref(start)
+                                                       : (root ? g_object_ref(root) : NULL);
 
        if (!node) {
                DEBUG("END - NULL node!");
@@ -422,8 +420,8 @@ AtspiAccessible *_directional_depth_first_search(AtspiAccessible *root, AtspiAcc
        }
 
        AtspiAccessible *next_related_in_direction = (next_sibling_idx_modifier > 0)
-               ? _get_object_in_relation(node, ATSPI_RELATION_FLOWS_TO)
-               : _get_object_in_relation(node, ATSPI_RELATION_FLOWS_FROM);
+                       ? _get_object_in_relation(node, ATSPI_RELATION_FLOWS_TO)
+                       : _get_object_in_relation(node, ATSPI_RELATION_FLOWS_FROM);
 
        Eina_Bool relation_mode = EINA_FALSE;
        if (next_related_in_direction) {
@@ -431,12 +429,12 @@ AtspiAccessible *_directional_depth_first_search(AtspiAccessible *root, AtspiAcc
                g_object_unref(next_related_in_direction);
        }
 
-       Eina_Bool all_children_visited = (start && next_sibling_idx_modifier < 0)?EINA_TRUE:EINA_FALSE;
+       Eina_Bool all_children_visited = (start && next_sibling_idx_modifier < 0) ? EINA_TRUE : EINA_FALSE;
 
        while (node) {
                AtspiAccessible *prev_related_in_direction = (next_sibling_idx_modifier > 0)
-                       ? _get_object_in_relation(node, ATSPI_RELATION_FLOWS_FROM)
-                       : _get_object_in_relation(node, ATSPI_RELATION_FLOWS_TO);
+                               ? _get_object_in_relation(node, ATSPI_RELATION_FLOWS_FROM)
+                               : _get_object_in_relation(node, ATSPI_RELATION_FLOWS_TO);
 
                int cc = atspi_accessible_get_child_count(node, NULL);
                // do not accept:
@@ -446,27 +444,22 @@ AtspiAccessible *_directional_depth_first_search(AtspiAccessible *root, AtspiAcc
                // 4. If page tab list being returned as not a first object
                // 5. If ctxpopup, hoversel (ATSPI_ROLE_POPUP_MENU) being returned as not a first object
                role = atspi_accessible_get_role(node, NULL);
-               if (node != start && (relation_mode || !prev_related_in_direction) && !(cc > 0 && next_sibling_idx_modifier < 0 && !all_children_visited) && stop_condition(node))
-               {
-                       if (role == ATSPI_ROLE_PAGE_TAB || role == ATSPI_ROLE_POPUP_MENU || role == ATSPI_ROLE_DIALOG)
-                       {
-                               if (start == NULL)
-                               {
+               if (node != start && (relation_mode || !prev_related_in_direction) && !(cc > 0 && next_sibling_idx_modifier < 0 && !all_children_visited) && stop_condition(node)) {
+                       if (role == ATSPI_ROLE_PAGE_TAB || role == ATSPI_ROLE_POPUP_MENU || role == ATSPI_ROLE_DIALOG) {
+                               if (start == NULL) {
                                        DEBUG("next_sibling_idx_modifier == 1 && (role == ATSPI_ROLE_PAGE_TAB || ATSPI_ROLE_POPUP_MENU)");
                                        g_object_unref(prev_related_in_direction);
                                        return node;
                                }
-                       }
-                       else
-                       {
+                       } else {
                                g_object_unref(prev_related_in_direction);
                                return node;
                        }
                }
 
                AtspiAccessible *next_related_in_direction = (next_sibling_idx_modifier > 0)
-                       ? _get_object_in_relation(node, ATSPI_RELATION_FLOWS_TO)
-                       : _get_object_in_relation(node, ATSPI_RELATION_FLOWS_FROM);
+                               ? _get_object_in_relation(node, ATSPI_RELATION_FLOWS_TO)
+                               : _get_object_in_relation(node, ATSPI_RELATION_FLOWS_FROM);
 
                DEBUG("RELATION MODE: %d", relation_mode);
                if (!prev_related_in_direction)
@@ -487,8 +480,7 @@ AtspiAccessible *_directional_depth_first_search(AtspiAccessible *root, AtspiAcc
 
                        ss = atspi_accessible_get_state_set(node);
 
-                       if (cc > 0 && !all_children_visited && atspi_state_set_contains(ss, ATSPI_STATE_SHOWING))                       // walk down
-                       {
+                       if (cc > 0 && !all_children_visited && atspi_state_set_contains(ss, ATSPI_STATE_SHOWING)) {             // walk down
                                int idx = next_sibling_idx_modifier > 0 ? 0 : cc - 1;
                                g_object_unref(node);
                                node = atspi_accessible_get_child_at_index(node, idx, NULL);
@@ -497,8 +489,7 @@ AtspiAccessible *_directional_depth_first_search(AtspiAccessible *root, AtspiAcc
                                all_children_visited = EINA_TRUE;
                                DEBUG("ALL CHILD VISITED (TRUE)");
                                Eina_Bool up_node_found = EINA_FALSE;
-                               while (!_has_next_sibling(node, next_sibling_idx_modifier) || node == root)     // no next sibling
-                               {
+                               while (!_has_next_sibling(node, next_sibling_idx_modifier) || node == root) {   // no next sibling
                                        DEBUG("DFS NO SIBLING");
                                        if (!node || node == root) {
                                                DEBUG("DFS END");
@@ -543,7 +534,7 @@ AtspiAccessible *_last(Flat_Navi_Context *ctx)
        return _directional_depth_first_search(ctx->root, NULL, -1, &_accept_object);
 }
 
-AtspiAccessible *_next(Flat_Navi_Context * ctx, Screen_Reader_Vconf_Data_t *vconf_data)
+AtspiAccessible *_next(Flat_Navi_Context *ctx, Screen_Reader_Vconf_Data_t *vconf_data)
 {
        DEBUG("START");
        AtspiAccessible *root = ctx->root;
@@ -561,7 +552,7 @@ AtspiAccessible *_next(Flat_Navi_Context * ctx, Screen_Reader_Vconf_Data_t *vcon
        return ret;
 }
 
-AtspiAccessible *_prev(Flat_Navi_Context * ctx, Screen_Reader_Vconf_Data_t *vconf_data)
+AtspiAccessible *_prev(Flat_Navi_Context *ctx, Screen_Reader_Vconf_Data_t *vconf_data)
 {
        DEBUG("START\n");
        AtspiAccessible *root = ctx->root;
@@ -586,7 +577,8 @@ Flat_Navi_Context *flat_navi_context_create()
        return ret;
 }
 
-Eina_Bool flat_navi_context_setup(Flat_Navi_Context *ctx, AtspiAccessible *root) {
+Eina_Bool flat_navi_context_setup(Flat_Navi_Context *ctx, AtspiAccessible *root)
+{
        DEBUG("START");
        if (!ctx) {
                DEBUG("END -- no context");
@@ -643,7 +635,7 @@ Eina_Bool flat_navi_context_current_set(Flat_Navi_Context *ctx, AtspiAccessible
        return EINA_TRUE;
 }
 
-AtspiAccessible *flat_navi_context_next(Flat_Navi_Context * ctx, Screen_Reader_Vconf_Data_t *vconf_data)
+AtspiAccessible *flat_navi_context_next(Flat_Navi_Context *ctx, Screen_Reader_Vconf_Data_t *vconf_data)
 {
        if (!ctx || !vconf_data)
                return NULL;
@@ -655,7 +647,7 @@ AtspiAccessible *flat_navi_context_next(Flat_Navi_Context * ctx, Screen_Reader_V
 
 }
 
-AtspiAccessible *flat_navi_context_prev(Flat_Navi_Context * ctx, Screen_Reader_Vconf_Data_t *vconf_data)
+AtspiAccessible *flat_navi_context_prev(Flat_Navi_Context *ctx, Screen_Reader_Vconf_Data_t *vconf_data)
 {
        if (!ctx || !vconf_data)
                return NULL;
@@ -703,7 +695,7 @@ Eina_Bool flat_navi_is_valid(Flat_Navi_Context *context, AtspiAccessible *new_ro
 AtspiAccessible *flat_navi_get_object_in_relation(AtspiAccessible *source, AtspiRelationType search_type)
 {
        AtspiAccessible *ret = NULL;
-       if(!source)
+       if (!source)
                return NULL;
 
        ret = _get_object_in_relation(source, search_type);
index 57a474f69b0992466abc5723fd29113af297d09b..cb7000d5754808eac588e339d19a938e1ee066bf 100644 (file)
@@ -26,8 +26,7 @@
 #include "screen_reader_tts.h"
 #include "window_tracker.h"
 
-struct _Keyboard_Tracker_Data
-{
+struct _Keyboard_Tracker_Data {
        AtspiDeviceListener *listener;
        AtspiDeviceListener *async_listener;
        Eldbus_Connection *conn;
@@ -82,10 +81,10 @@ static void _check_keyboard_state(Screen_Reader_Tts_Data_t *tts_data, Ecore_X_Wi
        }
 
        if (keyboard_state == ECORE_X_VIRTUAL_KEYBOARD_STATE_ON) {
-               tts_speak (_("IDS_VISUAL_KEYBOARD_ENABLED"), EINA_FALSE, tts_data);
+               tts_speak(_("IDS_VISUAL_KEYBOARD_ENABLED"), EINA_FALSE, tts_data);
                last_keyboard_state = keyboard_state;
        } else if (keyboard_state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF) {
-               tts_speak (_("IDS_VISUAL_KEYBOARD_DISABLED"), EINA_FALSE, tts_data);
+               tts_speak(_("IDS_VISUAL_KEYBOARD_DISABLED"), EINA_FALSE, tts_data);
                last_keyboard_state = keyboard_state;
        }
 }
@@ -131,7 +130,7 @@ static Eina_Bool _root_xwindow_property_changed_cb(void *data, int type, void *e
        wp = (Ecore_X_Event_Window_Property *)event;
        Service_Data *sd = get_pointer_to_service_data_struct();
 
-       if(!sd || !sd->keyboard_tracker_data || !sd->tts_data) {
+       if (!sd || !sd->keyboard_tracker_data || !sd->tts_data) {
                ERROR("NULL context");
                return EINA_FALSE;
        }
@@ -179,7 +178,7 @@ static gboolean async_keyboard_cb(const AtspiDeviceEvent *stroke, void *data)
        }
 
        DEBUG("AT-SPI DEVICE EVENT: ID(%d) STRING(%s) TYPE(%d) HW_CODE(%d) MODIFIERS(%d) TIMESTAMP(%d)",
-                       stroke->id, stroke->event_string,stroke->type,stroke->hw_code, stroke->modifiers, stroke->timestamp);
+                 stroke->id, stroke->event_string, stroke->type, stroke->hw_code, stroke->modifiers, stroke->timestamp);
 
        if (!strcmp(stroke->event_string, "XF86Back")) {
                tts_speak(_("MIDS_MH_BODY_BACK_BUTTON_T_TTS"), EINA_TRUE, sd->tts_data);
@@ -211,11 +210,11 @@ static void keyboard_changed_cb(keynode_t *node, void *user_data)
                return;
 
        if (keyboard_state == VCONFKEY_ISF_INPUT_PANEL_STATE_SHOW) {
-               tts_speak (_("IDS_IME_BODY_KEYBOARD_DISPLAYED_T_TTS"), EINA_FALSE, sd->tts_data);
+               tts_speak(_("IDS_IME_BODY_KEYBOARD_DISPLAYED_T_TTS"), EINA_FALSE, sd->tts_data);
                DEBUG("tts_speak Keyboard shown\n");
                ktd->prev_keyboard_state = keyboard_state;
        } else if (keyboard_state == VCONFKEY_ISF_INPUT_PANEL_STATE_HIDE) {
-               tts_speak (_("IDS_ACCS_BODY_KEYBOARD_HIDDEN_TTS"), EINA_FALSE, sd->tts_data);
+               tts_speak(_("IDS_ACCS_BODY_KEYBOARD_HIDDEN_TTS"), EINA_FALSE, sd->tts_data);
                DEBUG("tts_speak keyboard hidden\n");
                ktd->prev_keyboard_state = keyboard_state;
        }
@@ -248,7 +247,7 @@ static void _unset_vconf_key_changed_callback_keyboard_status()
        DEBUG("END");
 }
 
-Keyboard_Tracker_Datakeyboard_tracker_init(void)
+Keyboard_Tracker_Data *keyboard_tracker_init(void)
 {
        DEBUG("[START]");
        Keyboard_Tracker_Data *ktd = calloc(1, sizeof(Keyboard_Tracker_Data));
@@ -357,7 +356,7 @@ Eina_Bool keyboard_event_status(Service_Data *sd, const int x, const int y)
                return EINA_FALSE;
        }
 
-       gcharname = NULL;
+       gchar *name = NULL;
        if (ktd->prev_keyboard_state == VCONFKEY_ISF_INPUT_PANEL_STATE_SHOW) {
                if (window_tracker_top_win_get(wtd))
                        name = atspi_accessible_get_name(window_tracker_top_win_get(wtd), NULL);
index b0e3ed8453a1f4ac664d08dd6e538295ee3894a3..8ce1b2d709782103eacaadf79b585e03e2ae8a2f 100644 (file)
@@ -37,7 +37,7 @@
 #define MAX_STACK_FRAMES 64
 static void *stack_traces[MAX_STACK_FRAMES];
 
-void posix_print_stack_trace(FILE * log_file)
+void posix_print_stack_trace(FILE *log_file)
 {
        int i, trace_size = 0;
        char **messages = (char **)NULL;
@@ -48,8 +48,7 @@ void posix_print_stack_trace(FILE * log_file)
        /* skip the first couple stack frames (as they are this function and
           our handler) and also skip the last frame as it's (always?) junk. */
        // for (i = 3; i < (trace_size - 1); ++i)
-       for (i = 0; i < trace_size; ++i)        // we'll use this for now so you can see what's going on
-       {
+       for (i = 0; i < trace_size; ++i) {      // we'll use this for now so you can see what's going on
                fprintf(log_file, "  BACKTRACE LINE %i: %s\n", i, messages[i]);
        }
        if (messages) {
@@ -57,7 +56,7 @@ void posix_print_stack_trace(FILE * log_file)
        }
 }
 
-void print_warning(int sig, siginfo_t * siginfo, FILE * log_file)
+void print_warning(int sig, siginfo_t *siginfo, FILE *log_file)
 {
        switch (sig) {
        case SIGSEGV:
@@ -139,7 +138,7 @@ void print_warning(int sig, siginfo_t * siginfo, FILE * log_file)
        }
 }
 
-void posix_signal_handler(int sig, siginfo_t * siginfo, void *context)
+void posix_signal_handler(int sig, siginfo_t *siginfo, void *context)
 {
        char file_name[256];
        struct tm *timeinfo;
index 035e7a2aa20fa44513a552b90e8ad1ee8ca4e22e..d8a6f7b07996974adfb55144ecc9f59f2a79114c 100644 (file)
 #define DEBUG_MODE
 
 #define GERROR_CHECK(error)\
-  if (error)\
-   {\
-     ERROR("Error_log:%s",error->message);\
-     g_error_free(error);\
-     error = NULL;\
-   }
+       if (error)\
+       {\
+               ERROR("Error_log:%s",error->message);\
+               g_error_free(error);\
+               error = NULL;\
+       }
 
 static void _highlight_on_slider(Eina_Bool is_slider);
 
@@ -151,16 +151,16 @@ static void _highlight_on_slider(Eina_Bool is_slider)
        }
        eldbus_proxy_call(proxy, "IsSlider", NULL, NULL, -1, "b", is_slider);
 
-       fail_proxy:
-               eldbus_object_unref(dobj);
-       fail_obj:
-               eldbus_connection_unref(conn);
+fail_proxy:
+       eldbus_object_unref(dobj);
+fail_obj:
+       eldbus_connection_unref(conn);
 
        eldbus_shutdown();
 
 }
 
-static void _send_highlighted_object_info(AtspiAccessible * obj)
+static void _send_highlighted_object_info(AtspiAccessible *obj)
 {
        Eldbus_Connection *conn;
        Eldbus_Object *dobj;
@@ -189,10 +189,10 @@ static void _send_highlighted_object_info(AtspiAccessible * obj)
        highlighted_object_y = rect->y + rect->height / 2;
        eldbus_proxy_call(proxy, "HighlightedObjectInfo", NULL, NULL, -1, "ii", highlighted_object_x, highlighted_object_y);
 
-       fail_proxy:
-               eldbus_object_unref(dobj);
-       fail_obj:
-               eldbus_connection_unref(conn);
+fail_proxy:
+       eldbus_object_unref(dobj);
+fail_obj:
+       eldbus_connection_unref(conn);
 
        eldbus_shutdown();
 }
@@ -226,12 +226,10 @@ static char *generate_description_from_relation_object(AtspiAccessible *obj)
        GError *err = NULL;
        char *desc = atspi_accessible_get_description(obj, &err);
 
-       if (err)
-       {
+       if (err) {
                g_error_free(err);
                g_free(desc);
-       }
-       else if (desc) {
+       } else if (desc) {
                if (desc[0] != 0) {
                        char *ret = NULL;
                        if (asprintf(&ret, "%s, %s", desc, trait) < 0)
@@ -250,8 +248,7 @@ static char *generate_name_from_relation_object(AtspiAccessible *obj)
        GError *err = NULL;
        char *name = atspi_accessible_get_name(obj, &err);
 
-       if(err)
-       {
+       if (err) {
                g_error_free(err);
                g_free(name);
                return NULL;
@@ -260,7 +257,7 @@ static char *generate_name_from_relation_object(AtspiAccessible *obj)
        return name;
 }
 
-char *generate_what_to_read(AtspiAccessible * obj, Screen_Reader_Vconf_Data_t *vconf_data)
+char *generate_what_to_read(AtspiAccessible *obj, Screen_Reader_Vconf_Data_t *vconf_data)
 {
        char *name = NULL;
        char *names = NULL;
@@ -287,25 +284,16 @@ char *generate_what_to_read(AtspiAccessible * obj, Screen_Reader_Vconf_Data_t *v
                reading_info = g_hash_table_lookup(hash_table, "reading_info_type");
                style = g_hash_table_lookup(hash_table, "style");
                type = g_hash_table_lookup(hash_table, "type");
-               if (reading_info)
-               {
+               if (reading_info) {
                        list = eina_str_split_full(reading_info, "|", 100, &n);
-                       for (i = 0; i < n; i++)
-                       {
-                               if (!strcmp(list[i], "name"))
-                               {
+                       for (i = 0; i < n; i++) {
+                               if (!strcmp(list[i], "name")) {
                                        attribute = attribute | (ACCESSIBLE_READING_INFO_TYPE_NAME);
-                               }
-                               else if (!strcmp(list[i], "role"))
-                               {
+                               } else if (!strcmp(list[i], "role")) {
                                        attribute = attribute | (ACCESSIBLE_READING_INFO_TYPE_ROLE);
-                               }
-                               else if (!strcmp(list[i], "description"))
-                               {
+                               } else if (!strcmp(list[i], "description")) {
                                        attribute = attribute | (ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION);
-                               }
-                               else if (!strcmp(list[i], "state"))
-                               {
+                               } else if (!strcmp(list[i], "state")) {
                                        attribute = attribute | (ACCESSIBLE_READING_INFO_TYPE_STATE);
                                }
                        }
@@ -313,9 +301,9 @@ char *generate_what_to_read(AtspiAccessible * obj, Screen_Reader_Vconf_Data_t *v
        }
        if (!hash_table || !reading_info) {
                attribute = attribute | (ACCESSIBLE_READING_INFO_TYPE_NAME) |
-                               (ACCESSIBLE_READING_INFO_TYPE_ROLE) |
-                               (ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION) |
-                               (ACCESSIBLE_READING_INFO_TYPE_STATE);
+                                       (ACCESSIBLE_READING_INFO_TYPE_ROLE) |
+                                       (ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION) |
+                                       (ACCESSIBLE_READING_INFO_TYPE_STATE);
        }
        if (reading_info) g_free(reading_info);
        if (type) g_free(type);
@@ -324,7 +312,7 @@ char *generate_what_to_read(AtspiAccessible * obj, Screen_Reader_Vconf_Data_t *v
        if (attribute & ACCESSIBLE_READING_INFO_TYPE_NAME) {
                name = atspi_accessible_get_name(obj, NULL);
                name_from_relation = generate_text_for_relation_objects(obj,
-                               ATSPI_RELATION_LABELLED_BY, generate_name_from_relation_object);
+                                                        ATSPI_RELATION_LABELLED_BY, generate_name_from_relation_object);
                AtspiText *iface_text = atspi_accessible_get_text_iface(obj);
                if (iface_text) {
                        text = atspi_text_get_text(iface_text, 0, atspi_text_get_character_count(iface_text, NULL), NULL);
@@ -342,7 +330,7 @@ char *generate_what_to_read(AtspiAccessible * obj, Screen_Reader_Vconf_Data_t *v
                        strncat(ret, names, sizeof(ret) - strlen(ret) - 1);
                }
                if (name_from_relation && strlen(name_from_relation) > 0) {
-                       if(strlen(ret) > 0)
+                       if (strlen(ret) > 0)
                                strncat(ret, ", ", sizeof(ret) - strlen(ret) - 1);
                        strncat(ret, name_from_relation, sizeof(ret) - strlen(ret) - 1);
                }
@@ -366,7 +354,7 @@ char *generate_what_to_read(AtspiAccessible * obj, Screen_Reader_Vconf_Data_t *v
                description_from_role = generate_description_trait(obj);
                description = atspi_accessible_get_description(obj, NULL);
                description_from_relation = generate_text_for_relation_objects(obj, ATSPI_RELATION_DESCRIBED_BY,
-                       generate_description_from_relation_object);
+                                                                       generate_description_from_relation_object);
 
                bool read_description = get_read_description(vconf_data);
                DEBUG("Description:%s VALUE %d", description, read_description);
@@ -453,7 +441,7 @@ static Eina_Bool _highlight_access_object(AtspiAccessible *obj, Highlight_Type h
        return widget_do_action(obj, expected_action);
 }
 
-static void _current_highlight_object_set(Navigator_Data *nd, Screen_Reader_Vconf_Data_t *vconf_data, Haptic_Data *haptic_data, Screen_Reader_Tts_Data_t *tts_data, AtspiAccessible * obj, Highlight_Type h_type)
+static void _current_highlight_object_set(Navigator_Data *nd, Screen_Reader_Vconf_Data_t *vconf_data, Haptic_Data *haptic_data, Screen_Reader_Tts_Data_t *tts_data, AtspiAccessible *obj, Highlight_Type h_type)
 {
        DEBUG("START");
 
@@ -497,8 +485,7 @@ static void _current_highlight_object_set(Navigator_Data *nd, Screen_Reader_Vcon
                        if (action) {
                                DEBUG("HIGHLIGHT_NOTIFICATION_EVENT_ACTIONABLE");
                                smart_notification(HIGHLIGHT_NOTIFICATION_EVENT_ACTIONABLE, 0, 0);
-                       }
-                       else {
+                       } else {
                                DEBUG("HIGHLIGHT_NOTIFICATION_EVENT");
                                smart_notification(HIGHLIGHT_NOTIFICATION_EVENT, 0, 0);
                        }
@@ -602,8 +589,7 @@ static void _focus_next_visible(Service_Data *sd)
                        visible = atspi_state_set_contains(ss, ATSPI_STATE_SHOWING);
                        g_object_unref(ss);
                }
-       }
-       while (obj && !visible);
+       } while (obj && !visible);
 
        if (obj)
                _current_highlight_object_set(nd, vconf_data, haptic_data, tts_data, obj, HIGHLIGHT_FIRST);
@@ -639,8 +625,7 @@ static void _focus_prev_visible(Service_Data *sd)
                        visible = atspi_state_set_contains(ss, ATSPI_STATE_SHOWING);
                        g_object_unref(ss);
                }
-       }
-       while (obj && !visible);
+       } while (obj && !visible);
 
        if (obj)
                _current_highlight_object_set(nd, vconf_data, haptic_data, tts_data, obj, HIGHLIGHT_LAST);
@@ -674,20 +659,20 @@ static void _caret_move_beg(Navigator_Data *nd, Screen_Reader_Tts_Data_t *tts_da
                return;
 
        AtspiAccessible *relation = flat_navi_get_object_in_relation(nd->current_obj, ATSPI_RELATION_CONTROLLER_FOR);
-       if(relation)
+       if (relation)
                current_widget = relation;
        else
                current_widget = nd->current_obj;
 
        text_interface = atspi_accessible_get_text_iface(current_widget);
 
-       if(relation)
+       if (relation)
                g_object_unref(relation);
 
        if (text_interface) {
                ret = atspi_text_set_caret_offset(text_interface, 0, &err);
                GERROR_CHECK(err)
-                       if (ret) {
+               if (ret) {
                        DEBUG("Caret position increment done");
                        gchar *text = atspi_text_get_text(text_interface, 0, 1, NULL);
                        DEBUG("SPEAK:%s", text);
@@ -712,14 +697,14 @@ static void _caret_move_end(Navigator_Data *nd, Screen_Reader_Tts_Data_t *tts_da
                return;
 
        AtspiAccessible *relation = flat_navi_get_object_in_relation(nd->current_obj, ATSPI_RELATION_CONTROLLER_FOR);
-       if(relation)
+       if (relation)
                current_widget = relation;
        else
                current_widget = nd->current_obj;
 
        text_interface = atspi_accessible_get_text_iface(current_widget);
 
-       if(relation)
+       if (relation)
                g_object_unref(relation);
 
        if (text_interface) {
@@ -742,7 +727,7 @@ static void _caret_move_forward(Navigator_Data *nd, Screen_Reader_Tts_Data_t *tt
        AtspiAccessible *current_widget = relation ? relation : nd->current_obj;
        AtspiText *text_interface = atspi_accessible_get_text_iface(current_widget);
 
-       if(relation)
+       if (relation)
                g_object_unref(relation);
 
        if (text_interface) {
@@ -781,7 +766,7 @@ static void _caret_move_backward(Navigator_Data *nd, Screen_Reader_Tts_Data_t *t
        AtspiAccessible *relation = flat_navi_get_object_in_relation(nd->current_obj, ATSPI_RELATION_CONTROLLER_FOR);
        AtspiAccessible *current_widget = relation ? relation : nd->current_obj;
        AtspiText *text_interface = atspi_accessible_get_text_iface(current_widget);
-       if(relation)
+       if (relation)
                g_object_unref(relation);
 
        if (text_interface) {
@@ -798,12 +783,10 @@ static void _caret_move_backward(Navigator_Data *nd, Screen_Reader_Tts_Data_t *t
                        DEBUG("SPEAK:%s", text);
                        tts_speak_customized(text, EINA_TRUE, EINA_TRUE, nd->current_obj, tts_data);
                        g_free(text);
-               }
-                else
+               } else
                        ERROR("Caret position decrement error");
                g_object_unref(text_interface);
-       }
-       else
+       } else
                ERROR("No text interface supported!");
        return;
 }
@@ -817,7 +800,7 @@ static void _value_inc(Navigator_Data *nd)
                return;
 
        AtspiAccessible *relation = flat_navi_get_object_in_relation(nd->current_obj, ATSPI_RELATION_CONTROLLER_FOR);
-       if(relation)
+       if (relation)
                current_widget = relation;
        else
                current_widget = nd->current_obj;
@@ -831,11 +814,11 @@ static void _value_inc(Navigator_Data *nd)
                DEBUG("Value interface supported!\n");
                gdouble current_val = atspi_value_get_current_value(value_interface, &err);
                GERROR_CHECK(err)
-                       DEBUG("Current value: %f\n ", (double)current_val);
+               DEBUG("Current value: %f\n ", (double)current_val);
                gdouble minimum_inc = atspi_value_get_minimum_increment(value_interface, &err);
                DEBUG("Minimum increment: %f\n ", (double)minimum_inc);
                GERROR_CHECK(err)
-                       atspi_value_set_current_value(value_interface, current_val + minimum_inc, &err);
+               atspi_value_set_current_value(value_interface, current_val + minimum_inc, &err);
                g_object_unref(value_interface);
                return;
        }
@@ -851,24 +834,24 @@ static void _value_dec(Navigator_Data *nd)
                return;
 
        AtspiAccessible *relation = flat_navi_get_object_in_relation(nd->current_obj, ATSPI_RELATION_CONTROLLER_FOR);
-       if(relation)
+       if (relation)
                current_widget = relation;
        else
                current_widget = nd->current_obj;
 
        AtspiValue *value_interface = atspi_accessible_get_value_iface(current_widget);
 
-       if(relation)
+       if (relation)
                g_object_unref(relation);
 
        if (value_interface) {
                DEBUG("Value interface supported!\n");
                gdouble current_val = atspi_value_get_current_value(value_interface, &err);
                GERROR_CHECK(err)
-                       DEBUG("Current value: %f\n ", (double)current_val);
+               DEBUG("Current value: %f\n ", (double)current_val);
                gdouble minimum_inc = atspi_value_get_minimum_increment(value_interface, &err);
                GERROR_CHECK(err)
-                       DEBUG("Minimum increment: %f\n ", (double)minimum_inc);
+               DEBUG("Minimum increment: %f\n ", (double)minimum_inc);
                atspi_value_set_current_value(value_interface, current_val - minimum_inc, &err);
                g_object_unref(value_interface);
                return;
@@ -895,7 +878,7 @@ static void _activate_widget(Navigator_Data *nd, Screen_Reader_Vconf_Data_t *vco
        AtspiAccessible *current_widget = relation ? relation : nd->current_obj;
        AtspiRole role = atspi_accessible_get_role(current_widget, NULL);
        if (role == ATSPI_ROLE_SLIDER) {
-               if(relation)
+               if (relation)
                        g_object_unref(relation);
                return;
        }
@@ -924,7 +907,7 @@ static void _activate_widget(Navigator_Data *nd, Screen_Reader_Vconf_Data_t *vco
                        g_object_unref(focus_component);
                }
                g_object_unref(edit);
-               if(relation)
+               if (relation)
                        g_object_unref(relation);
                return;
        }
@@ -938,17 +921,15 @@ static void _activate_widget(Navigator_Data *nd, Screen_Reader_Vconf_Data_t *vco
                                gint index = atspi_accessible_get_index_in_parent(current_widget, NULL);
                                AtspiSelection *selection = atspi_accessible_get_selection_iface(parent);
                                if (selection) {
-                                       if(atspi_state_set_contains(ss, ATSPI_STATE_SELECTED)) {
-                                               if(!(role == ATSPI_ROLE_LIST_ITEM || role == ATSPI_ROLE_MENU_ITEM))
-                                                       atspi_selection_deselect_child (selection, index, NULL);
-                                               }
-                                       else {
+                                       if (atspi_state_set_contains(ss, ATSPI_STATE_SELECTED)) {
+                                               if (!(role == ATSPI_ROLE_LIST_ITEM || role == ATSPI_ROLE_MENU_ITEM))
+                                                       atspi_selection_deselect_child(selection, index, NULL);
+                                       } else {
                                                DEBUG("SELECT CHILD NO:%d\n", index);
                                                atspi_selection_select_child(selection, index, NULL);
                                        }
                                        g_object_unref(selection);
-                               }
-                               else
+                               } else
                                        ERROR("no selection iterface in parent");
 
                                g_object_unref(parent);
@@ -956,7 +937,7 @@ static void _activate_widget(Navigator_Data *nd, Screen_Reader_Vconf_Data_t *vco
                }
                g_object_unref(ss);
        }
-       if(relation)
+       if (relation)
                g_object_unref(relation);
 }
 
@@ -1158,7 +1139,7 @@ void _widget_scroll(Service_Data *sd, Gesture_Info *gi)
        }
 
        if (!atspi_state_set_contains(ss, ATSPI_STATE_SHOWING)) {
-               DEBUG("current context do not have visible state, swith to next/prev %d %d", gi->x_end,gi->y_end);
+               DEBUG("current context do not have visible state, swith to next/prev %d %d", gi->x_end, gi->y_end);
                int x_diff = (gi->x_end - nd->gesture_start_p.x);
                int y_diff = (gi->y_end - nd->gesture_start_p.y);
                DEBUG("%d %d", y_diff, x_diff);
@@ -1166,18 +1147,15 @@ void _widget_scroll(Service_Data *sd, Gesture_Info *gi)
                        if (y_diff > 0) {
                                DEBUG("PREVIOUS");
                                _focus_prev_visible(sd);
-                       }
-                       else {
+                       } else {
                                DEBUG("NEXT");
                                _focus_next_visible(sd);
                        }
-               }
-               else {
+               } else {
                        if (x_diff > 0) {
                                DEBUG("PREVIOUS");
                                _focus_prev_visible(sd);
-                       }
-                       else {
+                       } else {
                                DEBUG("NEXT");
                                _focus_next_visible(sd);
                        }
@@ -1483,7 +1461,7 @@ static Eina_Bool _has_value(Navigator_Data *nd)
                return EINA_FALSE;
 
        AtspiAccessible *relation = flat_navi_get_object_in_relation(nd->current_obj, ATSPI_RELATION_CONTROLLER_FOR);
-       if(relation)
+       if (relation)
                obj = relation;
        else
                obj = nd->current_obj;
@@ -1493,7 +1471,7 @@ static Eina_Bool _has_value(Navigator_Data *nd)
 
        AtspiValue *value = atspi_accessible_get_value_iface(obj);
 
-       if(relation)
+       if (relation)
                g_object_unref(relation);
 
        if (value) {
@@ -1511,14 +1489,11 @@ static Eina_Bool _is_enabled(Navigator_Data *nd)
        }
 
        AtspiAccessible *relation = flat_navi_get_object_in_relation(nd->current_obj, ATSPI_RELATION_CONTROLLER_FOR);
-       if(relation)
-       {
+       if (relation) {
                Eina_Bool ret = widget_has_state(relation, ATSPI_STATE_ENABLED);
                g_object_unref(relation);
                return ret;
-       }
-       else
-       {
+       } else {
                return widget_has_state(nd->current_obj, ATSPI_STATE_ENABLED);
        }
 }
@@ -1539,7 +1514,7 @@ static Eina_Bool _is_active_entry(Flat_Navi_Context *context)
                return EINA_FALSE;
 
        AtspiAccessible *relation = flat_navi_get_object_in_relation(obj, ATSPI_RELATION_CONTROLLER_FOR);
-       if(relation)
+       if (relation)
                obj = relation;
 
        role = atspi_accessible_get_role(obj, NULL);
@@ -1547,17 +1522,17 @@ static Eina_Bool _is_active_entry(Flat_Navi_Context *context)
                AtspiStateSet *state_set = atspi_accessible_get_state_set(obj);
                if (atspi_state_set_contains(state_set, ATSPI_STATE_FOCUSED)) {
                        g_object_unref(state_set);
-                       if(relation)
+                       if (relation)
                                g_object_unref(relation);
                        return EINA_TRUE;
                }
-               if(relation)
+               if (relation)
                        g_object_unref(relation);
                g_object_unref(state_set);
                return EINA_FALSE;
        }
 
-       if(relation)
+       if (relation)
                g_object_unref(relation);
 
        DEBUG("END");
@@ -1627,13 +1602,13 @@ static void _move_slider(Navigator_Data *nd, Screen_Reader_Vconf_Data_t *vconf_d
        }
 
        AtspiAccessible *relation = flat_navi_get_object_in_relation(obj, ATSPI_RELATION_CONTROLLER_FOR);
-       if(relation)
+       if (relation)
                obj = relation;
 
        if (!_is_slider(obj)) {
                DEBUG("Object is not a slider");
                nd->prepared = false;
-               if(relation)
+               if (relation)
                        g_object_unref(relation);
                return;
        }
@@ -1641,7 +1616,7 @@ static void _move_slider(Navigator_Data *nd, Screen_Reader_Vconf_Data_t *vconf_d
        if (!widget_has_state(obj, ATSPI_STATE_ENABLED)) {
                DEBUG("Slider is disabled");
                nd->prepared = false;
-               if(relation)
+               if (relation)
                        g_object_unref(relation);
                return;
        }
@@ -1654,15 +1629,15 @@ static void _move_slider(Navigator_Data *nd, Screen_Reader_Vconf_Data_t *vconf_d
                if (!comp) {
                        ERROR("that slider do not have component interface");
                        nd->prepared = false;
-                       if(relation)
+                       if (relation)
                                g_object_unref(relation);
                        return;
                }
 
 #ifdef DEBUG_DEBUGS_WANTED
-                       AtspiRect *rect = atspi_component_get_extents(comp, ATSPI_COORD_TYPE_SCREEN, NULL);
-                       DEBUG("Current object is in:%d %d", rect->x, rect->y);
-                       DEBUG("Current object has size:%d %d", rect->width, rect->height);
+               AtspiRect *rect = atspi_component_get_extents(comp, ATSPI_COORD_TYPE_SCREEN, NULL);
+               DEBUG("Current object is in:%d %d", rect->x, rect->y);
+               DEBUG("Current object has size:%d %d", rect->width, rect->height);
 #endif
        }
 
@@ -1691,7 +1666,7 @@ static void _move_slider(Navigator_Data *nd, Screen_Reader_Vconf_Data_t *vconf_d
                nd->last_pos.y = -1;
        }
 
-       if(relation)
+       if (relation)
                g_object_unref(relation);
 
        DEBUG("END");
@@ -1781,7 +1756,7 @@ static Eina_Bool _check_access_object_internal(Flat_Navi_Context *context, Highl
 
 static void on_gesture_detected(void *data, const Eldbus_Message *msg)
 {
-       Service_Data *sd = (Service_Data *)data;
+       Service_Data *sd = (Service_Data *)data;
 
        if (sd == NULL) {
                ERROR("NULL context service_data");
@@ -1833,15 +1808,15 @@ static void on_gesture_detected(void *data, const Eldbus_Message *msg)
        Gesture_Info *info = calloc(sizeof(Gesture_Info), 1);
        int g_type;
        if (!eldbus_message_arguments_get(msg, "iiiiiiu", &g_type, &info->x_beg,
-                                       &info->y_beg, &info->x_end, &info->y_end,
-                                       &info->state, &info->event_time)) {
+                                                                         &info->y_beg, &info->x_end, &info->y_end,
+                                                                         &info->state, &info->event_time)) {
                DEBUG("Getting message arguments failed");
                free(info);
                return;
        }
        info->type = (Gesture)g_type;
        DEBUG("Incoming gesture name is %s : %d %d %d %d %d", _gesture_enum_to_string(info->type),
-             info->x_beg, info->y_beg, info->x_end, info->y_end, info->state);
+                 info->x_beg, info->y_beg, info->x_end, info->y_end, info->state);
 
        _on_auto_review_stop(nd);
 
@@ -1853,15 +1828,12 @@ static void on_gesture_detected(void *data, const Eldbus_Message *msg)
                        smart_notification(LONG_PRESS_NOTIFICATION_EVENT, 0, 0);
 
                AtspiAccessible *relation = flat_navi_get_object_in_relation(nd->current_obj, ATSPI_RELATION_CONTROLLER_FOR);
-               if(relation)
-               {
+               if (relation) {
                        if (_is_slider(relation))
                                _highlight_on_slider(EINA_TRUE);
                        _send_highlighted_object_info(relation);
                        g_object_unref(relation);
-               }
-               else
-               {
+               } else {
                        if (_is_slider(nd->current_obj))
                                _highlight_on_slider(EINA_TRUE);
                        _send_highlighted_object_info(nd->current_obj);
@@ -1876,8 +1848,8 @@ static void on_gesture_detected(void *data, const Eldbus_Message *msg)
                } else {
                        if (nd->last_hover_event_time < 0)
                                nd->last_hover_event_time = info->event_time;
-               //info->event_time and last_hover_event_time contain timestamp in ms.
-               //RETURN so we do not handle all incoming event
+                       //info->event_time and last_hover_event_time contain timestamp in ms.
+                       //RETURN so we do not handle all incoming event
                        if ((info->event_time - nd->last_hover_event_time) < ONGOING_HOVER_GESTURE_INTERPRETATION_INTERVAL && info->state == 1)
                                return;
                        nd->last_hover_event_time = info->state != 1 ? -1 : info->event_time;
@@ -1889,11 +1861,10 @@ static void on_gesture_detected(void *data, const Eldbus_Message *msg)
                        }
 #else
                        keyboard_status = keyboard_event_status(sd, info->x_end, info->y_end);
-                       if (keyboard_status)
-                               {
-                                       keyboard_signal_emit(sd->keyboard_tracker_data, info->type, info->x_end, info->y_end);
-                                       break;
-                               }
+                       if (keyboard_status) {
+                               keyboard_signal_emit(sd->keyboard_tracker_data, info->type, info->x_end, info->y_end);
+                               break;
+                       }
 #endif
                        _focus_widget(nd, vconf_data, haptic_data, tts_data, context, info);
                }
@@ -1940,11 +1911,10 @@ static void on_gesture_detected(void *data, const Eldbus_Message *msg)
                }
 #else
                keyboard_status = keyboard_event_status(sd, info->x_end, info->y_end);
-               if (keyboard_status)
-                       {
-                               keyboard_signal_emit(sd->keyboard_tracker_data, info->type, info->x_end, info->y_end);
-                               break;
-                       }
+               if (keyboard_status) {
+                       keyboard_signal_emit(sd->keyboard_tracker_data, info->type, info->x_end, info->y_end);
+                       break;
+               }
 #endif
                if (!nd->prepared)
                        _focus_widget(nd, vconf_data, haptic_data, tts_data, context, info);
@@ -1958,11 +1928,10 @@ static void on_gesture_detected(void *data, const Eldbus_Message *msg)
                }
 #else
                keyboard_status = keyboard_event_status(sd, info->x_end, info->y_end);
-               if (keyboard_status)
-                       {
-                               keyboard_signal_emit(sd->keyboard_tracker_data, info->type, info->x_end, info->y_end);
-                               break;
-                       }
+               if (keyboard_status) {
+                       keyboard_signal_emit(sd->keyboard_tracker_data, info->type, info->x_end, info->y_end);
+                       break;
+               }
 #endif
                _activate_widget(nd, vconf_data, tts_data);
                break;
@@ -2017,7 +1986,7 @@ static void on_gesture_detected(void *data, const Eldbus_Message *msg)
 
 static void _view_content_changed(AtspiAccessible *root, void *user_data)
 {
-       Service_Data *sd = (Service_Data*)user_data;
+       Service_Data *sd = (Service_Data *)user_data;
        if (sd == NULL) {
                ERROR("NULL context service_data");
                return;
@@ -2065,8 +2034,7 @@ static void _view_content_changed(AtspiAccessible *root, void *user_data)
                return;
        }
 
-       switch(atspi_accessible_get_role(root, NULL))
-       {
+       switch (atspi_accessible_get_role(root, NULL)) {
        case ATSPI_ROLE_POPUP_MENU:
        case ATSPI_ROLE_DIALOG:
                _current_highlight_object_set(nd, vconf_data, haptic_data, tts_data, flat_navi_context_current_get(sd->flat_navi_context), HIGHLIGHT_FIRST);
@@ -2097,8 +2065,8 @@ static void _new_highlighted_obj_changed(AtspiAccessible *new_highlighted_obj, v
        }
 
        DEBUG("context: %p, current: %s, new_highlighted_obj: %s", context,
-                       get_debug_object_info(flat_navi_context_current_get(context)),
-                       get_debug_object_info(new_highlighted_obj));
+                 get_debug_object_info(flat_navi_context_current_get(context)),
+                 get_debug_object_info(new_highlighted_obj));
 
        if (context && flat_navi_context_current_get(context) != new_highlighted_obj) {
                flat_navi_context_current_set(context, g_object_ref(new_highlighted_obj));
@@ -2126,7 +2094,7 @@ static AtspiAccessible *_default_label_object_get(AtspiAccessible *root)
                atspi_state_set_add(states, ATSPI_STATE_SHOWING);
                atspi_state_set_add(states, ATSPI_STATE_VISIBLE);
                DEBUG("GET DEFAULT LABEL OBJECT: STATE SET PREPARED");
-               GArray *roles = g_array_new(FALSE, FALSE, sizeof (AtspiRole));
+               GArray *roles = g_array_new(FALSE, FALSE, sizeof(AtspiRole));
                if (roles) {
                        DEBUG("GET DEFAULT LABEL OBJECT: GOT ROLES");
                        AtspiRole role = ATSPI_ROLE_PAGE_TAB;
@@ -2134,14 +2102,14 @@ static AtspiAccessible *_default_label_object_get(AtspiAccessible *root)
                        role = ATSPI_ROLE_PAGE_TAB_LIST;
                        g_array_append_val(roles, role);
                        AtspiMatchRule *rule = atspi_match_rule_new(states,
-                                                           ATSPI_Collection_MATCH_ALL,
-                                                                       NULL, // do not match attributes
-                                                                       ATSPI_Collection_MATCH_INVALID,
-                                                                       roles, // do not match roles
-                                                                       ATSPI_Collection_MATCH_ANY,
-                                                                       NULL, // do not match interfaces
-                                                                       ATSPI_Collection_MATCH_INVALID,
-                                                                       FALSE); // make positive match
+                                                                  ATSPI_Collection_MATCH_ALL,
+                                                                  NULL, // do not match attributes
+                                                                  ATSPI_Collection_MATCH_INVALID,
+                                                                  roles, // do not match roles
+                                                                  ATSPI_Collection_MATCH_ANY,
+                                                                  NULL, // do not match interfaces
+                                                                  ATSPI_Collection_MATCH_INVALID,
+                                                                  FALSE); // make positive match
                        if (rule) {
                                DEBUG("GET DEFAULT LABEL OBJECT: MATCHING RULE PREPARED");
 
@@ -2150,11 +2118,11 @@ static AtspiAccessible *_default_label_object_get(AtspiAccessible *root)
                                if (col_iface) {
                                        DEBUG("GET DEFAULT LABEL OBJECT: GOT INTERFACE");
                                        GArray *result = atspi_collection_get_matches(col_iface,
-                                                                                                       rule,
-                                                                                                       ATSPI_Collection_SORT_ORDER_CANONICAL,
-                                                                                                       1, // the number of results to return
-                                                                                                       TRUE, // not supported by AT-SPI2 API
-                                                                                                       &err);
+                                                                        rule,
+                                                                        ATSPI_Collection_SORT_ORDER_CANONICAL,
+                                                                        1, // the number of results to return
+                                                                        TRUE, // not supported by AT-SPI2 API
+                                                                        &err);
                                        GERROR_CHECK(err);
                                        if (result) {
                                                DEBUG("GET DEFAULT LABEL OBJECT: QUERY PERFORMED");
@@ -2276,9 +2244,15 @@ Navigator_Data *navigator_init(Service_Data *sd)
                return NULL;
        }
 
-       nd->gesture_start_p = (point_t) { .x = -1, .y = -1};
-       nd->last_focus = (point_t) { .x = -1, .y = -1};
-       nd->last_pos = (point_t) { .x = -1, .y = -1};
+       nd->gesture_start_p = (point_t) {
+               .x = -1, .y = -1
+       };
+       nd->last_focus = (point_t) {
+               .x = -1, .y = -1
+       };
+       nd->last_pos = (point_t) {
+               .x = -1, .y = -1
+       };
        nd->last_hover_event_time = -1;
        nd->focused_object = NULL;
        nd->auto_review_on = false;
@@ -2294,7 +2268,7 @@ Navigator_Data *navigator_init(Service_Data *sd)
        app_tracker_new_obj_highlighted_callback_register(_new_highlighted_obj_changed, sd->app_tracker_ctx);
        sd->gesture_adapter_data = dbus_gesture_adapter_init();
        sd->smart_notification_data = smart_notification_init();
-       if (sd->smart_notification_data == NULL){
+       if (sd->smart_notification_data == NULL) {
                ERROR("Smart Notification not initialized");
                return NULL;
        }
index 4828a953c47e9b5c780f2844b72d9ed73459852a..f461d988eba88baf0d4204e7ea3ef3311ba89ea8 100644 (file)
@@ -66,7 +66,7 @@ int screen_reader_create_service(void *data)
 
 #ifndef SCREEN_READER_TV
        char buf[SCREEN_READER_STATUS_TXT_SIZE] = "";
-       snprintf(buf, SCREEN_READER_STATUS_TXT_SIZE, "%s %s",_("IDS_ST_MBODY_SCREEN_READER_HTTS"), _("IDS_MSG_BODY_ON_T_TTS"));
+       snprintf(buf, SCREEN_READER_STATUS_TXT_SIZE, "%s %s", _("IDS_ST_MBODY_SCREEN_READER_HTTS"), _("IDS_MSG_BODY_ON_T_TTS"));
        tts_speak_customized(buf, EINA_TRUE, EINA_FALSE, NULL, service_data->tts_data);
 #endif
 
index 64114f48e41d2294a54119102de91edae0950e91..d56b4f857147d6fd618f37e0c75b145f45158d36 100644 (file)
@@ -34,18 +34,18 @@ struct _screen_reader_gestures_data {
        static GestureCB _global_cb;
        static void *_global_data;
 
-       #ifdef X11_ENABLED
+#ifdef X11_ENABLED
        static Ecore_X_Window win;
-       #else
+#else
        static Ecore_Wl_Window *win;
-       #endif
+#endif
 
        static Ecore_Event_Handler *property_changed_hld;
 
-       #ifdef X11_ENABLED
+#ifdef X11_ENABLED
        static Ecore_X_Window scrolled_win;
        static int rx, ry;
-       #endif
+#endif
        static Eina_List *handlers;
        static Cover *cov;
        static int win_angle;
@@ -184,7 +184,7 @@ static void _event_emit(Gesture g, int x, int y, int x_e, int y_e, int state, in
        EINA_SAFETY_ON_NULL_RETURN(info);
 
        Screen_Reader_Gestures_Data *gestures_ctx = calloc(1, sizeof(Screen_Reader_Gestures_Data));
-       if(gestures_ctx == NULL)
+       if (gestures_ctx == NULL)
                ERROR("NULL context parameter");
 
        __transform_coordinates(&x, &y, gestures_ctx);
@@ -228,7 +228,7 @@ static void _get_root_coords(Ecore_X_Window win, int *x, int *y)
 
 Ecore_X_Window top_window_get(int x, int y, Screen_Reader_Gestures_Data *gestures_ctx)
 {
-       ifgestures_ctx == NULL) {
+       if (gestures_ctx == NULL) {
                ERROR("NULL context parameter");
                return NULL;
        }
@@ -271,7 +271,7 @@ static unsigned int _win_angle_get(void)
 
 static void _tap_event_emit(Screen_Reader_Gestures_Data *gestures_ctx, int state)
 {
-       ifgestures_ctx == NULL)
+       if (gestures_ctx == NULL)
                ERROR("NULL context parameter");
 
        switch (gestures_ctx->cov->tap_gesture_data.n_taps) {
@@ -378,7 +378,7 @@ static int _tap_gesture_finger_check(Screen_Reader_Gestures_Data *gestures_ctx,
        return -1;
 }
 
-static void _tap_gestures_mouse_down(Ecore_Event_Mouse_Button * ev, Screen_Reader_Gestures_Data *gestures_ctx)
+static void _tap_gestures_mouse_down(Ecore_Event_Mouse_Button *ev, Screen_Reader_Gestures_Data *gestures_ctx)
 {
        if (gestures_ctx == NULL) {
                ERROR("NULL context parameter");
@@ -453,7 +453,7 @@ static Eina_Bool _win_property_changed(void *data, int type, void *event)
        Ecore_X_Event_Window_Property *wp = event;
 
        Screen_Reader_Gestures_Data *gestures_ctx = (Screen_Reader_Gestures_Data *)data;
-       if(gestures_ctx==NULL) {
+       if (gestures_ctx == NULL) {
                ERROR("NULL context parameter");
                return EINA_FALSE;
        }
index fd8f8cbdccf78ce589372e76e51cb12282b7383d..34ba23e44450b028234331c980f2aa720bff71d6 100644 (file)
@@ -54,11 +54,11 @@ Eina_Bool screen_reader_switch_enabled_set(Eina_Bool value)
        eldbus_proxy_send(proxy, req, NULL, NULL, -1.0);
        ret = EINA_TRUE;
 
- fail_msg:
+fail_msg:
        eldbus_message_unref(req);
- fail_proxy:
+fail_proxy:
        eldbus_object_unref(dobj);
- fail_obj:
+fail_obj:
        eldbus_connection_unref(conn);
 
        eldbus_shutdown();
index c2536af6e5554c21ae2ee59b52d4c6c727c8e4bd..9aebef2a2e72bdaafb225df66e52c27da917dde4 100644 (file)
@@ -350,7 +350,7 @@ void device_battery_get(Service_Data *service_data)
                        free(buffer);
                        ERROR("Buffer length == 0");
                        return;
-               } else if(ret < 0) {
+               } else if (ret < 0) {
                        ERROR("Buffer == NULL");
                        return;
                }
@@ -585,8 +585,7 @@ void device_missed_events_get(Service_Data *service_data)
                                noti_count += current_noti_count;
                        else
                                noti_count++;
-               }
-               else
+               } else
                        noti_count++;
                elem = notification_list_get_next(elem);
        }
@@ -672,7 +671,7 @@ void device_date_get(Service_Data *service_data)
        tts_speak(buffer, EINA_FALSE, tts_data);
 }
 
-static bool bonded_device_count_cb(bt_device_info_s * device_info, void *user_data)
+static bool bonded_device_count_cb(bt_device_info_s *device_info, void *user_data)
 {
        int *device_count = (int *)user_data;
 
@@ -681,7 +680,7 @@ static bool bonded_device_count_cb(bt_device_info_s * device_info, void *user_da
        return true;
 }
 
-static bool bonded_device_get_cb(bt_device_info_s * device_info, void *user_data)
+static bool bonded_device_get_cb(bt_device_info_s *device_info, void *user_data)
 {
        char **device_name = (char **)user_data;
 
@@ -722,7 +721,7 @@ void device_bluetooth_get(Service_Data *service_data)
 
        if (adapter_state == BT_ADAPTER_DISABLED) {
                char buf[255];
-               snprintf(buf, sizeof(buf),"%s %s",_("IDS_BT_BODY_BLUETOOTH"), _("IDS_ALM_BODY_OFF"));
+               snprintf(buf, sizeof(buf), "%s %s", _("IDS_BT_BODY_BLUETOOTH"), _("IDS_ALM_BODY_OFF"));
                DEBUG("Text to say: %s", buf);
                tts_speak(buf, EINA_FALSE, tts_data);
                return;
index b73258b15218a29a19be375f60331df7d26e01f9..878fb039c2c3aa262221f506284d2e434638f513 100644 (file)
@@ -71,70 +71,59 @@ static const char *sprintf_command(Read_Command *command)
                int length = text ? strlen(text) : -1;
 
                snprintf(buffer, 80, "RCmd %p (id %d, %c%c%c len %d, slices %d, text %s)", command,
-                       command->context.last_id,
-                       command->discardable ? 'D' : '-', command->want_discard_previous_reading ? 'W' : '-',
-                       command->is_playing ? 'P' : '-',
-                       length, slices, text);
-  } else {
+                                command->context.last_id,
+                                command->discardable ? 'D' : '-', command->want_discard_previous_reading ? 'W' : '-',
+                                command->is_playing ? 'P' : '-',
+                                length, slices, text);
+       } else {
                snprintf(buffer, 64, "(nil)");
-  }
+       }
 
-  return buffer;
+       return buffer;
 }
 
 static const char *get_tts_error(int r)
 {
        switch (r) {
-               case TTS_ERROR_NONE:
-               {
-                       return "no error";
-               }
-               case TTS_ERROR_INVALID_PARAMETER:
-               {
-                       return "inv param";
-               }
-               case TTS_ERROR_OUT_OF_MEMORY:
-               {
-                       return "out of memory";
-               }
-               case TTS_ERROR_OPERATION_FAILED:
-               {
-                       return "oper failed";
-               }
-               case TTS_ERROR_INVALID_STATE:
-               {
-                       return "inv state";
-               }
-               default:
-               {
-                       return "uknown error";
-               }
+       case TTS_ERROR_NONE: {
+               return "no error";
+       }
+       case TTS_ERROR_INVALID_PARAMETER: {
+               return "inv param";
+       }
+       case TTS_ERROR_OUT_OF_MEMORY: {
+               return "out of memory";
+       }
+       case TTS_ERROR_OPERATION_FAILED: {
+               return "oper failed";
+       }
+       case TTS_ERROR_INVALID_STATE: {
+               return "inv state";
+       }
+       default: {
+               return "uknown error";
+       }
        }
 }
 
 static const char *get_tts_state(tts_state_e r)
 {
        switch (r) {
-               case TTS_STATE_CREATED:
-               {
-                       return "created";
-               }
-               case TTS_STATE_READY:
-               {
-                       return "ready";
-               }
-               case TTS_STATE_PLAYING:
-               {
-                       return "playing";
-               }
-               case TTS_STATE_PAUSED:
-               {
-                       return "pause";
-               }
-               default:
-               {
-                       return "uknown state";
-               }
+       case TTS_STATE_CREATED: {
+               return "created";
+       }
+       case TTS_STATE_READY: {
+               return "ready";
+       }
+       case TTS_STATE_PLAYING: {
+               return "playing";
+       }
+       case TTS_STATE_PAUSED: {
+               return "pause";
+       }
+       default: {
+               return "uknown state";
+       }
        }
 }
 
@@ -189,7 +178,7 @@ static void  _reading_status_notify(Signal signal, Read_Command *command)
                        //do AT-SPI action
                        if (!widget_do_action(command->obj, (char *) get_signal_name(signal)))
                                ERROR("Failed to do AT-SPI action by name:%s for read command:%p with accessible object:%s",
-                                       get_signal_name(signal), command, get_debug_object_info(command->obj));
+                                         get_signal_name(signal), command, get_debug_object_info(command->obj));
                } else {
                        //broadcast dbus signal
                        if (dbus_direct_reading_adapter_emit(signal, command, sd->reading_adapter_data) != 0)
@@ -198,7 +187,8 @@ static void  _reading_status_notify(Signal signal, Read_Command *command)
        }
 }
 
-static void dispose_read_command(Read_Command *command, bool is_head) {
+static void dispose_read_command(Read_Command *command, bool is_head)
+{
        if (command) {
                if (command->context.text != NULL) {
                        if (command->is_playing)
@@ -244,8 +234,8 @@ can_discard(const Read_Command *prev, const Read_Command *next)
 
        char buffer[64];
        snprintf(buffer, 64, "CAN DISCARD %s, %s",
-               prev ? (prev->discardable ? "prev discardable" : "prev non-discardable") : "prev nil",
-               next ? (next->want_discard_previous_reading ? "next want discard" : "next want no discard") : "next nil");
+                        prev ? (prev->discardable ? "prev discardable" : "prev non-discardable") : "prev nil",
+                        next ? (next->want_discard_previous_reading ? "next want discard" : "next want no discard") : "next nil");
 
        DEBUG("%s", buffer);
 
@@ -269,13 +259,14 @@ Eina_Bool can_be_discarded(Screen_Reader_Tts_Data_t *tts_data, const Read_Comman
 // or the last command in the queue (if all are discardable).
 //
 //TODO: consider handling the case of discarding well-formed read command by subsequent malformed command
-static Read_Command *get_read_command_from_queue(Screen_Reader_Tts_Data_t *tts_data, Eina_List **command_queue_list) {
+static Read_Command *get_read_command_from_queue(Screen_Reader_Tts_Data_t *tts_data, Eina_List **command_queue_list)
+{
        DEBUG("-----------------Start-----------------");
        if (command_queue_list == NULL || *command_queue_list == NULL) {
                ERROR("NULL list parameter");
                DEBUG("-----------------END-----------------");
                return NULL;
-               }
+       }
        Service_Data *sd = get_pointer_to_service_data_struct();
 
        Eina_List *command_queue = *command_queue_list;
@@ -298,7 +289,7 @@ static Read_Command *get_read_command_from_queue(Screen_Reader_Tts_Data_t *tts_d
                                //do AT-SPI action
                                if (!widget_do_action(command->obj, (char *) get_signal_name(READING_SKIPPED)))
                                        ERROR("Failed to do AT-SPI action by name:%s for read command:%p with accessible object:%p",
-                                               get_signal_name(READING_SKIPPED), command, command->obj);
+                                                 get_signal_name(READING_SKIPPED), command, command->obj);
                        } else {
                                //broadcast dbus signal
                                if (dbus_direct_reading_adapter_emit(READING_SKIPPED, command, sd->reading_adapter_data) != 0)
@@ -313,13 +304,15 @@ static Read_Command *get_read_command_from_queue(Screen_Reader_Tts_Data_t *tts_d
        return command;
 }
 
-static bool is_separator(int unicode) {
+static bool is_separator(int unicode)
+{
        return (unicode == 0x002E || unicode == 0x3002 || /* full stop "." */
                        unicode == 0x000D || /* carriage return */
                        unicode == 0x000A) /* line feed */;
 }
 
-static bool is_wspace(int unicode) {
+static bool is_wspace(int unicode)
+{
        return (unicode == 0x0020 || unicode == 0x00A0 || unicode == 0x180E ||
                        (unicode >= 0x2000 && unicode <= 0x200B) ||
                        unicode == 0x202f || unicode == 0x205F ||
@@ -407,7 +400,8 @@ static int extract_utf8_chunk(char **utf8_line, const char *txt, int limit)
        return 0;
 }
 
-static Play_Read_Command_Status send_chunk_to_tts(Screen_Reader_Tts_Data_t *tts_data, const char *utf8_line, int *utt_id) {
+static Play_Read_Command_Status send_chunk_to_tts(Screen_Reader_Tts_Data_t *tts_data, const char *utf8_line, int *utt_id)
+{
        DEBUG("Passing TEXT: %s to TTS", utf8_line);
 
        if (!tts_data || !tts_data->tts) {
@@ -470,11 +464,12 @@ static Play_Read_Command_Status send_chunk_to_tts(Screen_Reader_Tts_Data_t *tts_
  * FAILURE_RECOVERABLE if the TTS was not ready to accept requests (and the function can be called again)
  */
 static Play_Read_Command_Status
-send_command_to_tts(Screen_Reader_Tts_Data_t *tts_data, Read_Command *command, tts_state_e state) {
+send_command_to_tts(Screen_Reader_Tts_Data_t *tts_data, Read_Command *command, tts_state_e state)
+{
        if (!tts_data || !command) return FAILURE_NOT_RECOVERABLE;
 
        if (command->context.last_id != -1) {
-         return SUCCESS;
+               return SUCCESS;
        }
 
        if (state == TTS_STATE_READY || state == TTS_STATE_PLAYING || state == TTS_STATE_PAUSED) {
@@ -496,20 +491,20 @@ send_command_to_tts(Screen_Reader_Tts_Data_t *tts_data, Read_Command *command, t
 
                        Play_Read_Command_Status result = send_chunk_to_tts(tts_data, utf8_line, &ctx->last_id);
                        switch (result) {
-                               case SUCCESS:
-                                       ++ctx->chunk_count;
-                                       chunk_accepted = true;
-                                       break;
-                               case FAILURE_NOT_RECOVERABLE:
-                                       remaining_text = NULL;
-                                       break;
-                               case FAILURE_RECOVERABLE:
-                                       ++ctx->chunk_count;
-                                       // TODO: handle recoverable conditions:
-                                       //  - invalid TTS state (created?)
-                                       //  - invalid language
-                                       DEBUG("RECOVERABLE TTS error encountered, ignoring");
-                                       break;
+                       case SUCCESS:
+                               ++ctx->chunk_count;
+                               chunk_accepted = true;
+                               break;
+                       case FAILURE_NOT_RECOVERABLE:
+                               remaining_text = NULL;
+                               break;
+                       case FAILURE_RECOVERABLE:
+                               ++ctx->chunk_count;
+                               // TODO: handle recoverable conditions:
+                               //  - invalid TTS state (created?)
+                               //  - invalid language
+                               DEBUG("RECOVERABLE TTS error encountered, ignoring");
+                               break;
                        }
                        free(utf8_line);
                }
@@ -534,7 +529,8 @@ send_command_to_tts(Screen_Reader_Tts_Data_t *tts_data, Read_Command *command, t
  *
  * @return bool true iff there is a read command to be processed
  */
-static bool have_read_command(Screen_Reader_Tts_Data_t *tts_data) {
+static bool have_read_command(Screen_Reader_Tts_Data_t *tts_data)
+{
        if (!tts_data) {
                ERROR("NULL context parameter");
                return false;
@@ -598,7 +594,8 @@ static void tts_speak_do(Screen_Reader_Tts_Data_t *tts_data)
        DEBUG("[END] tts_speak_do");
 }
 
-static void tts_speak_request(Screen_Reader_Tts_Data_t *tts_data) {
+static void tts_speak_request(Screen_Reader_Tts_Data_t *tts_data)
+{
        DEBUG("[START] tts_speak_request %srunning", tts_data->running ? "" : "not ");
 
        if (tts_data->running) {
@@ -617,7 +614,8 @@ static void tts_speak_request(Screen_Reader_Tts_Data_t *tts_data) {
        DEBUG("[END] tts_speak_request");
 }
 
-static int get_next_seq() {
+static int get_next_seq()
+{
        static int sequence_id = 1;
        return sequence_id++;
 }
@@ -628,7 +626,8 @@ static int get_next_seq() {
  * @param command_queue Eina_List ** pointer list to compress. data field must be of type Read_Command *
  * @param command Read_Command * command to compress with. want_discard_previous_reading field is what counts
  */
-static void compress_command_queue(Eina_List **command_queue, Read_Command *new_command) {
+static void compress_command_queue(Eina_List **command_queue, Read_Command *new_command)
+{
        if (!new_command || !command_queue || !*command_queue) return;
 
        Eina_List *l, *l_prev;
@@ -636,7 +635,7 @@ static void compress_command_queue(Eina_List **command_queue, Read_Command *new_
        EINA_LIST_REVERSE_FOREACH_SAFE(*command_queue, l, l_prev, current) {
                if (can_discard(current, new_command)) {
 #ifdef DEBUG_DEBUGS_WANTED
-       Eina_List *queue = *command_queue;
+                       Eina_List *queue = *command_queue;
 #endif
                        *command_queue = eina_list_remove_list(*command_queue, l);
                        DEBUG("head %p, removed %p, returned %p", queue, l, *command_queue);
@@ -647,7 +646,7 @@ static void compress_command_queue(Eina_List **command_queue, Read_Command *new_
 
 Read_Command *
 tts_speak_customized(char *text_to_speak, Eina_Bool want_discard_previous_reading,
-                       Eina_Bool discardable, AtspiAccessible *obj, Screen_Reader_Tts_Data_t *tts_data)
+                                        Eina_Bool discardable, AtspiAccessible *obj, Screen_Reader_Tts_Data_t *tts_data)
 {
        // A command that cannot be discarded and does not compress the queue is not allowed.
        if (text_to_speak == NULL)
@@ -678,7 +677,7 @@ tts_speak_customized(char *text_to_speak, Eina_Bool want_discard_previous_readin
        rc->obj = obj;
 
        DEBUG("BEFORE ADD: (#%d, last %s)", eina_list_count(tts_data->read_command_queue),
-               tts_data->read_command_queue ? sprintf_command(tts_data->read_command_queue->data) : "empty");
+                 tts_data->read_command_queue ? sprintf_command(tts_data->read_command_queue->data) : "empty");
 
        if (want_discard_previous_reading)
                compress_command_queue(&tts_data->read_command_queue, rc);
@@ -688,8 +687,8 @@ tts_speak_customized(char *text_to_speak, Eina_Bool want_discard_previous_readin
        tts_data->read_command_queue = eina_list_append(tts_data->read_command_queue, rc);
 
        DEBUG("AFTER ADD: %s (head %schanged)",
-               tts_data->read_command_queue ? sprintf_command(tts_data->read_command_queue->data) : "(empty)",
-               queue_head_changed ? "" : "un");
+                 tts_data->read_command_queue ? sprintf_command(tts_data->read_command_queue->data) : "(empty)",
+                 queue_head_changed ? "" : "un");
        // Only request housekeeping if list head changed
 
        if (queue_head_changed)
@@ -788,8 +787,8 @@ Screen_Reader_Tts_Data_t *tts_init(void)
 
        r = tts_prepare(tts_data->tts);
 #ifdef DEBUG_DEBUGS_WANTED
-               tts_state_e state;
-               tts_get_state(tts_data->tts, &state);
+       tts_state_e state;
+       tts_get_state(tts_data->tts, &state);
 #endif
        DEBUG("Prepare tts %d (%s), state %d (%s)", r, get_tts_error(r), state, get_tts_state(state));
 
index 2128c42c9fc4b3738ce6e2900b9d8765d206c16d..6f11fe6d504b1720235c7680667a897d86d219e7 100644 (file)
@@ -137,9 +137,9 @@ TIZEN_PROD_STATIC void _debug_display_object_iface_values(AtspiAccessible *obj)
        AtspiValue *value = atspi_accessible_get_value_iface(obj);
        if (value) {
                DEBUG("VALUE:<%p> %f, MAX: %f, MIN: %f", value,
-                       atspi_value_get_current_value(value, NULL),
-                       atspi_value_get_maximum_value(value, NULL),
-                       atspi_value_get_minimum_value(value, NULL));
+                         atspi_value_get_current_value(value, NULL),
+                         atspi_value_get_maximum_value(value, NULL),
+                         atspi_value_get_minimum_value(value, NULL));
                g_object_unref(value);
        }
 }
@@ -221,12 +221,12 @@ TIZEN_PROD_STATIC void _debug_display_win_screen(AtspiComponent *comp)
 
 void debug_display_info_about_object(AtspiAccessible *obj, bool display_parent_info)
 {
-       if(!obj)
+       if (!obj)
                return;
 
        DEBUG("START\n------------------------");
 
-       if(display_parent_info)
+       if (display_parent_info)
                _debug_display_object_parent_info(obj);
 
        _debug_display_object_name(obj);
@@ -284,7 +284,7 @@ Eina_Bool widget_do_action(AtspiAccessible *obj, char *expected_action)
                DEBUG("Number of available action = %d", number_of_actions);
 
                gint i = 0;
-               for(i = 0; i < number_of_actions; ++i) {
+               for (i = 0; i < number_of_actions; ++i) {
                        gchar *action_name = atspi_action_get_name(action, i, &err);
                        GERROR_CHECK(err);
                        if (action_name) {
@@ -413,7 +413,7 @@ TIZEN_PROD_STATIC int _find_popup_list_children_count(AtspiAccessible *obj)
        int i;
        int children_count = atspi_accessible_get_child_count(obj, NULL);
        for (i = 0; i < children_count; i++) {
-                       AtspiAccessible *child = atspi_accessible_get_child_at_index(obj, i, NULL);
+               AtspiAccessible *child = atspi_accessible_get_child_at_index(obj, i, NULL);
                list_items_count = _find_popup_list_children_count(child);
                g_object_unref(child);
                if (list_items_count > 0)
@@ -423,7 +423,8 @@ TIZEN_PROD_STATIC int _find_popup_list_children_count(AtspiAccessible *obj)
        return 0;
 }
 
-char *generate_description_trait(AtspiAccessible *obj) {
+char *generate_description_trait(AtspiAccessible *obj)
+{
        if (!obj)
                return strdup("");
 
@@ -448,7 +449,7 @@ char *generate_description_trait(AtspiAccessible *obj) {
                if (parent_role == ATSPI_ROLE_TOOL_BAR) {
                        int children_count = atspi_accessible_get_child_count(parent, NULL);
                        int index = atspi_accessible_get_index_in_parent(obj, NULL);
-                       AtspiSelectionselection = atspi_accessible_get_selection_iface(parent);
+                       AtspiSelection *selection = atspi_accessible_get_selection_iface(parent);
                        gboolean is_selected = atspi_selection_is_child_selected(selection, index, &err);
                        GERROR_CHECK(err);
                        snprintf(ret, sizeof(ret), _("IDS_ACCS_BODY_TAB_P1SD_OF_P2SD"), index + 1, children_count);
@@ -480,9 +481,8 @@ char *generate_description_trait(AtspiAccessible *obj) {
                                snprintf(ret + strlen(ret), sizeof(ret), _("IDS_SCR_BODY_PD_SELECTED_IN_TOTAL_TTS"), selected_children_count);
                                g_object_unref(parent_selection);
                        }
-               }
-               else if (!atspi_state_set_contains(state_set, ATSPI_STATE_EXPANDABLE)
-                               && (atspi_state_set_contains(state_set, ATSPI_STATE_EXPANDED) || atspi_state_set_contains(state_set, ATSPI_STATE_COLLAPSED))) {
+               } else if (!atspi_state_set_contains(state_set, ATSPI_STATE_EXPANDABLE)
+                                  && (atspi_state_set_contains(state_set, ATSPI_STATE_EXPANDED) || atspi_state_set_contains(state_set, ATSPI_STATE_COLLAPSED))) {
                        strncpy(ret, _("IDS_AM_OPT_HEADER_TTS"), sizeof(ret) - strlen(ret) - 1);
                        //ELM_GENLIST_ITEM_GROUP
                        GError *err = NULL;
@@ -505,8 +505,7 @@ char *generate_description_trait(AtspiAccessible *obj) {
                                        g_object_unref(child_iter);
                                }
                        }
-               }
-               else if (atspi_state_set_contains(state_set, ATSPI_STATE_EXPANDABLE)) {
+               } else if (atspi_state_set_contains(state_set, ATSPI_STATE_EXPANDABLE)) {
                        //ELM_GENLIST_ITEM_TREE
                        strncpy(ret, _("IDS_TPLATFORM_BODY_EXPANDABLE_LIST"), sizeof(ret) - strlen(ret) - 1);
                        if (atspi_state_set_contains(state_set, ATSPI_STATE_EXPANDED)) {
@@ -516,8 +515,7 @@ char *generate_description_trait(AtspiAccessible *obj) {
                                strncat(ret, ", ", sizeof(ret) - strlen(ret) - 1);
                                strncat(ret, _IGNORE_ON_TV("IDS_ACCS_BODY_DOUBLE_TAP_TO_EXPAND_THE_LIST_T_TTS"), sizeof(ret) - strlen(ret) - 1);
                        }
-               }
-               else if (atspi_state_set_contains(parent_state_set, ATSPI_STATE_ANIMATED)) {
+               } else if (atspi_state_set_contains(parent_state_set, ATSPI_STATE_ANIMATED)) {
                        strncpy(ret, _("IDS_BR_BODY_DOUBLE_TAP_AND_HOLD_THEN_DRAG_TO_REORDER_TTS"), sizeof(ret) - strlen(ret) - 1);
                }
                g_object_unref(parent_state_set);
@@ -650,7 +648,7 @@ int calculate_significant_positions(double val, int max_accuracy)
        snprintf(val_str, HOVERSEL_TRAIT_SIZE, "%.*f", max_accuracy, val);
        accuracy = max_accuracy;
        position = strlen(val_str) - 1;
-       while ( position > 0 && val_str[position] == '0' ) {
+       while (position > 0 && val_str[position] == '0') {
                --position;
                --accuracy;
        }
@@ -691,14 +689,14 @@ void add_slider_description(char *dest, uint dest_size, AtspiAccessible *obj)
        g_object_unref(value_iface);
 }
 
-char *generate_role_trait(AtspiAccessible * obj)
+char *generate_role_trait(AtspiAccessible *obj)
 {
        if (!obj)
                return strdup("");
 
        AtspiRole role = atspi_accessible_get_role(obj, NULL);
        char ret[TTS_MAX_TEXT_SIZE];
-       memset (ret, 0, TTS_MAX_TEXT_SIZE);
+       memset(ret, 0, TTS_MAX_TEXT_SIZE);
 
        switch (role) {
        case ATSPI_ROLE_ENTRY:
@@ -712,9 +710,9 @@ char *generate_role_trait(AtspiAccessible * obj)
        }
        case ATSPI_ROLE_COMBO_BOX: {
                int children_count = atspi_accessible_get_child_count(obj, NULL);
-               char buf[TTS_MAX_TEXT_SIZE] ="";
+               char buf[TTS_MAX_TEXT_SIZE] = "";
                snprintf(ret, sizeof(ret), _("IDS_ACCS_BODY_DROPDOWN_LIST_TTS"));
-               snprintf(buf, sizeof(buf), _("IDS_WEBVIEW_BODY_SHOWING_PD_ITEMS_TTS"),children_count);
+               snprintf(buf, sizeof(buf), _("IDS_WEBVIEW_BODY_SHOWING_PD_ITEMS_TTS"), children_count);
                strncat(ret, " ", sizeof(ret) - strlen(ret) - 1);
                strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
                break;
@@ -722,9 +720,9 @@ char *generate_role_trait(AtspiAccessible * obj)
        case ATSPI_ROLE_GLASS_PANE: {
                AtspiAccessible *parent = atspi_accessible_get_parent(obj, NULL);
                int children_count = atspi_accessible_get_child_count(parent, NULL);
-               char buf[TTS_MAX_TEXT_SIZE] ="";
+               char buf[TTS_MAX_TEXT_SIZE] = "";
                snprintf(ret, sizeof(ret), _("IDS_ACCS_BODY_DROPDOWN_LIST_TTS"));
-               snprintf(buf, sizeof(buf), _("IDS_WEBVIEW_BODY_SHOWING_PD_ITEMS_TTS"),children_count);
+               snprintf(buf, sizeof(buf), _("IDS_WEBVIEW_BODY_SHOWING_PD_ITEMS_TTS"), children_count);
                strncat(ret, " ", sizeof(ret) - strlen(ret) - 1);
                strncat(ret, buf, sizeof(ret) - strlen(ret) - 1);
                g_object_unref(parent);
@@ -802,15 +800,12 @@ char *generate_text_for_relation_objects(AtspiAccessible *obj, AtspiRelationType
        Eina_Strbuf *buf = eina_strbuf_new();
 
        int i;
-       for (i = 0; i < relations->len; i++)
-       {
+       for (i = 0; i < relations->len; i++) {
                AtspiRelation *relation = g_array_index(relations, AtspiRelation *, i);
                AtspiRelationType type = atspi_relation_get_relation_type(relation);
-               if (type == search)
-               {
+               if (type == search) {
                        int j;
-                       for (j = 0; j < atspi_relation_get_n_targets(relation); j++)
-                       {
+                       for (j = 0; j < atspi_relation_get_n_targets(relation); j++) {
                                AtspiAccessible *target = atspi_relation_get_target(relation, j);
                                char *text = text_generate_cb(target);
                                if (j == 0)
index ab490b03ac08775fee52ac00107ae2aa687f0bf4..9357eaca0704b7ecc7a08c62f00744878b60214e 100644 (file)
@@ -110,7 +110,7 @@ TIZEN_PROD_STATIC int get_key_values(Screen_Reader_Vconf_Data_t *vconf_data)
 }
 
 TIZEN_PROD_STATIC int _set_vconf_callback_and_print_message_on_error_and_return_error_code(
-    const char *in_key, vconf_callback_fn cb, void *user_data)
+       const char *in_key, vconf_callback_fn cb, void *user_data)
 {
        int ret = vconf_notify_key_changed(in_key, cb, user_data);
 
@@ -274,7 +274,7 @@ TIZEN_PROD_STATIC void _set_vconf_key_changed_callback_reader_description(Screen
 
        vconf_data->read_description = description;
 
-       DEBUG("Description Reader status %d ",description);
+       DEBUG("Description Reader status %d ", description);
        ret = vconf_notify_key_changed(kVconfDescKey, reader_description_cb, vconf_data);
        if (ret != 0)
                DEBUG("Could not add notify callback to %s key", kVconfDescKey);
@@ -300,7 +300,7 @@ TIZEN_PROD_STATIC void _set_vconf_key_changed_callback_reader_keyboard_feedback(
 
        vconf_data->keyboard_feedback = kb_feedback;
 
-       DEBUG("keyboard feedback status %d ",kb_feedback);
+       DEBUG("keyboard feedback status %d ", kb_feedback);
 
        ret = vconf_notify_key_changed(kVconfKbFbKey, keyboard_feedback_cb, vconf_data);
        if (ret != 0)
@@ -327,7 +327,7 @@ TIZEN_PROD_STATIC void _set_vconf_key_changed_callback_reader_sound_feedback(Scr
 
        vconf_data->sound_feedback = snd_feedback;
 
-       DEBUG("sound feedback status %d ",snd_feedback);
+       DEBUG("sound feedback status %d ", snd_feedback);
 
        ret = vconf_notify_key_changed(kVconfSoundFbKey, sound_feedback_cb, vconf_data);
 
@@ -337,12 +337,14 @@ TIZEN_PROD_STATIC void _set_vconf_key_changed_callback_reader_sound_feedback(Scr
        DEBUG("END");
 }
 
-TIZEN_PROD_STATIC Screen_Reader_Vconf_Data_t *screen_reader_vconf_data_create() {
-  return malloc(sizeof(Screen_Reader_Vconf_Data_t));
+TIZEN_PROD_STATIC Screen_Reader_Vconf_Data_t *screen_reader_vconf_data_create()
+{
+       return malloc(sizeof(Screen_Reader_Vconf_Data_t));
 
 }
-TIZEN_PROD_STATIC void screen_reader_vconf_data_destroy(Screen_Reader_Vconf_Data_t *vconf_data) {
-  free(vconf_data);
+TIZEN_PROD_STATIC void screen_reader_vconf_data_destroy(Screen_Reader_Vconf_Data_t *vconf_data)
+{
+       free(vconf_data);
 }
 
 Screen_Reader_Vconf_Data_t *vconf_init(void)
@@ -357,11 +359,11 @@ Screen_Reader_Vconf_Data_t *vconf_init(void)
        vconf_data->sound_feedback = true;
        vconf_data->run_service = 1;
 
-       #ifdef SCREEN_READER_TV
-               vconf_data->tracking_signal_name = FOCUS_CHANGED_SIG;
-       #else
-               vconf_data->tracking_signal_name = HIGHLIGHT_CHANGED_SIG;
-       #endif
+#ifdef SCREEN_READER_TV
+       vconf_data->tracking_signal_name = FOCUS_CHANGED_SIG;
+#else
+       vconf_data->tracking_signal_name = HIGHLIGHT_CHANGED_SIG;
+#endif
 
        if (vconf_set(vconf_data->keys)) {
                DEBUG("nothing is written\n");
index a8197c6b99633755633a78b56d7f4cd4e20dd7d1..3ae8e3f4ab167dcdb615d508e392cecd2269cf50 100644 (file)
@@ -40,7 +40,7 @@ static void _handle_state_change(void);
 
 static void _playback_completed_cb(int id, void *user_data)
 {
-       DEBUG("WAV Player", "Completed! [id:%d, path:%s]", id, (const char*) user_data);
+       DEBUG("WAV Player", "Completed! [id:%d, path:%s]", id, (const char *) user_data);
 }
 
 static char *_get_sound_path(const char *file_path)
@@ -229,7 +229,7 @@ Smart_Notification_Data *smart_notification_init(void)
 void smart_notification_shutdown(Smart_Notification_Data *snd)
 {
        DEBUG("[START]");
-       if(!snd) {
+       if (!snd) {
                ERROR("NULL context parameter");
                return;
        }
@@ -246,10 +246,10 @@ static void _handle_focus_chain_end(void)
        DEBUG(RED "Smart notification - FOCUS CHAIN END" RESET);
        int wav_player_id;
        //sound to play when reached start/end not given hence using below.
-       gcharwav_path = _get_sound_path("focus_general.ogg");
+       gchar *wav_path = _get_sound_path("focus_general.ogg");
 
        DEBUG("Smart notification - HIGHLIGHT" RESET);
-       wav_player_start(wav_path, SOUND_TYPE_MEDIA, _playback_completed_cb, (void*)wav_path, &wav_player_id);
+       wav_player_start(wav_path, SOUND_TYPE_MEDIA, _playback_completed_cb, (void *)wav_path, &wav_player_id);
        g_free(wav_path);
 }
 
@@ -263,7 +263,7 @@ static void _handle_highlight(void)
        gchar *wav_path = _get_sound_path("focus_general.ogg");
 
        DEBUG("Smart notification - HIGHLIGHT" RESET);
-       wav_player_start(wav_path, SOUND_TYPE_MEDIA, _playback_completed_cb, (void*)wav_path, &wav_player_id);
+       wav_player_start(wav_path, SOUND_TYPE_MEDIA, _playback_completed_cb, (void *)wav_path, &wav_player_id);
        g_free(wav_path);
 }
 
@@ -274,7 +274,7 @@ static void _handle_highlight_actionable(void)
        gchar *wav_path = _get_sound_path("focus_actionable.ogg");
 
        DEBUG("Smart notification - HIGHLIGHT" RESET);
-       wav_player_start(wav_path, SOUND_TYPE_MEDIA, _playback_completed_cb, (void*)wav_path, &wav_player_id);
+       wav_player_start(wav_path, SOUND_TYPE_MEDIA, _playback_completed_cb, (void *)wav_path, &wav_player_id);
        g_free(wav_path);
 }
 
@@ -284,7 +284,7 @@ static void _handle_action(void)
        gchar *wav_path = _get_sound_path("clicked.ogg");
 
        DEBUG("Smart notification - ACTION" RESET);
-       wav_player_start(wav_path, SOUND_TYPE_MEDIA, _playback_completed_cb, (void*)wav_path, &wav_player_id);
+       wav_player_start(wav_path, SOUND_TYPE_MEDIA, _playback_completed_cb, (void *)wav_path, &wav_player_id);
        g_free(wav_path);
 }
 
@@ -294,17 +294,17 @@ static void _handle_contextual_menu(void)
        gchar *wav_path = _get_sound_path("contextual_menu.ogg");
 
        DEBUG("Smart notification - context menu" RESET);
-       wav_player_start(wav_path, SOUND_TYPE_MEDIA, _playback_completed_cb, (void*)wav_path, &wav_player_id);
+       wav_player_start(wav_path, SOUND_TYPE_MEDIA, _playback_completed_cb, (void *)wav_path, &wav_player_id);
        g_free(wav_path);
 }
 
 static void _handle_long_press(void)
 {
        int wav_player_id;
-       gcharwav_path = _get_sound_path("long_clicked.ogg");
+       gchar *wav_path = _get_sound_path("long_clicked.ogg");
 
        DEBUG("Smart notification - long press" RESET);
-       wav_player_start(wav_path, SOUND_TYPE_MEDIA, _playback_completed_cb, (void*)wav_path, &wav_player_id);
+       wav_player_start(wav_path, SOUND_TYPE_MEDIA, _playback_completed_cb, (void *)wav_path, &wav_player_id);
        g_free(wav_path);
 }
 
@@ -314,7 +314,7 @@ static void _handle_state_change(void)
        gchar *wav_path = _get_sound_path("window_state_changed.ogg");
 
        DEBUG("Smart notification - view change" RESET);
-       wav_player_start(wav_path, SOUND_TYPE_MEDIA, _playback_completed_cb, (void*)wav_path, &wav_player_id);
+       wav_player_start(wav_path, SOUND_TYPE_MEDIA, _playback_completed_cb, (void *)wav_path, &wav_player_id);
        g_free(wav_path);
 }
 
index a7f1fa9605e2502ef7bd948b4171cbf6db1598e3..b9c3fdcb6df0beae8737ca4658d710bf1ac39b5c 100644 (file)
@@ -23,8 +23,7 @@
 #include <Ecore_X_Atoms.h>
 #endif
 
-struct _Window_Tracker_Data
-{
+struct _Window_Tracker_Data {
        Window_Tracker_Cb user_cb;
        void *user_data;
        AtspiEventListener *listener;
@@ -60,24 +59,19 @@ static void _on_atspi_window_cb(const AtspiEvent *event)
 
        DEBUG("Event: %s: %s", event->type, name);
 
-       if (!strcmp(event->type, "window:activate"))
-       {
+       if (!strcmp(event->type, "window:activate")) {
                if (wtd->user_cb)
                        user_cb(wtd->user_data, event->source);
                wtd->last_active_win = event->source;
                wtd->top_win = wtd->last_active_win;
        }
 
-       if (!strcmp(event->type, "object:state-changed:visible") && (!strcmp(name, "Quickpanel Window") || !strcmp(name, "volume")))
-       {
-               if (event->detail1)
-               {
+       if (!strcmp(event->type, "object:state-changed:visible") && (!strcmp(name, "Quickpanel Window") || !strcmp(name, "volume"))) {
+               if (event->detail1) {
                        if (wtd->user_cb)
                                user_cb(wtd->user_data, event->source);
                        wtd->top_win = event->source;
-               }
-               else
-               {
+               } else {
                        if (wtd->user_cb)
                                user_cb(wtd->user_data, wtd->last_active_win);
                        wtd->top_win = wtd->last_active_win;
index d5c13386d0cbf6edb89fb2f21604d18d04c04ca4..0cab6cc343b5e6ec34d5ec4bce96c1a37a63ad6a 100644 (file)
@@ -30,12 +30,12 @@ G_DEFINE_TYPE(AtspiAction, atspi_action, G_TYPE_OBJECT);
 G_DEFINE_TYPE(AtspiComponent, atspi_component, G_TYPE_OBJECT);
 G_DEFINE_TYPE(AtspiStateSet, atspi_state_set, G_TYPE_OBJECT);
 
-void atspi_rect_free(AtspiRect * rect)
+void atspi_rect_free(AtspiRect *rect)
 {
        g_free(rect);
 }
 
-AtspiRect *atspi_rect_copy(AtspiRect * src)
+AtspiRect *atspi_rect_copy(AtspiRect *src)
 {
        AtspiRect *dst = g_new(AtspiRect, 1);
        dst->x = src->x;
@@ -61,7 +61,7 @@ void atspi_free_memory(void)
        free(text);
 }
 
-gchar *atspi_accessible_get_name(AtspiAccessible * obj, GError ** error)
+gchar *atspi_accessible_get_name(AtspiAccessible *obj, GError **error)
 {
        if (!obj || !obj->name)
                return strdup("\0");
@@ -69,7 +69,7 @@ gchar *atspi_accessible_get_name(AtspiAccessible * obj, GError ** error)
        return strdup(obj->name);
 }
 
-gchar *atspi_accessible_get_role_name(AtspiAccessible * obj, GError ** error)
+gchar *atspi_accessible_get_role_name(AtspiAccessible *obj, GError **error)
 {
        if (!obj)
                return strdup("\0");
@@ -108,7 +108,7 @@ gchar *atspi_accessible_get_role_name(AtspiAccessible * obj, GError ** error)
        }
 }
 
-gchar *atspi_accessible_get_localized_role_name(AtspiAccessible * obj, GError ** error)
+gchar *atspi_accessible_get_localized_role_name(AtspiAccessible *obj, GError **error)
 {
        if (!obj)
                return strdup("\0");
@@ -131,71 +131,71 @@ gchar *atspi_accessible_get_localized_role_name(AtspiAccessible * obj, GError **
        }
 }
 
-gchar *atspi_accessible_get_toolkit_name(AtspiAccessible * obj, GError ** error)
+gchar *atspi_accessible_get_toolkit_name(AtspiAccessible *obj, GError **error)
 {
        return "fake atspi";
 }
 
-gchar *atspi_accessible_get_description(AtspiAccessible * obj, GError ** error)
+gchar *atspi_accessible_get_description(AtspiAccessible *obj, GError **error)
 {
        if (!obj || !obj->description)
                return strdup("\0");
        return strdup(obj->description);
 }
 
-AtspiAction *atspi_accessible_get_action_iface(AtspiAccessible * obj)
+AtspiAction *atspi_accessible_get_action_iface(AtspiAccessible *obj)
 {
        if (!obj)
                return NULL;
        return action;
 }
 
-AtspiText *atspi_accessible_get_text_iface(AtspiAccessible * obj)
+AtspiText *atspi_accessible_get_text_iface(AtspiAccessible *obj)
 {
        if (!obj)
                return NULL;
        return text;
 }
 
-gint atspi_text_get_character_count(AtspiText * obj, GError ** error)
+gint atspi_text_get_character_count(AtspiText *obj, GError **error)
 {
        if (!obj)
                return -1;
        return 6;
 }
 
-gint atspi_text_get_caret_offset(AtspiText * obj, GError ** error)
+gint atspi_text_get_caret_offset(AtspiText *obj, GError **error)
 {
        if (!obj)
                return -1;
        return 5;
 }
 
-gchar *atspi_text_get_text(AtspiText * obj, gint start_offset, gint end_offset, GError ** error)
+gchar *atspi_text_get_text(AtspiText *obj, gint start_offset, gint end_offset, GError **error)
 {
        if (!obj)
                return NULL;
        return strdup("AtspiText text");
 }
 
-AtspiValue *atspi_accessible_get_value_iface(AtspiAccessible * obj)
+AtspiValue *atspi_accessible_get_value_iface(AtspiAccessible *obj)
 {
        if (!obj)
                return NULL;
        return value;
 }
 
-gdouble atspi_value_get_current_value(AtspiValue * obj, GError ** error)
+gdouble atspi_value_get_current_value(AtspiValue *obj, GError **error)
 {
        return 1.0;
 }
 
-gdouble atspi_value_get_maximum_value(AtspiValue * obj, GError ** error)
+gdouble atspi_value_get_maximum_value(AtspiValue *obj, GError **error)
 {
        return 2.0;
 }
 
-gdouble atspi_value_get_minimum_value(AtspiValue * obj, GError ** error)
+gdouble atspi_value_get_minimum_value(AtspiValue *obj, GError **error)
 {
        return 0.0;
 }
@@ -205,58 +205,58 @@ AtspiEventListener *atspi_event_listener_new(AtspiEventListenerCB callback, gpoi
        return NULL;
 }
 
-gboolean atspi_event_listener_register(AtspiEventListener * listener, const gchar * event_type, GError ** error)
+gboolean atspi_event_listener_register(AtspiEventListener *listener, const gchar *event_type, GError **error)
 {
        return FALSE;
 }
 
-gboolean atspi_event_listener_deregister(AtspiEventListener * listener, const gchar * event_type, GError ** error)
+gboolean atspi_event_listener_deregister(AtspiEventListener *listener, const gchar *event_type, GError **error)
 {
        return FALSE;
 }
 
-AtspiStateSet *atspi_accessible_get_state_set(AtspiAccessible * obj)
+AtspiStateSet *atspi_accessible_get_state_set(AtspiAccessible *obj)
 {
        if (!obj || !obj->states)
                return NULL;
        return obj->states;
 }
 
-gboolean atspi_state_set_contains(AtspiStateSet * set, AtspiStateType state)
+gboolean atspi_state_set_contains(AtspiStateSet *set, AtspiStateType state)
 {
        if (!set)
                return FALSE;
        return (set->states & ((gint64) 1 << state)) ? TRUE : FALSE;
 }
 
-void atspi_state_set_add(AtspiStateSet * set, AtspiStateType state)
+void atspi_state_set_add(AtspiStateSet *set, AtspiStateType state)
 {
        if (!set)
                return;
        set->states |= (((gint64) 1) << state);
 }
 
-gboolean atspi_component_grab_highlight(AtspiComponent * obj, GError ** error)
+gboolean atspi_component_grab_highlight(AtspiComponent *obj, GError **error)
 {
        return FALSE;
 }
 
-AtspiScrollable *atspi_accessible_get_scrollable(AtspiAccessible * accessible)
+AtspiScrollable *atspi_accessible_get_scrollable(AtspiAccessible *accessible)
 {
        return NULL;
 }
 
-gboolean atspi_component_clear_highlight(AtspiComponent * obj, GError ** error)
+gboolean atspi_component_clear_highlight(AtspiComponent *obj, GError **error)
 {
        return FALSE;
 }
 
-gboolean atspi_component_contains(AtspiComponent * obj, gint x, gint y, AtspiCoordType ctype, GError ** error)
+gboolean atspi_component_contains(AtspiComponent *obj, gint x, gint y, AtspiCoordType ctype, GError **error)
 {
        return TRUE;
 }
 
-GArray *atspi_state_set_get_states(AtspiStateSet * set)
+GArray *atspi_state_set_get_states(AtspiStateSet *set)
 {
        gint i = 0;
        guint64 val = 1;
@@ -275,28 +275,28 @@ GArray *atspi_state_set_get_states(AtspiStateSet * set)
 
 }
 
-AtspiRole atspi_accessible_get_role(AtspiAccessible * obj, GError ** error)
+AtspiRole atspi_accessible_get_role(AtspiAccessible *obj, GError **error)
 {
        if (!obj)
                return ATSPI_ROLE_INVALID;
        return obj->role;
 }
 
-gint atspi_accessible_get_child_count(AtspiAccessible * obj, GError ** error)
+gint atspi_accessible_get_child_count(AtspiAccessible *obj, GError **error)
 {
        if (!obj || !obj->children)
                return 0;
        return g_list_length(obj->children);
 }
 
-AtspiAccessible *atspi_accessible_get_child_at_index(AtspiAccessible * obj, gint child_index, GError ** error)
+AtspiAccessible *atspi_accessible_get_child_at_index(AtspiAccessible *obj, gint child_index, GError **error)
 {
        if (!obj || child_index >= g_list_length(obj->children))
                return NULL;
        return g_object_ref(g_list_nth_data(obj->children, child_index));
 }
 
-AtspiComponent *atspi_accessible_get_component_iface(AtspiAccessible * obj)
+AtspiComponent *atspi_accessible_get_component_iface(AtspiAccessible *obj)
 {
        if (!obj)
                return NULL;
@@ -305,7 +305,7 @@ AtspiComponent *atspi_accessible_get_component_iface(AtspiAccessible * obj)
        return component;
 }
 
-AtspiStateSet *atspi_state_set_new(GArray * states)
+AtspiStateSet *atspi_state_set_new(GArray *states)
 {
        AtspiStateSet *set = g_object_new(ATSPI_STATE_OBJECT_TYPE, NULL);
        if (!set)
@@ -317,7 +317,7 @@ AtspiStateSet *atspi_state_set_new(GArray * states)
        return set;
 }
 
-AtspiRect *atspi_component_get_extents(AtspiComponent * component, AtspiCoordType ctype, GError ** error)
+AtspiRect *atspi_component_get_extents(AtspiComponent *component, AtspiCoordType ctype, GError **error)
 {
        if (!component)
                return NULL;
@@ -389,7 +389,7 @@ AtspiAccessible *atspi_create_accessible()
        return obj;
 }
 
-void atspi_delete_accessible(AtspiAccessible * obj)
+void atspi_delete_accessible(AtspiAccessible *obj)
 {
        if (!obj)
                return;
@@ -399,7 +399,7 @@ void atspi_delete_accessible(AtspiAccessible * obj)
        g_object_unref(obj);
 }
 
-void atspi_accessible_add_child(AtspiAccessible * obj, AtspiAccessible * child)
+void atspi_accessible_add_child(AtspiAccessible *obj, AtspiAccessible *child)
 {
        child->index_in_parent = obj->child_count;
        child->accessible_parent = obj;
@@ -408,7 +408,7 @@ void atspi_accessible_add_child(AtspiAccessible * obj, AtspiAccessible * child)
        obj->child_count++;
 }
 
-void atpis_accessible_remove_children(AtspiAccessible * obj)
+void atpis_accessible_remove_children(AtspiAccessible *obj)
 {
        GList *l = obj->children;
        while (l != NULL) {
@@ -421,99 +421,99 @@ void atpis_accessible_remove_children(AtspiAccessible * obj)
        g_list_free(obj->children);
 }
 
-static void atspi_state_set_init(AtspiStateSet * set)
+static void atspi_state_set_init(AtspiStateSet *set)
 {
 }
 
-static void atspi_state_set_class_init(AtspiStateSetClass * _class)
+static void atspi_state_set_class_init(AtspiStateSetClass *_class)
 {
 }
 
-static void atspi_action_class_init(AtspiActionClass * _class)
+static void atspi_action_class_init(AtspiActionClass *_class)
 {
 }
 
-static void atspi_action_init(AtspiAction * obj)
+static void atspi_action_init(AtspiAction *obj)
 {
 }
 
-static void atspi_accessible_class_init(AtspiAccessibleClass * _class)
+static void atspi_accessible_class_init(AtspiAccessibleClass *_class)
 {
 }
 
-static void atspi_accessible_init(AtspiAccessible * obj)
+static void atspi_accessible_init(AtspiAccessible *obj)
 {
 }
 
-static void atspi_component_finalize(GObject * obj)
+static void atspi_component_finalize(GObject *obj)
 {
        AtspiComponent *component = (AtspiComponent *) obj;
        free(component->role);
 }
 
-static void atspi_component_class_init(AtspiComponentClass * class)
+static void atspi_component_class_init(AtspiComponentClass *class)
 {
        GObjectClass *gobject_class = G_OBJECT_CLASS(class);
 
        gobject_class->finalize = atspi_component_finalize;
 }
 
-static void atspi_component_init(AtspiComponent * obj)
+static void atspi_component_init(AtspiComponent *obj)
 {
        obj->role = (AtspiRole *) malloc(sizeof(AtspiRole));
 }
 
-AtspiEditableText *atspi_accessible_get_editable_text_iface(AtspiAccessible * obj)
+AtspiEditableText *atspi_accessible_get_editable_text_iface(AtspiAccessible *obj)
 {
        return editable_text;
 }
 
-GArray *atspi_accessible_get_relation_set(AtspiAccessible * obj, GError ** error)
+GArray *atspi_accessible_get_relation_set(AtspiAccessible *obj, GError **error)
 {
        return NULL;
 }
 
-AtspiRelationType atspi_relation_get_relation_type(AtspiRelation * obj)
+AtspiRelationType atspi_relation_get_relation_type(AtspiRelation *obj)
 {
        return ATSPI_RELATION_NULL;
 }
 
-gint atspi_relation_get_n_targets(AtspiRelation * obj)
+gint atspi_relation_get_n_targets(AtspiRelation *obj)
 {
        return 0;
 }
 
-AtspiAccessible *atspi_relation_get_target(AtspiRelation * obj, gint i)
+AtspiAccessible *atspi_relation_get_target(AtspiRelation *obj, gint i)
 {
        return NULL;
 }
 
-AtspiAccessible *atspi_accessible_get_parent(AtspiAccessible * obj, GError ** error)
+AtspiAccessible *atspi_accessible_get_parent(AtspiAccessible *obj, GError **error)
 {
-       return g_object_ref (obj->accessible_parent);
+       return g_object_ref(obj->accessible_parent);
 }
 
-int atspi_component_get_highlight_index(AtspiComponent * obj, GError ** error)
+int atspi_component_get_highlight_index(AtspiComponent *obj, GError **error)
 {
        return 0;
 }
 
-gint atspi_action_get_n_actions(AtspiAction * obj, GError ** error)
+gint atspi_action_get_n_actions(AtspiAction *obj, GError **error)
 {
        return 0;
 }
 
-gchar *atspi_action_get_action_name(AtspiAction * obj, gint i, GError ** error)
+gchar *atspi_action_get_action_name(AtspiAction *obj, gint i, GError **error)
 {
        return strdup("");
 }
 
-gboolean atspi_action_do_action(AtspiAction * obj, gint i, GError ** error)
+gboolean atspi_action_do_action(AtspiAction *obj, gint i, GError **error)
 {
        return FALSE;
 }
 
-gint atspi_accessible_get_index_in_parent(AtspiAccessible * obj, GError ** error)
+gint atspi_accessible_get_index_in_parent(AtspiAccessible *obj, GError **error)
 {
        return obj->index_in_parent;
 }
index 0fe13d323c9457bb62fc158779200bc459aa33ad..8aa21890cd9d3808a157021e5e2d9583920bde89 100644 (file)
@@ -57,396 +57,373 @@ typedef struct _AtspiActionClass AtspiActionClass;
 typedef struct _AtspiComponentClass AtspiComponentClass;
 typedef struct _AtspiStateSetClass AtspiStateSetClass;
 
-typedef void (*AtspiEventListenerCB) (AtspiEvent *event, void *user_data);
-
-typedef enum
-{
-   ATSPI_CACHE_NONE     = 0,
-   ATSPI_CACHE_PARENT   = 1 << 0,
-   ATSPI_CACHE_CHILDREN    = 1 << 1,
-   ATSPI_CACHE_NAME        = 1 << 2,
-   ATSPI_CACHE_DESCRIPTION = 1 << 3,
-   ATSPI_CACHE_STATES      = 1 << 4,
-   ATSPI_CACHE_ROLE        = 1 << 5,
-   ATSPI_CACHE_INTERFACES  = 1 << 6,
-   ATSPI_CACHE_ATTRIBUTES = 1 << 7,
-   ATSPI_CACHE_ALL         = 0x3fffffff,
-   ATSPI_CACHE_DEFAULT = ATSPI_CACHE_PARENT | ATSPI_CACHE_CHILDREN |
-                         ATSPI_CACHE_NAME | ATSPI_CACHE_DESCRIPTION |
-                         ATSPI_CACHE_STATES | ATSPI_CACHE_ROLE |
-                         ATSPI_CACHE_INTERFACES,
-   ATSPI_CACHE_UNDEFINED   = 0x40000000,
+typedef void (*AtspiEventListenerCB)(AtspiEvent *event, void *user_data);
+
+typedef enum {
+       ATSPI_CACHE_NONE     = 0,
+       ATSPI_CACHE_PARENT   = 1 << 0,
+       ATSPI_CACHE_CHILDREN    = 1 << 1,
+       ATSPI_CACHE_NAME        = 1 << 2,
+       ATSPI_CACHE_DESCRIPTION = 1 << 3,
+       ATSPI_CACHE_STATES      = 1 << 4,
+       ATSPI_CACHE_ROLE        = 1 << 5,
+       ATSPI_CACHE_INTERFACES  = 1 << 6,
+       ATSPI_CACHE_ATTRIBUTES = 1 << 7,
+       ATSPI_CACHE_ALL         = 0x3fffffff,
+       ATSPI_CACHE_DEFAULT = ATSPI_CACHE_PARENT | ATSPI_CACHE_CHILDREN |
+                                                 ATSPI_CACHE_NAME | ATSPI_CACHE_DESCRIPTION |
+                                                 ATSPI_CACHE_STATES | ATSPI_CACHE_ROLE |
+                                                 ATSPI_CACHE_INTERFACES,
+       ATSPI_CACHE_UNDEFINED   = 0x40000000,
 } AtspiCache;
 
-typedef enum
-{
-   ATSPI_ROLE_INVALID,
-   ATSPI_ROLE_ACCELERATOR_LABEL,
-   ATSPI_ROLE_ALERT,
-   ATSPI_ROLE_ANIMATION,
-   ATSPI_ROLE_ARROW,
-   ATSPI_ROLE_CALENDAR,
-   ATSPI_ROLE_CANVAS,
-   ATSPI_ROLE_CHECK_BOX,
-   ATSPI_ROLE_CHECK_MENU_ITEM,
-   ATSPI_ROLE_COLOR_CHOOSER,
-   ATSPI_ROLE_COLUMN_HEADER,
-   ATSPI_ROLE_COMBO_BOX,
-   ATSPI_ROLE_DATE_EDITOR,
-   ATSPI_ROLE_DESKTOP_ICON,
-   ATSPI_ROLE_DESKTOP_FRAME,
-   ATSPI_ROLE_DIAL,
-   ATSPI_ROLE_DIALOG,
-   ATSPI_ROLE_DIRECTORY_PANE,
-   ATSPI_ROLE_DRAWING_AREA,
-   ATSPI_ROLE_FILE_CHOOSER,
-   ATSPI_ROLE_FILLER,
-   ATSPI_ROLE_FOCUS_TRAVERSABLE,
-   ATSPI_ROLE_FONT_CHOOSER,
-   ATSPI_ROLE_FRAME,
-   ATSPI_ROLE_GLASS_PANE,
-   ATSPI_ROLE_HTML_CONTAINER,
-   ATSPI_ROLE_ICON,
-   ATSPI_ROLE_IMAGE,
-   ATSPI_ROLE_INTERNAL_FRAME,
-   ATSPI_ROLE_LABEL,
-   ATSPI_ROLE_LAYERED_PANE,
-   ATSPI_ROLE_LIST,
-   ATSPI_ROLE_LIST_ITEM,
-   ATSPI_ROLE_MENU,
-   ATSPI_ROLE_MENU_BAR,
-   ATSPI_ROLE_MENU_ITEM,
-   ATSPI_ROLE_OPTION_PANE,
-   ATSPI_ROLE_PAGE_TAB,
-   ATSPI_ROLE_PAGE_TAB_LIST,
-   ATSPI_ROLE_PANEL,
-   ATSPI_ROLE_PASSWORD_TEXT,
-   ATSPI_ROLE_POPUP_MENU,
-   ATSPI_ROLE_PROGRESS_BAR,
-   ATSPI_ROLE_PUSH_BUTTON,
-   ATSPI_ROLE_RADIO_BUTTON,
-   ATSPI_ROLE_RADIO_MENU_ITEM,
-   ATSPI_ROLE_ROOT_PANE,
-   ATSPI_ROLE_ROW_HEADER,
-   ATSPI_ROLE_SCROLL_BAR,
-   ATSPI_ROLE_SCROLL_PANE,
-   ATSPI_ROLE_SEPARATOR,
-   ATSPI_ROLE_SLIDER,
-   ATSPI_ROLE_SPIN_BUTTON,
-   ATSPI_ROLE_SPLIT_PANE,
-   ATSPI_ROLE_STATUS_BAR,
-   ATSPI_ROLE_TABLE,
-   ATSPI_ROLE_TABLE_CELL,
-   ATSPI_ROLE_TABLE_COLUMN_HEADER,
-   ATSPI_ROLE_TABLE_ROW_HEADER,
-   ATSPI_ROLE_TEAROFF_MENU_ITEM,
-   ATSPI_ROLE_TERMINAL,
-   ATSPI_ROLE_TEXT,
-   ATSPI_ROLE_TOGGLE_BUTTON,
-   ATSPI_ROLE_TOOL_BAR,
-   ATSPI_ROLE_TOOL_TIP,
-   ATSPI_ROLE_TREE,
-   ATSPI_ROLE_TREE_TABLE,
-   ATSPI_ROLE_UNKNOWN,
-   ATSPI_ROLE_VIEWPORT,
-   ATSPI_ROLE_WINDOW,
-   ATSPI_ROLE_EXTENDED,
-   ATSPI_ROLE_HEADER,
-   ATSPI_ROLE_FOOTER,
-   ATSPI_ROLE_PARAGRAPH,
-   ATSPI_ROLE_RULER,
-   ATSPI_ROLE_APPLICATION,
-   ATSPI_ROLE_AUTOCOMPLETE,
-   ATSPI_ROLE_EDITBAR,
-   ATSPI_ROLE_EMBEDDED,
-   ATSPI_ROLE_ENTRY,
-   ATSPI_ROLE_CHART,
-   ATSPI_ROLE_CAPTION,
-   ATSPI_ROLE_DOCUMENT_FRAME,
-   ATSPI_ROLE_HEADING,
-   ATSPI_ROLE_PAGE,
-   ATSPI_ROLE_SECTION,
-   ATSPI_ROLE_REDUNDANT_OBJECT,
-   ATSPI_ROLE_FORM,
-   ATSPI_ROLE_LINK,
-   ATSPI_ROLE_INPUT_METHOD_WINDOW,
-   ATSPI_ROLE_TABLE_ROW,
-   ATSPI_ROLE_TREE_ITEM,
-   ATSPI_ROLE_DOCUMENT_SPREADSHEET,
-   ATSPI_ROLE_DOCUMENT_PRESENTATION,
-   ATSPI_ROLE_DOCUMENT_TEXT,
-   ATSPI_ROLE_DOCUMENT_WEB,
-   ATSPI_ROLE_DOCUMENT_EMAIL,
-   ATSPI_ROLE_COMMENT,
-   ATSPI_ROLE_LIST_BOX,
-   ATSPI_ROLE_GROUPING,
-   ATSPI_ROLE_IMAGE_MAP,
-   ATSPI_ROLE_NOTIFICATION,
-   ATSPI_ROLE_INFO_BAR,
-   ATSPI_ROLE_LEVEL_BAR,
-   ATSPI_ROLE_LAST_DEFINED,
+typedef enum {
+       ATSPI_ROLE_INVALID,
+       ATSPI_ROLE_ACCELERATOR_LABEL,
+       ATSPI_ROLE_ALERT,
+       ATSPI_ROLE_ANIMATION,
+       ATSPI_ROLE_ARROW,
+       ATSPI_ROLE_CALENDAR,
+       ATSPI_ROLE_CANVAS,
+       ATSPI_ROLE_CHECK_BOX,
+       ATSPI_ROLE_CHECK_MENU_ITEM,
+       ATSPI_ROLE_COLOR_CHOOSER,
+       ATSPI_ROLE_COLUMN_HEADER,
+       ATSPI_ROLE_COMBO_BOX,
+       ATSPI_ROLE_DATE_EDITOR,
+       ATSPI_ROLE_DESKTOP_ICON,
+       ATSPI_ROLE_DESKTOP_FRAME,
+       ATSPI_ROLE_DIAL,
+       ATSPI_ROLE_DIALOG,
+       ATSPI_ROLE_DIRECTORY_PANE,
+       ATSPI_ROLE_DRAWING_AREA,
+       ATSPI_ROLE_FILE_CHOOSER,
+       ATSPI_ROLE_FILLER,
+       ATSPI_ROLE_FOCUS_TRAVERSABLE,
+       ATSPI_ROLE_FONT_CHOOSER,
+       ATSPI_ROLE_FRAME,
+       ATSPI_ROLE_GLASS_PANE,
+       ATSPI_ROLE_HTML_CONTAINER,
+       ATSPI_ROLE_ICON,
+       ATSPI_ROLE_IMAGE,
+       ATSPI_ROLE_INTERNAL_FRAME,
+       ATSPI_ROLE_LABEL,
+       ATSPI_ROLE_LAYERED_PANE,
+       ATSPI_ROLE_LIST,
+       ATSPI_ROLE_LIST_ITEM,
+       ATSPI_ROLE_MENU,
+       ATSPI_ROLE_MENU_BAR,
+       ATSPI_ROLE_MENU_ITEM,
+       ATSPI_ROLE_OPTION_PANE,
+       ATSPI_ROLE_PAGE_TAB,
+       ATSPI_ROLE_PAGE_TAB_LIST,
+       ATSPI_ROLE_PANEL,
+       ATSPI_ROLE_PASSWORD_TEXT,
+       ATSPI_ROLE_POPUP_MENU,
+       ATSPI_ROLE_PROGRESS_BAR,
+       ATSPI_ROLE_PUSH_BUTTON,
+       ATSPI_ROLE_RADIO_BUTTON,
+       ATSPI_ROLE_RADIO_MENU_ITEM,
+       ATSPI_ROLE_ROOT_PANE,
+       ATSPI_ROLE_ROW_HEADER,
+       ATSPI_ROLE_SCROLL_BAR,
+       ATSPI_ROLE_SCROLL_PANE,
+       ATSPI_ROLE_SEPARATOR,
+       ATSPI_ROLE_SLIDER,
+       ATSPI_ROLE_SPIN_BUTTON,
+       ATSPI_ROLE_SPLIT_PANE,
+       ATSPI_ROLE_STATUS_BAR,
+       ATSPI_ROLE_TABLE,
+       ATSPI_ROLE_TABLE_CELL,
+       ATSPI_ROLE_TABLE_COLUMN_HEADER,
+       ATSPI_ROLE_TABLE_ROW_HEADER,
+       ATSPI_ROLE_TEAROFF_MENU_ITEM,
+       ATSPI_ROLE_TERMINAL,
+       ATSPI_ROLE_TEXT,
+       ATSPI_ROLE_TOGGLE_BUTTON,
+       ATSPI_ROLE_TOOL_BAR,
+       ATSPI_ROLE_TOOL_TIP,
+       ATSPI_ROLE_TREE,
+       ATSPI_ROLE_TREE_TABLE,
+       ATSPI_ROLE_UNKNOWN,
+       ATSPI_ROLE_VIEWPORT,
+       ATSPI_ROLE_WINDOW,
+       ATSPI_ROLE_EXTENDED,
+       ATSPI_ROLE_HEADER,
+       ATSPI_ROLE_FOOTER,
+       ATSPI_ROLE_PARAGRAPH,
+       ATSPI_ROLE_RULER,
+       ATSPI_ROLE_APPLICATION,
+       ATSPI_ROLE_AUTOCOMPLETE,
+       ATSPI_ROLE_EDITBAR,
+       ATSPI_ROLE_EMBEDDED,
+       ATSPI_ROLE_ENTRY,
+       ATSPI_ROLE_CHART,
+       ATSPI_ROLE_CAPTION,
+       ATSPI_ROLE_DOCUMENT_FRAME,
+       ATSPI_ROLE_HEADING,
+       ATSPI_ROLE_PAGE,
+       ATSPI_ROLE_SECTION,
+       ATSPI_ROLE_REDUNDANT_OBJECT,
+       ATSPI_ROLE_FORM,
+       ATSPI_ROLE_LINK,
+       ATSPI_ROLE_INPUT_METHOD_WINDOW,
+       ATSPI_ROLE_TABLE_ROW,
+       ATSPI_ROLE_TREE_ITEM,
+       ATSPI_ROLE_DOCUMENT_SPREADSHEET,
+       ATSPI_ROLE_DOCUMENT_PRESENTATION,
+       ATSPI_ROLE_DOCUMENT_TEXT,
+       ATSPI_ROLE_DOCUMENT_WEB,
+       ATSPI_ROLE_DOCUMENT_EMAIL,
+       ATSPI_ROLE_COMMENT,
+       ATSPI_ROLE_LIST_BOX,
+       ATSPI_ROLE_GROUPING,
+       ATSPI_ROLE_IMAGE_MAP,
+       ATSPI_ROLE_NOTIFICATION,
+       ATSPI_ROLE_INFO_BAR,
+       ATSPI_ROLE_LEVEL_BAR,
+       ATSPI_ROLE_LAST_DEFINED,
 } AtspiRole;
 
-typedef enum
-{
-   ATSPI_STATE_INVALID,
-   ATSPI_STATE_ACTIVE,
-   ATSPI_STATE_ARMED,
-   ATSPI_STATE_BUSY,
-   ATSPI_STATE_CHECKED,
-   ATSPI_STATE_COLLAPSED,
-   ATSPI_STATE_DEFUNCT,
-   ATSPI_STATE_EDITABLE,
-   ATSPI_STATE_ENABLED,
-   ATSPI_STATE_EXPANDABLE,
-   ATSPI_STATE_EXPANDED,
-   ATSPI_STATE_FOCUSABLE,
-   ATSPI_STATE_FOCUSED,
-   ATSPI_STATE_HAS_TOOLTIP,
-   ATSPI_STATE_HORIZONTAL,
-   ATSPI_STATE_ICONIFIED,
-   ATSPI_STATE_MODAL,
-   ATSPI_STATE_MULTI_LINE,
-   ATSPI_STATE_MULTISELECTABLE,
-   ATSPI_STATE_OPAQUE,
-   ATSPI_STATE_PRESSED,
-   ATSPI_STATE_RESIZABLE,
-   ATSPI_STATE_SELECTABLE,
-   ATSPI_STATE_SELECTED,
-   ATSPI_STATE_SENSITIVE,
-   ATSPI_STATE_SHOWING,
-   ATSPI_STATE_SINGLE_LINE,
-   ATSPI_STATE_STALE,
-   ATSPI_STATE_TRANSIENT,
-   ATSPI_STATE_VERTICAL,
-   ATSPI_STATE_VISIBLE,
-   ATSPI_STATE_MANAGES_DESCENDANTS,
-   ATSPI_STATE_INDETERMINATE,
-   ATSPI_STATE_REQUIRED,
-   ATSPI_STATE_TRUNCATED,
-   ATSPI_STATE_ANIMATED,
-   ATSPI_STATE_INVALID_ENTRY,
-   ATSPI_STATE_SUPPORTS_AUTOCOMPLETION,
-   ATSPI_STATE_SELECTABLE_TEXT,
-   ATSPI_STATE_IS_DEFAULT,
-   ATSPI_STATE_VISITED,
-   ATSPI_STATE_HIGHLIGHTED,
-   ATSPI_STATE_HIGHLIGHTABLE,
-   ATSPI_STATE_LAST_DEFINED,
+typedef enum {
+       ATSPI_STATE_INVALID,
+       ATSPI_STATE_ACTIVE,
+       ATSPI_STATE_ARMED,
+       ATSPI_STATE_BUSY,
+       ATSPI_STATE_CHECKED,
+       ATSPI_STATE_COLLAPSED,
+       ATSPI_STATE_DEFUNCT,
+       ATSPI_STATE_EDITABLE,
+       ATSPI_STATE_ENABLED,
+       ATSPI_STATE_EXPANDABLE,
+       ATSPI_STATE_EXPANDED,
+       ATSPI_STATE_FOCUSABLE,
+       ATSPI_STATE_FOCUSED,
+       ATSPI_STATE_HAS_TOOLTIP,
+       ATSPI_STATE_HORIZONTAL,
+       ATSPI_STATE_ICONIFIED,
+       ATSPI_STATE_MODAL,
+       ATSPI_STATE_MULTI_LINE,
+       ATSPI_STATE_MULTISELECTABLE,
+       ATSPI_STATE_OPAQUE,
+       ATSPI_STATE_PRESSED,
+       ATSPI_STATE_RESIZABLE,
+       ATSPI_STATE_SELECTABLE,
+       ATSPI_STATE_SELECTED,
+       ATSPI_STATE_SENSITIVE,
+       ATSPI_STATE_SHOWING,
+       ATSPI_STATE_SINGLE_LINE,
+       ATSPI_STATE_STALE,
+       ATSPI_STATE_TRANSIENT,
+       ATSPI_STATE_VERTICAL,
+       ATSPI_STATE_VISIBLE,
+       ATSPI_STATE_MANAGES_DESCENDANTS,
+       ATSPI_STATE_INDETERMINATE,
+       ATSPI_STATE_REQUIRED,
+       ATSPI_STATE_TRUNCATED,
+       ATSPI_STATE_ANIMATED,
+       ATSPI_STATE_INVALID_ENTRY,
+       ATSPI_STATE_SUPPORTS_AUTOCOMPLETION,
+       ATSPI_STATE_SELECTABLE_TEXT,
+       ATSPI_STATE_IS_DEFAULT,
+       ATSPI_STATE_VISITED,
+       ATSPI_STATE_HIGHLIGHTED,
+       ATSPI_STATE_HIGHLIGHTABLE,
+       ATSPI_STATE_LAST_DEFINED,
 } AtspiStateType;
 
-typedef enum
-{
-    ATSPI_RELATION_NULL,
-    ATSPI_RELATION_LABEL_FOR,
-    ATSPI_RELATION_LABELLED_BY,
-    ATSPI_RELATION_CONTROLLER_FOR,
-    ATSPI_RELATION_CONTROLLED_BY,
-    ATSPI_RELATION_MEMBER_OF,
-    ATSPI_RELATION_TOOLTIP_FOR,
-    ATSPI_RELATION_NODE_CHILD_OF,
-    ATSPI_RELATION_NODE_PARENT_OF,
-    ATSPI_RELATION_EXTENDED,
-    ATSPI_RELATION_FLOWS_TO,
-    ATSPI_RELATION_FLOWS_FROM,
-    ATSPI_RELATION_SUBWINDOW_OF,
-    ATSPI_RELATION_EMBEDS,
-    ATSPI_RELATION_EMBEDDED_BY,
-    ATSPI_RELATION_POPUP_FOR,
-    ATSPI_RELATION_PARENT_WINDOW_OF,
-    ATSPI_RELATION_DESCRIPTION_FOR,
-    ATSPI_RELATION_DESCRIBED_BY,
-    ATSPI_RELATION_LAST_DEFINED,
+typedef enum {
+       ATSPI_RELATION_NULL,
+       ATSPI_RELATION_LABEL_FOR,
+       ATSPI_RELATION_LABELLED_BY,
+       ATSPI_RELATION_CONTROLLER_FOR,
+       ATSPI_RELATION_CONTROLLED_BY,
+       ATSPI_RELATION_MEMBER_OF,
+       ATSPI_RELATION_TOOLTIP_FOR,
+       ATSPI_RELATION_NODE_CHILD_OF,
+       ATSPI_RELATION_NODE_PARENT_OF,
+       ATSPI_RELATION_EXTENDED,
+       ATSPI_RELATION_FLOWS_TO,
+       ATSPI_RELATION_FLOWS_FROM,
+       ATSPI_RELATION_SUBWINDOW_OF,
+       ATSPI_RELATION_EMBEDS,
+       ATSPI_RELATION_EMBEDDED_BY,
+       ATSPI_RELATION_POPUP_FOR,
+       ATSPI_RELATION_PARENT_WINDOW_OF,
+       ATSPI_RELATION_DESCRIPTION_FOR,
+       ATSPI_RELATION_DESCRIBED_BY,
+       ATSPI_RELATION_LAST_DEFINED,
 } AtspiRelationType;
 
-struct _AtspiApplication
-{
-   GObject parent;
-   GHashTable *hash;
-   char *bus_name;
-   DBusConnection *bus;
-   AtspiAccessible *root;
-   AtspiCache cache;
-   gchar *toolkit_name;
-   gchar *toolkit_version;
-   gchar *atspi_version;
-   struct timeval time_added;
+struct _AtspiApplication {
+       GObject parent;
+       GHashTable *hash;
+       char *bus_name;
+       DBusConnection *bus;
+       AtspiAccessible *root;
+       AtspiCache cache;
+       gchar *toolkit_name;
+       gchar *toolkit_version;
+       gchar *atspi_version;
+       struct timeval time_added;
 };
 
-struct _AtspiObject
-{
-   GObject parent;
-   AtspiApplication *app;
-   char *path;
+struct _AtspiObject {
+       GObject parent;
+       AtspiApplication *app;
+       char *path;
 };
 
-struct _AtspiAccessible
-{
-   //GObject parent;
-   AtspiObject parent;
-   AtspiAccessible *accessible_parent;
-   GList *children;
-   AtspiRole role;
-   gint interfaces;
-   char *name;
-   char *description;
-   AtspiStateSet *states;
-   GHashTable *attributes;
-   guint cached_properties;
-   gint index_in_parent;
-   gint child_count;
+struct _AtspiAccessible {
+       //GObject parent;
+       AtspiObject parent;
+       AtspiAccessible *accessible_parent;
+       GList *children;
+       AtspiRole role;
+       gint interfaces;
+       char *name;
+       char *description;
+       AtspiStateSet *states;
+       GHashTable *attributes;
+       guint cached_properties;
+       gint index_in_parent;
+       gint child_count;
 };
 
-struct _AtspiAccessibleClass
-{
-   GObjectClass parent_class;
+struct _AtspiAccessibleClass {
+       GObjectClass parent_class;
 };
 
-struct _AtspiActionClass
-{
-   GObjectClass parent_class;
+struct _AtspiActionClass {
+       GObjectClass parent_class;
 };
 
-struct _AtspiComponentClass
-{
-   GObjectClass parent_class;
+struct _AtspiComponentClass {
+       GObjectClass parent_class;
 };
 
-struct _AtspiEvent
-{
-   gchar  *type;
-   AtspiAccessible  *source;
-   gint         detail1;
-   gint         detail2;
-   GValue any_data;
+struct _AtspiEvent {
+       gchar  *type;
+       AtspiAccessible  *source;
+       gint         detail1;
+       gint         detail2;
+       GValue any_data;
 };
 
-struct _AtspiStateSet
-{
-   GObject parent;
-   struct _AtspiAccessible *accessible;
-   gint64 states;
+struct _AtspiStateSet {
+       GObject parent;
+       struct _AtspiAccessible *accessible;
+       gint64 states;
 };
 
-struct _AtspiStateSetClass
-{
-   GObjectClass parent_class;
+struct _AtspiStateSetClass {
+       GObjectClass parent_class;
 };
 
-struct _AtspiEventListener
-{
-   GObject parent;
-   AtspiEventListenerCB callback;
-   void *user_data;
-   GDestroyNotify cb_destroyed;
+struct _AtspiEventListener {
+       GObject parent;
+       AtspiEventListenerCB callback;
+       void *user_data;
+       GDestroyNotify cb_destroyed;
 };
 
-struct _AtspiAction
-{
-   GTypeInterface parent;
+struct _AtspiAction {
+       GTypeInterface parent;
 };
-struct _AtspiText
-{
-   GTypeInterface parent;
+struct _AtspiText {
+       GTypeInterface parent;
 };
 
-struct _AtspiEditableText
-{
-   GTypeInterface parent;
+struct _AtspiEditableText {
+       GTypeInterface parent;
 };
 
-struct _AtspiValue
-{
-   GTypeInterface parent;
+struct _AtspiValue {
+       GTypeInterface parent;
 };
 
-struct _AtspiComponent
-{
-   GTypeInterface parent;
-   AtspiRole *role;
+struct _AtspiComponent {
+       GTypeInterface parent;
+       AtspiRole *role;
 };
 
-struct _AtspiScrollable
-{
-   GTypeInterface parent;
+struct _AtspiScrollable {
+       GTypeInterface parent;
 };
 
-struct _AtspiRelation
-{
-   GTypeInterface parent;
+struct _AtspiRelation {
+       GTypeInterface parent;
 };
 
-struct _AtspiRect
-{
-   gint x;
-   gint y;
-   gint width;
-   gint height;
+struct _AtspiRect {
+       gint x;
+       gint y;
+       gint width;
+       gint height;
 };
 
-typedef enum
-{
-   ATSPI_COORD_TYPE_SCREEN,
-   ATSPI_COORD_TYPE_WINDOW,
+typedef enum {
+       ATSPI_COORD_TYPE_SCREEN,
+       ATSPI_COORD_TYPE_WINDOW,
 } AtspiCoordType;
 
-gchar * atspi_accessible_get_name (AtspiAccessible *obj, GError **error);
-gchar * atspi_accessible_get_role_name (AtspiAccessible *obj, GError **error);
-gchar * atspi_accessible_get_localized_role_name (AtspiAccessible *obj, GError **error);
-gchar * atspi_accessible_get_toolkit_name (AtspiAccessible *obj, GError **error);
-gchar * atspi_accessible_get_description (AtspiAccessible *obj, GError **error);
-AtspiText * atspi_accessible_get_text_iface (AtspiAccessible *obj);
-AtspiAction * atspi_accessible_get_action_iface (AtspiAccessible *obj);
-gint atspi_text_get_character_count (AtspiText *obj, GError **error);
-gint atspi_text_get_caret_offset (AtspiText *obj, GError **error);
-gchar * atspi_text_get_text (AtspiText *obj, gint start_offset, gint end_offset, GError **error);
-AtspiValue * atspi_accessible_get_value_iface (AtspiAccessible *obj);
-gdouble atspi_value_get_current_value (AtspiValue *obj, GError **error);
-gdouble atspi_value_get_maximum_value (AtspiValue *obj, GError **error);
-gdouble atspi_value_get_minimum_value (AtspiValue *obj, GError **error);
-AtspiEventListener *atspi_event_listener_new (AtspiEventListenerCB callback,
-      gpointer user_data,
-      GDestroyNotify callback_destroyed);
-gboolean atspi_event_listener_register (AtspiEventListener *listener,
-                                        const gchar *event_type,
-                                        GError **error);
-gboolean atspi_event_listener_deregister (AtspiEventListener *listener,
-      const gchar *event_type,
-      GError **error);
-AtspiStateSet * atspi_accessible_get_state_set (AtspiAccessible *obj);
-gboolean atspi_state_set_contains (AtspiStateSet *set, AtspiStateType state);
-void atspi_state_set_add (AtspiStateSet *set, AtspiStateType state);
-GArray *atspi_state_set_get_states (AtspiStateSet *set);
-AtspiStateSet * atspi_state_set_new (GArray *states);
+gchar *atspi_accessible_get_name(AtspiAccessible *obj, GError **error);
+gchar *atspi_accessible_get_role_name(AtspiAccessible *obj, GError **error);
+gchar *atspi_accessible_get_localized_role_name(AtspiAccessible *obj, GError **error);
+gchar *atspi_accessible_get_toolkit_name(AtspiAccessible *obj, GError **error);
+gchar *atspi_accessible_get_description(AtspiAccessible *obj, GError **error);
+AtspiText *atspi_accessible_get_text_iface(AtspiAccessible *obj);
+AtspiAction *atspi_accessible_get_action_iface(AtspiAccessible *obj);
+gint atspi_text_get_character_count(AtspiText *obj, GError **error);
+gint atspi_text_get_caret_offset(AtspiText *obj, GError **error);
+gchar *atspi_text_get_text(AtspiText *obj, gint start_offset, gint end_offset, GError **error);
+AtspiValue *atspi_accessible_get_value_iface(AtspiAccessible *obj);
+gdouble atspi_value_get_current_value(AtspiValue *obj, GError **error);
+gdouble atspi_value_get_maximum_value(AtspiValue *obj, GError **error);
+gdouble atspi_value_get_minimum_value(AtspiValue *obj, GError **error);
+AtspiEventListener *atspi_event_listener_new(AtspiEventListenerCB callback,
+               gpointer user_data,
+               GDestroyNotify callback_destroyed);
+gboolean atspi_event_listener_register(AtspiEventListener *listener,
+                                                                          const gchar *event_type,
+                                                                          GError **error);
+gboolean atspi_event_listener_deregister(AtspiEventListener *listener,
+               const gchar *event_type,
+               GError **error);
+AtspiStateSet *atspi_accessible_get_state_set(AtspiAccessible *obj);
+gboolean atspi_state_set_contains(AtspiStateSet *set, AtspiStateType state);
+void atspi_state_set_add(AtspiStateSet *set, AtspiStateType state);
+GArray *atspi_state_set_get_states(AtspiStateSet *set);
+AtspiStateSet *atspi_state_set_new(GArray *states);
 
 void atspi_alloc_memory(void);
 
 void atspi_free_memory(void);
-gboolean atspi_component_grab_highlight (AtspiComponent *obj, GError **error);
-AtspiScrollable *atspi_accessible_get_scrollable (AtspiAccessible *accessible);
-gboolean atspi_component_clear_highlight (AtspiComponent *obj, GError **error);
-AtspiRole atspi_accessible_get_role (AtspiAccessible *obj, GError **error);
-gint atspi_accessible_get_child_count (AtspiAccessible *obj, GError **error);
-AtspiAccessible * atspi_accessible_get_child_at_index (AtspiAccessible *obj, gint child_index, GError **error);
-AtspiComponent * atspi_accessible_get_component_iface (AtspiAccessible *obj);
-AtspiRect *atspi_component_get_extents (AtspiComponent *obj, AtspiCoordType ctype, GError **error);
+gboolean atspi_component_grab_highlight(AtspiComponent *obj, GError **error);
+AtspiScrollable *atspi_accessible_get_scrollable(AtspiAccessible *accessible);
+gboolean atspi_component_clear_highlight(AtspiComponent *obj, GError **error);
+AtspiRole atspi_accessible_get_role(AtspiAccessible *obj, GError **error);
+gint atspi_accessible_get_child_count(AtspiAccessible *obj, GError **error);
+AtspiAccessible *atspi_accessible_get_child_at_index(AtspiAccessible *obj, gint child_index, GError **error);
+AtspiComponent *atspi_accessible_get_component_iface(AtspiAccessible *obj);
+AtspiRect *atspi_component_get_extents(AtspiComponent *obj, AtspiCoordType ctype, GError **error);
 AtspiAccessible *atspi_create_accessible(void);
 void atspi_delete_accessible(AtspiAccessible *obj);
 void atspi_accessible_add_child(AtspiAccessible *obj, AtspiAccessible *child);
 void atpis_accessible_remove_children(AtspiAccessible *obj);
-AtspiEditableText * atspi_accessible_get_editable_text_iface (AtspiAccessible *obj);
-GArray * atspi_accessible_get_relation_set (AtspiAccessible *obj, GError **error);
-AtspiRelationType atspi_relation_get_relation_type (AtspiRelation *obj);
-gint atspi_relation_get_n_targets (AtspiRelation *obj);
-AtspiAccessible * atspi_relation_get_target (AtspiRelation *obj, gint i);
-AtspiAccessible * atspi_accessible_get_parent (AtspiAccessible *obj, GError **error);
-gboolean atspi_component_contains (AtspiComponent *obj, gint x, gint y, AtspiCoordType ctype, GError **error);
+AtspiEditableText *atspi_accessible_get_editable_text_iface(AtspiAccessible *obj);
+GArray *atspi_accessible_get_relation_set(AtspiAccessible *obj, GError **error);
+AtspiRelationType atspi_relation_get_relation_type(AtspiRelation *obj);
+gint atspi_relation_get_n_targets(AtspiRelation *obj);
+AtspiAccessible *atspi_relation_get_target(AtspiRelation *obj, gint i);
+AtspiAccessible *atspi_accessible_get_parent(AtspiAccessible *obj, GError **error);
+gboolean atspi_component_contains(AtspiComponent *obj, gint x, gint y, AtspiCoordType ctype, GError **error);
 int atspi_component_get_highlight_index(AtspiComponent *obj, GError **error);
-gint atspi_accessible_get_index_in_parent (AtspiAccessible *obj, GError **error);
-AtspiAction * atspi_accessible_get_action_iface (AtspiAccessible *obj);
-gint atspi_action_get_n_actions (AtspiAction *obj, GError **error);
-gchar * atspi_action_get_action_name (AtspiAction *obj, gint i, GError **error);
-gboolean atspi_action_do_action (AtspiAction *obj, gint i, GError **error);
+gint atspi_accessible_get_index_in_parent(AtspiAccessible *obj, GError **error);
+AtspiAction *atspi_accessible_get_action_iface(AtspiAccessible *obj);
+gint atspi_action_get_n_actions(AtspiAction *obj, GError **error);
+gchar *atspi_action_get_action_name(AtspiAction *obj, gint i, GError **error);
+gboolean atspi_action_do_action(AtspiAction *obj, gint i, GError **error);
 int atspi_exit(void);
 
 #endif /*__ATSPI_H__*/
index 46269948ac049de318de89a7c0962ed1d7db195d..9caddcc03119b76750cf80782cb3faa15751f7cf 100644 (file)
@@ -501,54 +501,54 @@ END_TEST
 
 START_TEST(spi_flat_navi_context_last_null_parameter)
 {
-   AtspiAccessible *last = flat_navi_context_last(NULL);
-   fail_if(last);
+       AtspiAccessible *last = flat_navi_context_last(NULL);
+       fail_if(last);
 }
 END_TEST
 
 START_TEST(spi_flat_navi_context_last_valid_parameter)
 {
-   AtspiAccessible *last = flat_navi_context_last(ctx);
-   fail_if(!last || last != child6);
+       AtspiAccessible *last = flat_navi_context_last(ctx);
+       fail_if(!last || last != child6);
 }
 END_TEST
 
 START_TEST(spi_flat_navi_context_first_null_parameter)
 {
-   AtspiAccessible *first = flat_navi_context_first(NULL);
-   fail_if(first);
+       AtspiAccessible *first = flat_navi_context_first(NULL);
+       fail_if(first);
 }
 END_TEST
 
 START_TEST(spi_flat_navi_context_first_valid_parameter)
 {
-   AtspiAccessible *first = flat_navi_context_first(ctx);
-   fail_if(!first || first != child5);
+       AtspiAccessible *first = flat_navi_context_first(ctx);
+       fail_if(!first || first != child5);
 }
 END_TEST
 
 START_TEST(spi_flat_navi_context_current_set_null_parameters)
 {
-   Eina_Bool ret = flat_navi_context_current_set(NULL, NULL);
-   fail_if(ret != EINA_FALSE);
-   ret = flat_navi_context_current_set(ctx, NULL);
-   fail_if(ret != EINA_FALSE);
-   AtspiAccessible *last = flat_navi_context_last(ctx);
-   ret = flat_navi_context_current_set(NULL, last);
-   fail_if(ret != EINA_FALSE);
+       Eina_Bool ret = flat_navi_context_current_set(NULL, NULL);
+       fail_if(ret != EINA_FALSE);
+       ret = flat_navi_context_current_set(ctx, NULL);
+       fail_if(ret != EINA_FALSE);
+       AtspiAccessible *last = flat_navi_context_last(ctx);
+       ret = flat_navi_context_current_set(NULL, last);
+       fail_if(ret != EINA_FALSE);
 }
 END_TEST
 
 START_TEST(spi_flat_navi_context_current_set_valid_parameters)
 {
-   AtspiAccessible *last = flat_navi_context_last(ctx);
-   Eina_Bool ret = flat_navi_context_current_set(ctx, last);
-   AtspiAccessible *current = flat_navi_context_current_get(ctx);
-   fail_if(ret != EINA_TRUE || current != last);
+       AtspiAccessible *last = flat_navi_context_last(ctx);
+       Eina_Bool ret = flat_navi_context_current_set(ctx, last);
+       AtspiAccessible *current = flat_navi_context_current_get(ctx);
+       fail_if(ret != EINA_TRUE || current != last);
 }
 END_TEST
 
-Suite * screen_reader_suite(void)
+Suite *screen_reader_suite(void)
 {
        Suite *s;
        TCase *tc_spi_screen_reader_init;