[java-atk-wrapper] JNI: format jawutil style



commit 1cfd5bac7f8e264a130c32a2932ba15e9b3a41bc
Author: Magdalen Berns <m berns thismagpie com>
Date:   Fri Feb 20 13:50:14 2015 +0000

    JNI: format jawutil style
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=744856

 jni/src/jawutil.c | 1230 ++++++++++++++++++++++++++---------------------------
 1 files changed, 604 insertions(+), 626 deletions(-)
---
diff --git a/jni/src/jawutil.c b/jni/src/jawutil.c
index af899ce..fa0d5f3 100644
--- a/jni/src/jawutil.c
+++ b/jni/src/jawutil.c
@@ -1,6 +1,7 @@
 /*
  * Java ATK Wrapper for GNOME
  * Copyright (C) 2009 Sun Microsystems Inc.
+ * Copyright (C) 2015 Magdalen Berns <m berns thismagpie com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,23 +29,23 @@
 #include "jawobject.h"
 
 /* AtkUtil */
-static void            jaw_util_class_init                     (JawUtilClass           *klass);
-
-static guint           jaw_util_add_global_event_listener      (GSignalEmissionHook    listener,
-                                                                const gchar            *event_type);
-static void            jaw_util_remove_global_event_listener   (guint                  remove_listener);
-static guint           jaw_util_add_key_event_listener         (AtkKeySnoopFunc        listener,
-                                                                gpointer               data);
-static void            jaw_util_remove_key_event_listener      (guint                  remove_listener);
-static AtkObject*      jaw_util_get_root                       (void);
-static const gchar* jaw_util_get_toolkit_name          (void);
-static const gchar* jaw_util_get_toolkit_version       (void);
-
-static void            _listener_info_destroy                  (gpointer               data);
-static guint            add_listener                           (GSignalEmissionHook    listener,
-                                                                 const gchar            *object_type,
-                                                                 const gchar            *signal,
-                                                                 const gchar            *hook_data);
+static void jaw_util_class_init(JawUtilClass *klass);
+
+static guint jaw_util_add_global_event_listener(GSignalEmissionHook listener,
+                                                const gchar *event_type);
+static void jaw_util_remove_global_event_listener(guint remove_listener);
+static guint jaw_util_add_key_event_listener(AtkKeySnoopFunc listener,
+                                             gpointer data);
+static void jaw_util_remove_key_event_listener(guint remove_listener);
+static AtkObject* jaw_util_get_root(void);
+static const gchar* jaw_util_get_toolkit_name(void);
+static const gchar* jaw_util_get_toolkit_version(void);
+
+static void _listener_info_destroy(gpointer data);
+static guint add_listener(GSignalEmissionHook listener,
+                          const gchar         *object_type,
+                          const gchar         *signal,
+                          const gchar         *hook_data);
 
 static GHashTable *listener_list = NULL;
 static gint listener_idx = 1;
@@ -54,9 +55,9 @@ typedef struct _JawUtilListenerInfo JawUtilListenerInfo;
 
 struct _JawUtilListenerInfo
 {
-       gint    key;
-       guint   signal_id;
-       gulong  hook_id;
+  gint key;
+  guint signal_id;
+  gulong hook_id;
 };
 
 JavaVM *cachedJVM;
@@ -64,96 +65,90 @@ JavaVM *cachedJVM;
 GType
 jaw_util_get_type(void)
 {
-       static GType type = 0;
-
-       if (!type) {
-               static const GTypeInfo tinfo = {
-                       sizeof(JawUtilClass),
-                       (GBaseInitFunc) NULL, /*base init*/
-                       (GBaseFinalizeFunc) NULL, /*base finalize */
-                       (GClassInitFunc) jaw_util_class_init, /* class init */
-                       (GClassFinalizeFunc) NULL, /*class finalize */
-                       NULL, /* class data */
-                       sizeof(JawUtil), /* instance size */
-                       0, /* nb preallocs */
-                       (GInstanceInitFunc) NULL, /* instance init */
-                       NULL /* value table */
-               };
-
-               type = g_type_register_static(ATK_TYPE_UTIL,
-                               "JawUtil", &tinfo, 0);
-       }
-
-       return type;
+  static GType type = 0;
+
+  if (!type) {
+    static const GTypeInfo tinfo = {
+      sizeof(JawUtilClass),
+      (GBaseInitFunc) NULL, /*base init*/
+      (GBaseFinalizeFunc) NULL, /*base finalize */
+      (GClassInitFunc) jaw_util_class_init, /* class init */
+      (GClassFinalizeFunc) NULL, /*class finalize */
+      NULL, /* class data */
+      sizeof(JawUtil), /* instance size */
+      0, /* nb preallocs */
+      (GInstanceInitFunc) NULL, /* instance init */
+      NULL /* value table */
+    };
+
+    type = g_type_register_static(ATK_TYPE_UTIL, "JawUtil", &tinfo, 0);
+  }
+
+  return type;
 }
 
 static void
 jaw_util_class_init(JawUtilClass *kclass)
 {
-       AtkUtilClass *atk_class;
-       gpointer data;
-
-       data = g_type_class_peek (ATK_TYPE_UTIL);
-       atk_class = ATK_UTIL_CLASS (data);
-
-       atk_class->add_global_event_listener = 
-               jaw_util_add_global_event_listener;
-       atk_class->remove_global_event_listener = 
-               jaw_util_remove_global_event_listener;
-       atk_class->add_key_event_listener = 
-               jaw_util_add_key_event_listener;
-       atk_class->remove_key_event_listener = 
-               jaw_util_remove_key_event_listener;
-       atk_class->get_root = jaw_util_get_root;
-       atk_class->get_toolkit_name = jaw_util_get_toolkit_name;
-       atk_class->get_toolkit_version = jaw_util_get_toolkit_version;
-       
-       listener_list = g_hash_table_new_full(
-                               g_int_hash, g_int_equal,
-                               NULL, _listener_info_destroy);
+  AtkUtilClass *atk_class;
+  gpointer data;
+
+  data = g_type_class_peek (ATK_TYPE_UTIL);
+  atk_class = ATK_UTIL_CLASS (data);
+
+  atk_class->add_global_event_listener = jaw_util_add_global_event_listener;
+  atk_class->remove_global_event_listener = jaw_util_remove_global_event_listener;
+  atk_class->add_key_event_listener = jaw_util_add_key_event_listener;
+  atk_class->remove_key_event_listener = jaw_util_remove_key_event_listener;
+  atk_class->get_root = jaw_util_get_root;
+  atk_class->get_toolkit_name = jaw_util_get_toolkit_name;
+  atk_class->get_toolkit_version = jaw_util_get_toolkit_version;
+
+  listener_list = g_hash_table_new_full(g_int_hash,
+                                        g_int_equal,
+                                        NULL,
+                                        _listener_info_destroy);
 }
 
 static guint
-jaw_util_add_global_event_listener (GSignalEmissionHook listener,
-                               const gchar *event_type)
+jaw_util_add_global_event_listener(GSignalEmissionHook listener,
+                                   const gchar *event_type)
 {
-       guint rc = 0;
-       gchar **split_string;
-
-       g_type_class_unref( g_type_class_ref(JAW_TYPE_OBJECT));
-       split_string = g_strsplit (event_type, ":", 3);
-
-       if (split_string) {
-               if (!strcmp ("window", split_string[0])) {
-                       rc = add_listener (listener, "JawObject", split_string[1], event_type);
-               } else {
-                       rc = add_listener (listener, split_string[1], split_string[2], event_type);
-               }
-               
-               g_strfreev (split_string);
-       }
-
-       return rc;
+  guint rc = 0;
+  gchar **split_string;
+
+  g_type_class_unref( g_type_class_ref(JAW_TYPE_OBJECT));
+  split_string = g_strsplit (event_type, ":", 3);
+
+  if (split_string) {
+    if (!strcmp ("window", split_string[0])) {
+      rc = add_listener (listener, "JawObject", split_string[1], event_type);
+    } else {
+      rc = add_listener (listener, split_string[1], split_string[2], event_type);
+    }
+
+    g_strfreev (split_string);
+  }
+
+  return rc;
 }
 
 static void
 jaw_util_remove_global_event_listener (guint remove_listener)
 {
-       if (remove_listener > 0) {
-               JawUtilListenerInfo *listener_info;
-               gint tmp_idx = remove_listener;
-
-               listener_info = (JawUtilListenerInfo*)g_hash_table_lookup(
-                               listener_list, &tmp_idx);
+  if (remove_listener > 0) {
+    JawUtilListenerInfo *listener_info;
+    gint tmp_idx = remove_listener;
 
-               if (listener_info != NULL) {
-                       if (listener_info->hook_id != 0 && listener_info->signal_id != 0) {
-                               g_signal_remove_emission_hook(
-                                               listener_info->signal_id,
-                                               listener_info->hook_id);
+    listener_info = (JawUtilListenerInfo*)g_hash_table_lookup(listener_list, &tmp_idx);
 
-                               g_hash_table_remove(listener_list, &tmp_idx);
-                       } else {
+    if (listener_info != NULL)
+    {
+      if (listener_info->hook_id != 0 && listener_info->signal_id != 0)
+      {
+        g_signal_remove_emission_hook(listener_info->signal_id, listener_info->hook_id);
+        g_hash_table_remove(listener_list, &tmp_idx);
+      } else {
         g_warning("Invalid listener hook_id %ld or signal_id %d\n",
                   listener_info->hook_id, listener_info->signal_id);
       }
@@ -168,243 +163,280 @@ jaw_util_remove_global_event_listener (guint remove_listener)
 }
 
 typedef struct _JawKeyListenerInfo{
-       AtkKeySnoopFunc listener;
-       gpointer data;
+  AtkKeySnoopFunc listener;
+  gpointer data;
 }JawKeyListenerInfo;
 
 static gboolean
 notify_hf (gpointer key, gpointer value, gpointer data)
 {
-       JawKeyListenerInfo *info = (JawKeyListenerInfo*)value;
-       AtkKeyEventStruct *key_event = (AtkKeyEventStruct*)data;
+  JawKeyListenerInfo *info = (JawKeyListenerInfo*)value;
+  AtkKeyEventStruct *key_event = (AtkKeyEventStruct*)data;
 
-       AtkKeySnoopFunc func = info->listener;
-       gpointer func_data = info->data;
+  AtkKeySnoopFunc func = info->listener;
+  gpointer func_data = info->data;
 
-       return (*func)(key_event, func_data) ? TRUE : FALSE;
+  return (*func)(key_event, func_data) ? TRUE : FALSE;
 }
 
 static void
 insert_hf (gpointer key, gpointer value, gpointer data)
 {
-       GHashTable *new_table = (GHashTable *) data;
-       g_hash_table_insert (new_table, key, value);
+  GHashTable *new_table = (GHashTable *) data;
+  g_hash_table_insert (new_table, key, value);
 }
 
 gboolean
 jaw_util_dispatch_key_event (AtkKeyEventStruct *event)
 {
-       gint consumed = 0;
-       if (key_listener_list) {
-               GHashTable *new_hash = g_hash_table_new(NULL, NULL);
-               g_hash_table_foreach(key_listener_list, insert_hf, new_hash);
-               consumed = g_hash_table_foreach_steal(new_hash, notify_hf, event);
-               g_hash_table_destroy(new_hash);
-       }
-
-       return (consumed > 0) ? TRUE : FALSE;
+  gint consumed = 0;
+  if (key_listener_list) {
+    GHashTable *new_hash = g_hash_table_new(NULL, NULL);
+    g_hash_table_foreach(key_listener_list, insert_hf, new_hash);
+    consumed = g_hash_table_foreach_steal(new_hash, notify_hf, event);
+    g_hash_table_destroy(new_hash);
+  }
+
+  return (consumed > 0) ? TRUE : FALSE;
 }
 
 static guint
-jaw_util_add_key_event_listener (AtkKeySnoopFunc listener,
-                               gpointer data)
+jaw_util_add_key_event_listener (AtkKeySnoopFunc listener, gpointer data)
 {
-       static guint key = 0;
+  static guint key = 0;
 
-       if (!listener) {
-               return 0;
-       }
+  if (!listener) {
+    return 0;
+  }
 
-       if (!key_listener_list) {
-               key_listener_list = g_hash_table_new(NULL, NULL);
-       }
+  if (!key_listener_list) {
+    key_listener_list = g_hash_table_new(NULL, NULL);
+  }
 
-       JawKeyListenerInfo *info = g_new0(JawKeyListenerInfo, 1);
-       info->listener = listener;
-       info->data = data;
+  JawKeyListenerInfo *info = g_new0(JawKeyListenerInfo, 1);
+  info->listener = listener;
+  info->data = data;
 
-       key++;
-       g_hash_table_insert(key_listener_list, GUINT_TO_POINTER(key), info);
+  key++;
+  g_hash_table_insert(key_listener_list, GUINT_TO_POINTER(key), info);
 
-       return key;
+  return key;
 }
 
 static void
 jaw_util_remove_key_event_listener (guint remove_listener)
 {
-       gpointer *value = g_hash_table_lookup(
-                       key_listener_list, GUINT_TO_POINTER(remove_listener));
-       if (value) {
-               g_free(value);
-       }
+  gpointer *value = g_hash_table_lookup(key_listener_list,
+                                        GUINT_TO_POINTER(remove_listener));
+  if (value)
+    g_free(value);
 
-       g_hash_table_remove(key_listener_list, GUINT_TO_POINTER(remove_listener));
+  g_hash_table_remove(key_listener_list, GUINT_TO_POINTER(remove_listener));
 }
 
 static AtkObject*
 jaw_util_get_root (void)
 {
-       static JawToplevel *root = NULL;
+  static JawToplevel *root = NULL;
 
-       if (!root) {
-               root = g_object_new(JAW_TYPE_TOPLEVEL, NULL);
-               atk_object_initialize(ATK_OBJECT(root), NULL);
-       }
+  if (!root) {
+    root = g_object_new(JAW_TYPE_TOPLEVEL, NULL);
+    atk_object_initialize(ATK_OBJECT(root), NULL);
+  }
 
-       return ATK_OBJECT(root);
+  return ATK_OBJECT(root);
 }
 
 static const gchar*
 jaw_util_get_toolkit_name (void)
 {
-       return "J2SE-access-bridge";
+  return "J2SE-access-bridge";
 }
 
 static const gchar*
 jaw_util_get_toolkit_version (void)
 {
-       return "1.0";
+  return "1.0";
 }
 
 static void
 _listener_info_destroy (gpointer data)
 {
-       g_free (data);
+  g_free (data);
 }
 
 static guint
-add_listener ( GSignalEmissionHook listener,
-               const gchar         *object_type,
-               const gchar         *signal,
-               const gchar         *hook_data)
+add_listener(GSignalEmissionHook listener,
+             const gchar         *object_type,
+             const gchar         *signal,
+             const gchar         *hook_data)
 {
-       GType type;
-       guint signal_id;
-       gint  rc = 0;
-
-       type = g_type_from_name (object_type);
-       if (type)
-       {
-               signal_id  = g_signal_lookup (signal, type);
-               if (signal_id > 0)
-               {
-                       JawUtilListenerInfo *listener_info;
-
-                       rc = listener_idx;
-
-                       listener_info = g_malloc(sizeof(JawUtilListenerInfo));
-                       listener_info->key = listener_idx;
-                       listener_info->hook_id =
-                               g_signal_add_emission_hook (
-                                               signal_id, 0, listener,
-                                               g_strdup (hook_data),
-                                               (GDestroyNotify) g_free);
-                       listener_info->signal_id = signal_id;
-
-                       g_hash_table_insert(listener_list, &(listener_info->key), listener_info);
-                       listener_idx++;
-               } else {
-                       g_warning("Invalid signal type %s\n", signal);
-               }
-       } else {
-               g_warning("Invalid object type %s\n", object_type);
-       }
-       
-       return rc;
+  GType type;
+  guint signal_id;
+  gint  rc = 0;
+
+  type = g_type_from_name (object_type);
+  if (type)
+  {
+    signal_id  = g_signal_lookup (signal, type);
+    if (signal_id > 0)
+    {
+      JawUtilListenerInfo *listener_info;
+
+      rc = listener_idx;
+
+      listener_info = g_malloc(sizeof(JawUtilListenerInfo));
+      listener_info->key = listener_idx;
+      listener_info->hook_id = g_signal_add_emission_hook(signal_id,
+                                                          0,
+                                                          listener,
+                                                          g_strdup (hook_data),
+                                                          (GDestroyNotify) g_free);
+      listener_info->signal_id = signal_id;
+
+      g_hash_table_insert(listener_list, &(listener_info->key), listener_info);
+      listener_idx++;
+    } else {
+      g_warning("Invalid signal type %s\n", signal);
+    }
+  } else {
+    g_warning("Invalid object type %s\n", object_type);
+  }
+
+  return rc;
 }
 
 /* static functions */
 guint
-jaw_util_get_tflag_from_jobj (JNIEnv *jniEnv,
-                       jobject jObj)
+jaw_util_get_tflag_from_jobj(JNIEnv *jniEnv, jobject jObj)
 {
-       guint tflag = 0;
-       jmethodID jmid; 
-       jclass classAccessibleContext = (*jniEnv)->FindClass(jniEnv, "javax/accessibility/AccessibleContext");
-       jclass classAccessible = (*jniEnv)->FindClass(jniEnv, "javax/accessibility/Accessible");
-       jobject ac;
-       jobject iface;
-
-       if( (*jniEnv)->IsInstanceOf(jniEnv, jObj, classAccessibleContext) ) {
-               ac = jObj;
-       } else if( (*jniEnv)->IsInstanceOf(jniEnv, jObj, classAccessible) ) {
-               jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAccessible, "getAccessibleContext", 
"()Ljavax/accessibility/AccessibleContext;");
-               ac = (*jniEnv)->CallObjectMethod(jniEnv, jObj, jmid);
-       } else {
-               return 0;
-       }
-
-       jmid = (*jniEnv)->GetMethodID(jniEnv, classAccessibleContext, "getAccessibleAction", 
"()Ljavax/accessibility/AccessibleAction;");
-       iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
-       if (iface != NULL) {
-               tflag |= INTERFACE_ACTION;
-       }
-
-       jmid = (*jniEnv)->GetMethodID(jniEnv, classAccessibleContext, "getAccessibleComponent", 
"()Ljavax/accessibility/AccessibleComponent;");
-       iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
-       if (iface != NULL) {
-               tflag |= INTERFACE_COMPONENT;
-       }
-
-       jmid = (*jniEnv)->GetMethodID(jniEnv, classAccessibleContext, "getAccessibleText", 
"()Ljavax/accessibility/AccessibleText;");
-       iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
-       if (iface != NULL) {
-               tflag |= INTERFACE_TEXT;
-
-               jclass classAccessibleHypertext = (*jniEnv)->FindClass(jniEnv, 
"javax/accessibility/AccessibleHypertext");
-               if ( (*jniEnv)->IsInstanceOf(jniEnv, iface, classAccessibleHypertext) ) {
-                       tflag |= INTERFACE_HYPERTEXT;
-               }
-
-               jmid = (*jniEnv)->GetMethodID(jniEnv, classAccessibleContext, "getAccessibleEditableText", 
"()Ljavax/accessibility/AccessibleEditableText;");
-               iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
-               if (iface != NULL) {
-                       tflag |= INTERFACE_EDITABLE_TEXT;
-               }
-       }
-
-       jmid = (*jniEnv)->GetMethodID(jniEnv, classAccessibleContext, "getAccessibleIcon", 
"()[Ljavax/accessibility/AccessibleIcon;");
-       iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
-       if (iface != NULL) {
-               tflag |= INTERFACE_IMAGE;
-       }
-
-       jmid = (*jniEnv)->GetMethodID(jniEnv, classAccessibleContext, "getAccessibleSelection", 
"()Ljavax/accessibility/AccessibleSelection;");
-       iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
-       if (iface != NULL) {
-               tflag |= INTERFACE_SELECTION;
-       }
-
-       jmid = (*jniEnv)->GetMethodID(jniEnv, classAccessibleContext, "getAccessibleTable", 
"()Ljavax/accessibility/AccessibleTable;");
-       iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
-       if (iface != NULL) {
-               tflag |= INTERFACE_TABLE;
-       }
-
-       jmid = (*jniEnv)->GetMethodID(jniEnv, classAccessibleContext, "getAccessibleValue", 
"()Ljavax/accessibility/AccessibleValue;");
-       iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
-       if (iface != NULL) {
-               tflag |= INTERFACE_VALUE;
-       }
-
-       return tflag;
+  guint tflag = 0;
+  jmethodID jmid;      
+  jclass classAccessibleContext = (*jniEnv)->FindClass(jniEnv,
+                                                       "javax/accessibility/AccessibleContext");
+  jclass classAccessible = (*jniEnv)->FindClass(jniEnv,
+                                                "javax/accessibility/Accessible");
+  jobject ac;
+  jobject iface;
+
+  if((*jniEnv)->IsInstanceOf(jniEnv, jObj, classAccessibleContext) )
+  {
+    ac = jObj;
+  } else if((*jniEnv)->IsInstanceOf(jniEnv, jObj, classAccessible))
+  {
+    jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                            classAccessible,
+                                            "getAccessibleContext",
+                                            "()Ljavax/accessibility/AccessibleContext;");
+    ac = (*jniEnv)->CallObjectMethod(jniEnv, jObj, jmid);
+  } else {
+    return 0;
+  }
+
+  jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                classAccessibleContext,
+                                "getAccessibleAction",
+                                "()Ljavax/accessibility/AccessibleAction;");
+  iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
+  if (iface != NULL)
+  {
+    tflag |= INTERFACE_ACTION;
+  }
+
+  jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                classAccessibleContext,
+                                "getAccessibleComponent",
+                                "()Ljavax/accessibility/AccessibleComponent;");
+  iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
+  if (iface != NULL)
+  {
+    tflag |= INTERFACE_COMPONENT;
+  }
+
+  jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                classAccessibleContext,
+                                "getAccessibleText",
+                                "()Ljavax/accessibility/AccessibleText;");
+  iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
+  if (iface != NULL)
+  {
+    tflag |= INTERFACE_TEXT;
+
+    jclass classAccessibleHypertext = (*jniEnv)->FindClass(jniEnv, 
"javax/accessibility/AccessibleHypertext");
+    if ( (*jniEnv)->IsInstanceOf(jniEnv, iface, classAccessibleHypertext))
+    {
+      tflag |= INTERFACE_HYPERTEXT;
+    }
+
+    jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                  classAccessibleContext,
+                                  "getAccessibleEditableText",
+                                  "()Ljavax/accessibility/AccessibleEditableText;");
+    iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
+    if (iface != NULL)
+    {
+      tflag |= INTERFACE_EDITABLE_TEXT;
+    }
+  }
+
+  jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                classAccessibleContext,
+                                "getAccessibleIcon",
+                                "()[Ljavax/accessibility/AccessibleIcon;");
+  iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
+  if (iface != NULL)
+  {
+    tflag |= INTERFACE_IMAGE;
+  }
+
+  jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                classAccessibleContext,
+                                "getAccessibleSelection",
+                                "()Ljavax/accessibility/AccessibleSelection;");
+  iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
+  if (iface != NULL)
+  {
+    tflag |= INTERFACE_SELECTION;
+  }
+
+  jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                classAccessibleContext,
+                                "getAccessibleTable",
+                                "()Ljavax/accessibility/AccessibleTable;");
+  iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
+  if (iface != NULL)
+  {
+    tflag |= INTERFACE_TABLE;
+  }
+
+  jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                classAccessibleContext,
+                                "getAccessibleValue",
+                                "()Ljavax/accessibility/AccessibleValue;");
+  iface = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
+  if (iface != NULL)
+  {
+    tflag |= INTERFACE_VALUE;
+  }
+
+  return tflag;
 }
 
 gboolean
-jaw_util_is_same_jobject(gconstpointer a,
-                        gconstpointer b)
+jaw_util_is_same_jobject(gconstpointer a, gconstpointer b)
 {
-       JNIEnv *jniEnv = jaw_util_get_jni_env();
-       if ( (*jniEnv)->IsSameObject(jniEnv, (jobject)a, (jobject)b) ) {
-               return TRUE;
-       } else {
-               return FALSE;
-       }
+  JNIEnv *jniEnv = jaw_util_get_jni_env();
+  if ( (*jniEnv)->IsSameObject(jniEnv, (jobject)a, (jobject)b) ) {
+    return TRUE;
+  } else {
+    return FALSE;
+  }
 }
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *jvm, void *reserve)
 {
-  if (jvm == NULL) {
+  if (jvm == NULL)
+  {
     g_error("JavaVM pointer was NULL when initializing library");
   }
   cachedJVM = jvm;
@@ -459,490 +491,436 @@ jaw_util_get_jni_env(void)
 }
 
 static jobject
-jaw_util_get_java_acc_role (JNIEnv *jniEnv,
-                       const gchar* roleName)
+jaw_util_get_java_acc_role (JNIEnv *jniEnv, const gchar* roleName)
 {
-       jclass classAccessibleRole = (*jniEnv)->FindClass(jniEnv, "javax/accessibility/AccessibleRole");
-       jfieldID jfid = (*jniEnv)->GetStaticFieldID(jniEnv, classAccessibleRole, roleName, 
"Ljavax/accessibility/AccessibleRole;");
-       jobject jrole = (*jniEnv)->GetStaticObjectField(jniEnv, classAccessibleRole, jfid);
-
-       return jrole;
+  jclass classAccessibleRole = (*jniEnv)->FindClass(jniEnv,
+                                                    "javax/accessibility/AccessibleRole");
+  jfieldID jfid = (*jniEnv)->GetStaticFieldID(jniEnv,
+                                              classAccessibleRole,
+                                              roleName,
+                                              "Ljavax/accessibility/AccessibleRole;");
+  jobject jrole = (*jniEnv)->GetStaticObjectField(jniEnv, classAccessibleRole, jfid);
+
+  return jrole;
 }
 
 static gboolean
-jaw_util_is_java_acc_role (JNIEnv *jniEnv,
-                       jobject acc_role,
-                       const gchar* roleName)
+jaw_util_is_java_acc_role (JNIEnv *jniEnv, jobject acc_role, const gchar* roleName)
 {
-       jobject jrole = jaw_util_get_java_acc_role (jniEnv, roleName);
+  jobject jrole = jaw_util_get_java_acc_role (jniEnv, roleName);
 
-       if ( (*jniEnv)->IsSameObject(jniEnv, acc_role, jrole) ) {
-               return TRUE;
-       } else {
-               return FALSE;
-       }
+  if ((*jniEnv)->IsSameObject(jniEnv, acc_role, jrole))
+  {
+    return TRUE;
+  } else {
+    return FALSE;
+  }
 }
 
 AtkRole
 jaw_util_get_atk_role_from_jobj (jobject jobj)
 {
-       jobject ac;
-       JNIEnv *jniEnv = jaw_util_get_jni_env();
-       jclass classAccessibleContext = (*jniEnv)->FindClass(jniEnv, "javax/accessibility/AccessibleContext");
-       jclass classAccessible = (*jniEnv)->FindClass(jniEnv, "javax/accessibility/Accessible");
-       jmethodID jmidGetContext;
-       jmidGetContext = (*jniEnv)->GetMethodID(jniEnv, classAccessible, "getAccessibleContext", 
"()Ljavax/accessibility/AccessibleContext;");
-       if( (*jniEnv)->IsInstanceOf(jniEnv, jobj, classAccessibleContext) ) {
-               ac = jobj;
-       } else if ( (*jniEnv)->IsInstanceOf(jniEnv, jobj, classAccessible) ) {
-               ac = (*jniEnv)->CallObjectMethod(jniEnv, jobj, jmidGetContext);
-       } else {
-               return ATK_ROLE_INVALID;
-       }
-
-       jmethodID jmidGetRole = (*jniEnv)->GetMethodID(jniEnv, classAccessibleContext, "getAccessibleRole", 
"()Ljavax/accessibility/AccessibleRole;");
-       jobject ac_role = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmidGetRole);
-
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "ALERT") ) {
-               return ATK_ROLE_ALERT;
-       }
-
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "AWT_COMPONENT") ) {
-               return ATK_ROLE_UNKNOWN;
-       }
-
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "CANVAS") ) {
-               return ATK_ROLE_CANVAS;
-       }
-
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "CHECK_BOX") ) {
-               return ATK_ROLE_CHECK_BOX;
-       }
-
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "COLOR_CHOOSER") ) {
-               return ATK_ROLE_COLOR_CHOOSER;
-       }
-
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "COLUMN_HEADER") ) {
-               return ATK_ROLE_COLUMN_HEADER;
-       }
-
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "COMBO_BOX") ) {
-               return ATK_ROLE_COMBO_BOX;
-       }
-
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "DATE_EDITOR") ) {
-               return ATK_ROLE_DATE_EDITOR;
-       }
-
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "DESKTOP_ICON") ) {
-               return ATK_ROLE_DESKTOP_ICON;
-       }
-
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "DESKTOP_PANE") ) {
+  jobject ac;
+  JNIEnv *jniEnv = jaw_util_get_jni_env();
+  jclass classAccessibleContext = (*jniEnv)->FindClass(jniEnv,
+                                                       "javax/accessibility/AccessibleContext");
+  jclass classAccessible = (*jniEnv)->FindClass(jniEnv,
+                                                "javax/accessibility/Accessible");
+  jmethodID jmidGetContext;
+  jmidGetContext = (*jniEnv)->GetMethodID(jniEnv,
+                                          classAccessible,
+                                          "getAccessibleContext",
+                                          "()Ljavax/accessibility/AccessibleContext;");
+  if( (*jniEnv)->IsInstanceOf(jniEnv, jobj, classAccessibleContext))
+  {
+    ac = jobj;
+  } else if ((*jniEnv)->IsInstanceOf(jniEnv, jobj, classAccessible))
+  {
+    ac = (*jniEnv)->CallObjectMethod(jniEnv, jobj, jmidGetContext);
+  } else {
+    return ATK_ROLE_INVALID;
+  }
+
+  jmethodID jmidGetRole = (*jniEnv)->GetMethodID(jniEnv,
+                                                 classAccessibleContext,
+                                                 "getAccessibleRole",
+                                                 "()Ljavax/accessibility/AccessibleRole;");
+  jobject ac_role = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmidGetRole);
+
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "ALERT"))
+    return ATK_ROLE_ALERT;
+
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "AWT_COMPONENT"))
+    return ATK_ROLE_UNKNOWN;
+
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "CANVAS"))
+    return ATK_ROLE_CANVAS;
+
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "CHECK_BOX"))
+    return ATK_ROLE_CHECK_BOX;
+
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "COLOR_CHOOSER"))
+    return ATK_ROLE_COLOR_CHOOSER;
+
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "COLUMN_HEADER"))
+    return ATK_ROLE_COLUMN_HEADER;
+
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "COMBO_BOX"))
+    return ATK_ROLE_COMBO_BOX;
+
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "DATE_EDITOR"))
+    return ATK_ROLE_DATE_EDITOR;
+
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "DESKTOP_ICON"))
+    return ATK_ROLE_DESKTOP_ICON;
+
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "DESKTOP_PANE"))
     return ATK_ROLE_DESKTOP_FRAME;
-       }
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "DIALOG") ) {
-               return ATK_ROLE_DIALOG;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "DIALOG"))
+    return ATK_ROLE_DIALOG;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "DIRECTORY_PANE") ) {
-               return ATK_ROLE_DIRECTORY_PANE;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "DIRECTORY_PANE"))
+    return ATK_ROLE_DIRECTORY_PANE;
 
-  if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "EDITBAR") ) {
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "EDITBAR"))
     return ATK_ROLE_EDITBAR;
-  }
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "FILE_CHOOSER") ) {
-               return ATK_ROLE_FILE_CHOOSER;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "FILE_CHOOSER"))
+    return ATK_ROLE_FILE_CHOOSER;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "FILLER") ) {
-               return ATK_ROLE_FILLER;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "FILLER"))
+    return ATK_ROLE_FILLER;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "FONT_CHOOSER") ) {
-               return ATK_ROLE_FONT_CHOOSER;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "FONT_CHOOSER"))
+    return ATK_ROLE_FONT_CHOOSER;
 
-  if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "FOOTER") ) {
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "FOOTER"))
     return ATK_ROLE_FOOTER;
-  }
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "FRAME") ) {
-               return ATK_ROLE_FRAME;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "FRAME"))
+    return ATK_ROLE_FRAME;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "GLASS_PANE") ) {
-               return ATK_ROLE_GLASS_PANE;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "GLASS_PANE"))
+    return ATK_ROLE_GLASS_PANE;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "GROUP_BOX") ) {
-               return ATK_ROLE_PANEL;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "GROUP_BOX"))
+    return ATK_ROLE_PANEL;
 
-  if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "HEADER") ) {
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "HEADER"))
     return ATK_ROLE_HEADER;
-  }
 
-  if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "HTML_CONTAINER") ) {
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "HTML_CONTAINER"))
     return ATK_ROLE_HTML_CONTAINER;
-  }
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "HYPERLINK") ) {
-               return ATK_ROLE_UNKNOWN;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "HYPERLINK"))
+    return ATK_ROLE_UNKNOWN;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "ICON") ) {
-               return ATK_ROLE_ICON;
-       }
+  if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "ICON"))
+    return ATK_ROLE_ICON;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "INTERNAL_FRAME") ) {
-               return ATK_ROLE_INTERNAL_FRAME;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "INTERNAL_FRAME"))
+    return ATK_ROLE_INTERNAL_FRAME;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "LABEL") ) {
-               return ATK_ROLE_LABEL;
-       }
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "LAYERED_PANE") ) {
-               return ATK_ROLE_LAYERED_PANE;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "LABEL"))
+    return ATK_ROLE_LABEL;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "LIST") ) {
-               return ATK_ROLE_LIST;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "LAYERED_PANE"))
+    return ATK_ROLE_LAYERED_PANE;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "LIST_ITEM") ) {
-               return ATK_ROLE_LIST_ITEM;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "LIST"))
+    return ATK_ROLE_LIST;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "MENU") ) {
-               return ATK_ROLE_MENU;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "LIST_ITEM"))
+    return ATK_ROLE_LIST_ITEM;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "MENU_BAR") ) {
-               return ATK_ROLE_MENU_BAR;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "MENU"))
+    return ATK_ROLE_MENU;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "MENU_ITEM") ) {
-               return ATK_ROLE_MENU_ITEM;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "MENU_BAR"))
+    return ATK_ROLE_MENU_BAR;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "OPTION_PANE") ) {
-               return ATK_ROLE_OPTION_PANE;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "MENU_ITEM"))
+    return ATK_ROLE_MENU_ITEM;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "PAGE_TAB") ) {
-               return ATK_ROLE_PAGE_TAB;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "OPTION_PANE"))
+    return ATK_ROLE_OPTION_PANE;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "PAGE_TAB_LIST") ) {
-               return ATK_ROLE_PAGE_TAB_LIST;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "PAGE_TAB"))
+    return ATK_ROLE_PAGE_TAB;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "PANEL") ) {
-               return ATK_ROLE_PANEL;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "PAGE_TAB_LIST"))
+    return ATK_ROLE_PAGE_TAB_LIST;
 
-  if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "PARAGRAPH") ) {
-    return ATK_ROLE_PARAGRAPH;
-  }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "PANEL"))
+    return ATK_ROLE_PANEL;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "PASSWORD_TEXT") ) {
-               return ATK_ROLE_PASSWORD_TEXT;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "PARAGRAPH"))
+    return ATK_ROLE_PARAGRAPH;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "POPUP_MENU") ) {
-               return ATK_ROLE_POPUP_MENU;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "PASSWORD_TEXT"))
+    return ATK_ROLE_PASSWORD_TEXT;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "PROGRESS_BAR") ) {
-               return ATK_ROLE_PROGRESS_BAR;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "POPUP_MENU"))
+    return ATK_ROLE_POPUP_MENU;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "PUSH_BUTTON") ) {
-               return ATK_ROLE_PUSH_BUTTON;
-       }
+  if  (jaw_util_is_java_acc_role(jniEnv, ac_role, "PROGRESS_BAR"))
+    return ATK_ROLE_PROGRESS_BAR;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "RADIO_BUTTON") ) {
-               jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAccessibleContext, 
"getAccessibleParent", "()Ljavax/accessibility/Accessible;");
-               jobject parent_obj = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
-               if (!parent_obj) {
-                       return ATK_ROLE_RADIO_BUTTON;
-               }
-               
-               jobject parent_ac = (*jniEnv)->CallObjectMethod(jniEnv, parent_obj, jmidGetContext);
-               jobject parent_role = (*jniEnv)->CallObjectMethod(jniEnv, parent_ac, jmidGetRole);
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "PUSH_BUTTON"))
+    return ATK_ROLE_PUSH_BUTTON;
 
-               if ( jaw_util_is_java_acc_role(jniEnv, parent_role, "MENU") ) {
-                       return ATK_ROLE_RADIO_MENU_ITEM;
-               }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "RADIO_BUTTON"))
+  {
+    jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                            classAccessibleContext,
+                                            "getAccessibleParent",
+                                            "()Ljavax/accessibility/Accessible;");
 
-               return ATK_ROLE_RADIO_BUTTON;
-       }
+    jobject parent_obj = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
+    if (!parent_obj)
+      return ATK_ROLE_RADIO_BUTTON;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "ROOT_PANE") ) {
-               return ATK_ROLE_ROOT_PANE;
-       }
+    jobject parent_ac = (*jniEnv)->CallObjectMethod(jniEnv, parent_obj, jmidGetContext);
+    jobject parent_role = (*jniEnv)->CallObjectMethod(jniEnv, parent_ac, jmidGetRole);
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "ROW_HEADER") ) {
-               return ATK_ROLE_ROW_HEADER;
-       }
+    if (jaw_util_is_java_acc_role(jniEnv, parent_role, "MENU"))
+      return ATK_ROLE_RADIO_MENU_ITEM;
 
-  if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "RULER") ) {
-    return ATK_ROLE_RULER;
+    return ATK_ROLE_RADIO_BUTTON;
   }
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "SCROLL_BAR") ) {
-               return ATK_ROLE_SCROLL_BAR;
-       }
-
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "SCROLL_PANE") ) {
-               return ATK_ROLE_SCROLL_PANE;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "ROOT_PANE"))
+    return ATK_ROLE_ROOT_PANE;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "SEPARATOR") ) {
-               return ATK_ROLE_SEPARATOR;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "ROW_HEADER"))
+    return ATK_ROLE_ROW_HEADER;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "SLIDER") ) {
-               return ATK_ROLE_SLIDER;
-       }
-
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "SPIN_BOX") ) {
-               return ATK_ROLE_SPIN_BUTTON;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "RULER"))
+    return ATK_ROLE_RULER;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "SPLIT_PANE") ) {
-               return ATK_ROLE_SPLIT_PANE;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "SCROLL_BAR"))
+    return ATK_ROLE_SCROLL_BAR;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "STATUS_BAR") ) {
-               return ATK_ROLE_STATUSBAR;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "SCROLL_PANE"))
+    return ATK_ROLE_SCROLL_PANE;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "SWING_COMPONENT") ) {
-               return ATK_ROLE_UNKNOWN;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "SEPARATOR"))
+    return ATK_ROLE_SEPARATOR;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "TABLE") ) {
-               return ATK_ROLE_TABLE;
-       }
+  if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "SLIDER"))
+    return ATK_ROLE_SLIDER;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "TEXT") ) {
-               return ATK_ROLE_TEXT;
-       }
+  if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "SPIN_BOX"))
+    return ATK_ROLE_SPIN_BUTTON;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "TOGGLE_BUTTON") ) {
-               return ATK_ROLE_TOGGLE_BUTTON;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "SPLIT_PANE"))
+    return ATK_ROLE_SPLIT_PANE;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "TOOL_BAR") ) {
-               return ATK_ROLE_TOOL_BAR;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "STATUS_BAR"))
+    return ATK_ROLE_STATUSBAR;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "TOOL_TIP") ) {
-               return ATK_ROLE_TOOL_TIP;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "SWING_COMPONENT"))
+    return ATK_ROLE_UNKNOWN;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "TREE") ) {
-               return ATK_ROLE_TREE;
-       }
+  if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "TABLE"))
+    return ATK_ROLE_TABLE;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "UNKNOWN") ) {
-               jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAccessibleContext, 
"getAccessibleParent", "()Ljavax/accessibility/Accessible;");
-               jobject parent_obj = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "TEXT"))
+    return ATK_ROLE_TEXT;
 
-               if (parent_obj == NULL) {
-                       return ATK_ROLE_APPLICATION;
-               }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "TOGGLE_BUTTON"))
+    return ATK_ROLE_TOGGLE_BUTTON;
 
-               return ATK_ROLE_UNKNOWN;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "TOOL_BAR"))
+    return ATK_ROLE_TOOL_BAR;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "VIEWPORT") ) {
-               return ATK_ROLE_VIEWPORT;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "TOOL_TIP"))
+    return ATK_ROLE_TOOL_TIP;
 
-       if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "WINDOW") ) {
-               return ATK_ROLE_WINDOW;
-       }
+  if (jaw_util_is_java_acc_role(jniEnv, ac_role, "TREE"))
+    return ATK_ROLE_TREE;
 
-       jclass classAccessibleRole = (*jniEnv)->FindClass(jniEnv, "javax/accessibility/AccessibleRole");
-       jmethodID jmidToDisplayString = (*jniEnv)->GetMethodID(jniEnv, classAccessibleRole, 
"toDisplayString", "(Ljava/util/Locale;)Ljava/lang/String;");
+  if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "UNKNOWN"))
+  {
+    jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                            classAccessibleContext,
+                                            "getAccessibleParent",
+                                            "()Ljavax/accessibility/Accessible;");
+    jobject parent_obj = (*jniEnv)->CallObjectMethod(jniEnv, ac, jmid);
 
-       jclass classLocale = (*jniEnv)->FindClass(jniEnv, "java/util/Locale");
-       jfieldID jfidUS = (*jniEnv)->GetStaticFieldID(jniEnv, classLocale, "US", "Ljava/util/Locale;");
-       jobject jobjUS = (*jniEnv)->GetStaticObjectField(jniEnv, classLocale, jfidUS);
-       jobject jobjString = (*jniEnv)->CallObjectMethod(jniEnv, ac_role, jmidToDisplayString, jobjUS);
+    if (parent_obj == NULL)
+      return ATK_ROLE_APPLICATION;
 
-       jclass classString = (*jniEnv)->FindClass(jniEnv, "java/lang/String");
-       jmethodID jmidEqualsIgnoreCase = (*jniEnv)->GetMethodID(jniEnv, classString, "equalsIgnoreCase", 
"(Ljava/lang/String;)Z");
+    return ATK_ROLE_UNKNOWN;
+  }
 
-       jstring jstr = (*jniEnv)->NewStringUTF(jniEnv, "paragraph");
-       if ( (*jniEnv)->CallBooleanMethod(jniEnv, jobjString, jmidEqualsIgnoreCase, jstr) ) {
-               return ATK_ROLE_PARAGRAPH;
-       }
+  if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "VIEWPORT"))
+    return ATK_ROLE_VIEWPORT;
+
+  if ( jaw_util_is_java_acc_role(jniEnv, ac_role, "WINDOW"))
+    return ATK_ROLE_WINDOW;
+
+  jclass classAccessibleRole = (*jniEnv)->FindClass(jniEnv,
+                                                    "javax/accessibility/AccessibleRole");
+  jmethodID jmidToDisplayString = (*jniEnv)->GetMethodID(jniEnv,
+                                                         classAccessibleRole,
+                                                         "toDisplayString",
+                                                         "(Ljava/util/Locale;)Ljava/lang/String;");
+
+  jclass classLocale = (*jniEnv)->FindClass(jniEnv, "java/util/Locale");
+  jfieldID jfidUS = (*jniEnv)->GetStaticFieldID(jniEnv,
+                                                classLocale,
+                                                "US",
+                                                "Ljava/util/Locale;");
+  jobject jobjUS = (*jniEnv)->GetStaticObjectField(jniEnv, classLocale, jfidUS);
+  jobject jobjString = (*jniEnv)->CallObjectMethod(jniEnv,
+                                                   ac_role,
+                                                   jmidToDisplayString,
+                                                   jobjUS);
+
+  jclass classString = (*jniEnv)->FindClass(jniEnv, "java/lang/String");
+  jmethodID jmidEqualsIgnoreCase = (*jniEnv)->GetMethodID(jniEnv,
+                                                          classString,
+                                                          "equalsIgnoreCase",
+                                                          "(Ljava/lang/String;)Z");
+
+  jstring jstr = (*jniEnv)->NewStringUTF(jniEnv, "paragraph");
+  if ((*jniEnv)->CallBooleanMethod(jniEnv, jobjString, jmidEqualsIgnoreCase, jstr))
+    return ATK_ROLE_PARAGRAPH;
 
-       return ATK_ROLE_UNKNOWN; /* ROLE_EXTENDED */
+  return ATK_ROLE_UNKNOWN; /* ROLE_EXTENDED */
 }
 
 static gboolean
-is_same_java_state (JNIEnv *jniEnv,
-               jobject jobj,
-               const gchar* strState)
+is_same_java_state (JNIEnv *jniEnv, jobject jobj, const gchar* strState)
 {
-       jclass classAccessibleState = (*jniEnv)->FindClass(jniEnv, "javax/accessibility/AccessibleState");
-       jfieldID jfid = (*jniEnv)->GetStaticFieldID(jniEnv, classAccessibleState, strState, 
"Ljavax/accessibility/AccessibleState;");
-       jobject jstate = (*jniEnv)->GetStaticObjectField(jniEnv, classAccessibleState, jfid);
-
-       if ((*jniEnv)->IsSameObject( jniEnv, jobj, jstate )) {
-               return TRUE;
-       }
+  jclass classAccessibleState = (*jniEnv)->FindClass(jniEnv,
+                                                     "javax/accessibility/AccessibleState");
+  jfieldID jfid = (*jniEnv)->GetStaticFieldID(jniEnv,
+                                              classAccessibleState,
+                                              strState,
+                                              "Ljavax/accessibility/AccessibleState;");
+  jobject jstate = (*jniEnv)->GetStaticObjectField(jniEnv, classAccessibleState, jfid);
+
+  if ((*jniEnv)->IsSameObject( jniEnv, jobj, jstate )) {
+    return TRUE;
+  }
 
-       return FALSE;
+  return FALSE;
 }
 
 AtkStateType
-jaw_util_get_atk_state_type_from_java_state (JNIEnv *jniEnv,
-                               jobject jobj)
+jaw_util_get_atk_state_type_from_java_state (JNIEnv *jniEnv, jobject jobj)
 {
-       if (is_same_java_state( jniEnv, jobj, "ACTIVE" )) {
-               return ATK_STATE_ACTIVE;
-       }
+  if (is_same_java_state( jniEnv, jobj, "ACTIVE" ))
+    return ATK_STATE_ACTIVE;
 
-       if (is_same_java_state( jniEnv, jobj, "ARMED" )) {
-               return ATK_STATE_ARMED;
-       }
+  if (is_same_java_state( jniEnv, jobj, "ARMED" ))
+    return ATK_STATE_ARMED;
 
-       if (is_same_java_state( jniEnv, jobj, "BUSY" )) {
-               return ATK_STATE_BUSY;
-       }
+  if (is_same_java_state( jniEnv, jobj, "BUSY" ))
+    return ATK_STATE_BUSY;
 
-       if (is_same_java_state( jniEnv, jobj, "CHECKED" )) {
-               return ATK_STATE_CHECKED;
-       }
+  if (is_same_java_state( jniEnv, jobj, "CHECKED" ))
+    return ATK_STATE_CHECKED;
 
-       if (is_same_java_state( jniEnv, jobj, "COLLAPSED" )) {
-               return ATK_STATE_INVALID;
-       }
+  if (is_same_java_state( jniEnv, jobj, "COLLAPSED" ))
+    return ATK_STATE_INVALID;
 
-       if (is_same_java_state( jniEnv, jobj, "EDITABLE" )) {
-               return ATK_STATE_EDITABLE;
-       }
+  if (is_same_java_state( jniEnv, jobj, "EDITABLE" ))
+    return ATK_STATE_EDITABLE;
 
-       if (is_same_java_state( jniEnv, jobj, "ENABLED" )) {
-               return ATK_STATE_ENABLED;
-       }
+  if (is_same_java_state( jniEnv, jobj, "ENABLED" ))
+    return ATK_STATE_ENABLED;
 
-       if (is_same_java_state( jniEnv, jobj, "EXPANDABLE" )) {
-               return ATK_STATE_EXPANDABLE;
-       }
+  if (is_same_java_state( jniEnv, jobj, "EXPANDABLE" ))
+    return ATK_STATE_EXPANDABLE;
 
-       if (is_same_java_state( jniEnv, jobj, "EXPANDED" )) {
-               return ATK_STATE_EXPANDED;
-       }
+  if (is_same_java_state( jniEnv, jobj, "EXPANDED" ))
+    return ATK_STATE_EXPANDED;
 
-       if (is_same_java_state( jniEnv, jobj, "FOCUSABLE" )) {
-               return ATK_STATE_FOCUSABLE;
-       }
+  if (is_same_java_state( jniEnv, jobj, "FOCUSABLE" ))
+    return ATK_STATE_FOCUSABLE;
 
-       if (is_same_java_state( jniEnv, jobj, "FOCUSED" )) {
-               return ATK_STATE_FOCUSED;
-       }
+  if (is_same_java_state( jniEnv, jobj, "FOCUSED" ))
+    return ATK_STATE_FOCUSED;
 
-       if (is_same_java_state( jniEnv, jobj, "HORIZONTAL" )) {
-               return ATK_STATE_HORIZONTAL;
-       }
+  if (is_same_java_state( jniEnv, jobj, "HORIZONTAL" ))
+    return ATK_STATE_HORIZONTAL;
 
-       if (is_same_java_state( jniEnv, jobj, "ICONIFIED" )) {
-               return ATK_STATE_ICONIFIED;
-       }
+  if (is_same_java_state( jniEnv, jobj, "ICONIFIED" ))
+    return ATK_STATE_ICONIFIED;
 
-       if (is_same_java_state( jniEnv, jobj, "INDETERMINATE" )) {
-               return ATK_STATE_INDETERMINATE;
-       }
+  if (is_same_java_state( jniEnv, jobj, "INDETERMINATE" ))
+    return ATK_STATE_INDETERMINATE;
 
-       if (is_same_java_state( jniEnv, jobj, "MANAGES_DESCENDANTS" )) {
-               return ATK_STATE_MANAGES_DESCENDANTS;
-       }
+  if (is_same_java_state( jniEnv, jobj, "MANAGES_DESCENDANTS" ))
+    return ATK_STATE_MANAGES_DESCENDANTS;
 
-       if (is_same_java_state( jniEnv, jobj, "MODAL" )) {
-               return ATK_STATE_MODAL;
-       }
+  if (is_same_java_state( jniEnv, jobj, "MODAL" ))
+    return ATK_STATE_MODAL;
 
-       if (is_same_java_state( jniEnv, jobj, "MULTI_LINE" )) {
-               return ATK_STATE_MULTI_LINE;
-       }
+  if (is_same_java_state( jniEnv, jobj, "MULTI_LINE" ))
+    return ATK_STATE_MULTI_LINE;
 
-       if (is_same_java_state( jniEnv, jobj, "MULTISELECTABLE" )) {
-               return ATK_STATE_MULTISELECTABLE;
-       }
+  if (is_same_java_state( jniEnv, jobj, "MULTISELECTABLE" ))
+    return ATK_STATE_MULTISELECTABLE;
 
-       if (is_same_java_state( jniEnv, jobj, "OPAQUE" )) {
-               return ATK_STATE_OPAQUE;
-       }
+  if (is_same_java_state( jniEnv, jobj, "OPAQUE" ))
+    return ATK_STATE_OPAQUE;
 
-       if (is_same_java_state( jniEnv, jobj, "PRESSED" )) {
-               return ATK_STATE_PRESSED;
-       }
+  if (is_same_java_state( jniEnv, jobj, "PRESSED" ))
+    return ATK_STATE_PRESSED;
 
-       if (is_same_java_state( jniEnv, jobj, "RESIZABLE" )) {
-               return ATK_STATE_RESIZABLE;
-       }
+  if (is_same_java_state( jniEnv, jobj, "RESIZABLE" ))
+    return ATK_STATE_RESIZABLE;
 
-       if (is_same_java_state( jniEnv, jobj, "SELECTABLE" )) {
-               return ATK_STATE_SELECTABLE;
-       }
+  if (is_same_java_state( jniEnv, jobj, "SELECTABLE" ))
+    return ATK_STATE_SELECTABLE;
 
-       if (is_same_java_state( jniEnv, jobj, "SELECTED" )) {
-               return ATK_STATE_SELECTED;
-       }
+  if (is_same_java_state( jniEnv, jobj, "SELECTED" ))
+    return ATK_STATE_SELECTED;
 
-       if (is_same_java_state( jniEnv, jobj, "SHOWING" )) {
-               return ATK_STATE_SHOWING;
-       }
+  if (is_same_java_state( jniEnv, jobj, "SHOWING" ))
+    return ATK_STATE_SHOWING;
 
-       if (is_same_java_state( jniEnv, jobj, "SINGLE_LINE" )) {
-               return ATK_STATE_SINGLE_LINE;
-       }
+  if (is_same_java_state( jniEnv, jobj, "SINGLE_LINE" ))
+    return ATK_STATE_SINGLE_LINE;
 
-       if (is_same_java_state( jniEnv, jobj, "TRANSIENT" )) {
-               return ATK_STATE_TRANSIENT;
-       }
+  if (is_same_java_state( jniEnv, jobj, "TRANSIENT" ))
+    return ATK_STATE_TRANSIENT;
 
-       if (is_same_java_state( jniEnv, jobj, "TRUNCATED" )) {
-               return ATK_STATE_TRUNCATED;
-       }
+  if (is_same_java_state( jniEnv, jobj, "TRUNCATED" ))
+    return ATK_STATE_TRUNCATED;
 
-       if (is_same_java_state( jniEnv, jobj, "VERTICAL" )) {
-               return ATK_STATE_VERTICAL;
-       }
+  if (is_same_java_state( jniEnv, jobj, "VERTICAL" ))
+    return ATK_STATE_VERTICAL;
 
-       if (is_same_java_state( jniEnv, jobj, "VISIBLE" )) {
-               return ATK_STATE_VISIBLE;
-       }
+  if (is_same_java_state( jniEnv, jobj, "VISIBLE" ))
+    return ATK_STATE_VISIBLE;
 
-       return ATK_STATE_INVALID;
+  return ATK_STATE_INVALID;
 }
 
 void
 jaw_util_get_rect_info (JNIEnv *jniEnv,
-               jobject jrect, gint *x, gint *y,
-               gint *width, gint *height)
+                        jobject jrect,
+                        gint *x,
+                        gint *y,
+                        gint *width,
+                        gint *height)
 {
-       jclass classRectangle = (*jniEnv)->FindClass(jniEnv, "java/awt/Rectangle");
-       jfieldID jfidX = (*jniEnv)->GetFieldID(jniEnv, classRectangle, "x", "I");
-       jfieldID jfidY = (*jniEnv)->GetFieldID(jniEnv, classRectangle, "y", "I");
-       jfieldID jfidWidth = (*jniEnv)->GetFieldID(jniEnv, classRectangle, "width", "I");
-       jfieldID jfidHeight = (*jniEnv)->GetFieldID(jniEnv, classRectangle, "height", "I");
-
-       (*x) = (gint)(*jniEnv)->GetIntField(jniEnv, jrect, jfidX);
-       (*y) = (gint)(*jniEnv)->GetIntField(jniEnv, jrect, jfidY);
-       (*width) = (gint)(*jniEnv)->GetIntField(jniEnv, jrect, jfidWidth);
-       (*height) = (gint)(*jniEnv)->GetIntField(jniEnv, jrect, jfidHeight);
+  jclass classRectangle = (*jniEnv)->FindClass(jniEnv, "java/awt/Rectangle");
+  jfieldID jfidX = (*jniEnv)->GetFieldID(jniEnv, classRectangle, "x", "I");
+  jfieldID jfidY = (*jniEnv)->GetFieldID(jniEnv, classRectangle, "y", "I");
+  jfieldID jfidWidth = (*jniEnv)->GetFieldID(jniEnv, classRectangle, "width", "I");
+  jfieldID jfidHeight = (*jniEnv)->GetFieldID(jniEnv, classRectangle, "height", "I");
+
+  (*x) = (gint)(*jniEnv)->GetIntField(jniEnv, jrect, jfidX);
+  (*y) = (gint)(*jniEnv)->GetIntField(jniEnv, jrect, jfidY);
+  (*width) = (gint)(*jniEnv)->GetIntField(jniEnv, jrect, jfidWidth);
+  (*height) = (gint)(*jniEnv)->GetIntField(jniEnv, jrect, jfidHeight);
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]