[java-atk-wrapper] jawcomponent: fix formatting



commit 922278ab05a074a8886e2d12742dbd1184a358aa
Author: Magdalen Berns <m berns thismagpie com>
Date:   Sun Nov 23 18:00:40 2014 +0000

    jawcomponent: fix formatting
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=740584

 jni/src/jawcomponent.c |  434 +++++++++++++++++++++++++++--------------------
 1 files changed, 249 insertions(+), 185 deletions(-)
---
diff --git a/jni/src/jawcomponent.c b/jni/src/jawcomponent.c
index 505a5e1..7c5a27f 100644
--- a/jni/src/jawcomponent.c
+++ b/jni/src/jawcomponent.c
@@ -22,247 +22,311 @@
 #include "jawimpl.h"
 #include "jawutil.h"
 
-extern void    jaw_component_interface_init    (AtkComponentIface*);
-extern gpointer        jaw_component_data_init         (jobject);
-extern void    jaw_component_data_finalize     (gpointer);
-
-static gboolean                jaw_component_contains                  (AtkComponent           *component,
-                                                                gint                   x,
-                                                                gint                   y,
-                                                                AtkCoordType           coord_type);
-static AtkObject*      jaw_component_ref_accessible_at_point   (AtkComponent           *component,
-                                                                gint                   x,
-                                                                gint                   y,
-                                                                AtkCoordType           coord_type);
-static void            jaw_component_get_extents               (AtkComponent           *component,
-                                                                gint                   *x,
-                                                                gint                   *y,
-                                                                gint                   *width,
-                                                                gint                   *height,
-                                                                AtkCoordType           coord_type);
-static void            jaw_component_get_position              (AtkComponent           *component,
-                                                                gint                   *x,
-                                                                gint                   *y,
-                                                                AtkCoordType           coord_type);
-static void            jaw_component_get_size                  (AtkComponent           *component,
-                                                                gint                   *width,
-                                                                gint                   *height);
-static gboolean                jaw_component_grab_focus                (AtkComponent           *component);
-static AtkLayer                jaw_component_get_layer                 (AtkComponent           *component);
+extern void jaw_component_interface_init(AtkComponentIface*);
+extern gpointer jaw_component_data_init(jobject);
+extern void jaw_component_data_finalize(gpointer);
+
+static gboolean jaw_component_contains(AtkComponent *component,
+                                       gint         x,
+                                       gint         y,
+                                       AtkCoordType coord_type);
+
+static AtkObject* jaw_component_ref_accessible_at_point(AtkComponent *component,
+                                                        gint         x,
+                                                        gint         y,
+                                                        AtkCoordType coord_type);
+
+static void jaw_component_get_extents(AtkComponent *component,
+                                      gint         *x,
+                                      gint         *y,
+                                      gint         *width,
+                                      gint         *height,
+                                      AtkCoordType coord_type);
+
+static void jaw_component_get_position(AtkComponent *component,
+                                       gint         x,
+                                       gint         y,
+                                       AtkCoordType coord_type);
+
+static void jaw_component_get_size(AtkComponent *component,
+                                   gint         *width,
+                                   gint         *height);
+
+static gboolean jaw_component_grab_focus(AtkComponent *component);
+static AtkLayer jaw_component_get_layer(AtkComponent *component);
 /*static gint          jaw_component_get_mdi_zorder            (AtkComponent           *component);
 static gdouble         jaw_component_get_alpha                 (AtkComponent           *component);*/
 
 typedef struct _ComponentData {
-       jobject atk_component;
+  jobject atk_component;
 } ComponentData;
 
 void
 jaw_component_interface_init (AtkComponentIface *iface)
 {
-       iface->contains = jaw_component_contains;
-       iface->ref_accessible_at_point = jaw_component_ref_accessible_at_point;
-       iface->get_extents = jaw_component_get_extents;
-       iface->get_position = jaw_component_get_position;
-       iface->get_size = jaw_component_get_size;
-       iface->grab_focus = jaw_component_grab_focus;
-       iface->get_layer = jaw_component_get_layer;
-       iface->get_mdi_zorder = NULL; /*jaw_component_get_mdi_zorder;*/
-       iface->get_alpha = NULL; /*jaw_component_get_alpha;*/
-       iface->add_focus_handler = NULL;
-       iface->remove_focus_handler = NULL;
-       iface->set_extents = NULL;
-       iface->set_position = NULL;
-       iface->set_size = NULL;
-       iface->bounds_changed = NULL;
+  iface->contains = jaw_component_contains;
+  iface->ref_accessible_at_point = jaw_component_ref_accessible_at_point;
+  iface->get_extents = jaw_component_get_extents;
+  iface->get_position = jaw_component_get_position;
+  iface->get_size = jaw_component_get_size;
+  iface->grab_focus = jaw_component_grab_focus;
+  iface->get_layer = jaw_component_get_layer;
+  iface->get_mdi_zorder = NULL; /*jaw_component_get_mdi_zorder;*/
+  iface->get_alpha = NULL; /*jaw_component_get_alpha;*/
+  iface->add_focus_handler = NULL;
+  iface->remove_focus_handler = NULL;
+  iface->set_extents = NULL;
+  iface->set_position = NULL;
+  iface->set_size = NULL;
+  iface->bounds_changed = NULL;
 }
 
 gpointer
 jaw_component_data_init (jobject ac)
 {
-       ComponentData *data = g_new0(ComponentData, 1);
+  ComponentData *data = g_new0(ComponentData, 1);
 
-       JNIEnv *jniEnv = jaw_util_get_jni_env();
-       jclass classComponent = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkComponent");
-       jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classComponent, "<init>", 
"(Ljavax/accessibility/AccessibleContext;)V");
-       jobject jatk_component = (*jniEnv)->NewObject(jniEnv, classComponent, jmid, ac);
-       data->atk_component = (*jniEnv)->NewGlobalRef(jniEnv, jatk_component);
+  JNIEnv *jniEnv = jaw_util_get_jni_env();
+  jclass classComponent = (*jniEnv)->FindClass(jniEnv,
+                                               "org/GNOME/Accessibility/AtkComponent");
+  jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                          classComponent,
+                                          "<init>",
+                                          "(Ljavax/accessibility/AccessibleContext;)V");
 
-       return data;
+  jobject jatk_component = (*jniEnv)->NewObject(jniEnv, classComponent, jmid, ac);
+  data->atk_component = (*jniEnv)->NewGlobalRef(jniEnv, jatk_component);
+
+  return data;
 }
 
 void
 jaw_component_data_finalize (gpointer p)
 {
-       ComponentData *data = (ComponentData*)p;
-       JNIEnv *jniEnv = jaw_util_get_jni_env();
-
-       if (data && data->atk_component) {
-               (*jniEnv)->DeleteGlobalRef(jniEnv, data->atk_component);
-               data->atk_component = NULL;
-       }
+  ComponentData *data = (ComponentData*)p;
+  JNIEnv *jniEnv = jaw_util_get_jni_env();
+
+  if (data && data->atk_component)
+  {
+    (*jniEnv)->DeleteGlobalRef(jniEnv, data->atk_component);
+    data->atk_component = NULL;
+  }
 }
 
 static void
-coord_screen_to_local (JNIEnv *jniEnv,
-               jobject jobj,
-               gint *x, gint *y)
+coord_screen_to_local (JNIEnv *jniEnv, jobject jobj, gint *x, gint *y)
 {
-       jclass classAccessibleComponent = (*jniEnv)->FindClass(jniEnv, 
"javax/accessibility/AccessibleComponent");
-       jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAccessibleComponent, "getLocationOnScreen", 
"()Ljava/awt/Point;");
-       jobject jpoint = (*jniEnv)->CallObjectMethod(jniEnv, jobj, jmid);
-
-       jclass classPoint = (*jniEnv)->FindClass(jniEnv, "java/awt/Point");
-       jfieldID jfidX = (*jniEnv)->GetFieldID(jniEnv, classPoint, "x", "I");
-       jfieldID jfidY = (*jniEnv)->GetFieldID(jniEnv, classPoint, "y", "I");
-       jint jx = (*jniEnv)->GetIntField(jniEnv, jpoint, jfidX);
-       jint jy = (*jniEnv)->GetIntField(jniEnv, jpoint, jfidY);
-
-       (*x) = (*x) - (gint)jx;
-       (*y) = (*y) - (gint)jy;
+  jclass classAccessibleComponent = (*jniEnv)->FindClass(jniEnv,
+                                                         "javax/accessibility/AccessibleComponent");
+  jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                          classAccessibleComponent,
+                                          "getLocationOnScreen",
+                                          "()Ljava/awt/Point;");
+
+  jobject jpoint = (*jniEnv)->CallObjectMethod(jniEnv, jobj, jmid);
+
+  jclass classPoint = (*jniEnv)->FindClass(jniEnv, "java/awt/Point");
+  jfieldID jfidX = (*jniEnv)->GetFieldID(jniEnv, classPoint, "x", "I");
+  jfieldID jfidY = (*jniEnv)->GetFieldID(jniEnv, classPoint, "y", "I");
+  jint jx = (*jniEnv)->GetIntField(jniEnv, jpoint, jfidX);
+  jint jy = (*jniEnv)->GetIntField(jniEnv, jpoint, jfidY);
+
+  (*x) = (*x) - (gint)jx;
+  (*y) = (*y) - (gint)jy;
 }
 
 static gboolean
-jaw_component_contains (AtkComponent *component,
-                       gint x, gint y, AtkCoordType coord_type)
+jaw_component_contains (AtkComponent *component, gint x, gint y, AtkCoordType coord_type)
 {
-       JawObject *jaw_obj = JAW_OBJECT(component);
-       ComponentData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_COMPONENT);
-       jobject atk_component = data->atk_component;
-
-       JNIEnv *jniEnv = jaw_util_get_jni_env();
-       jclass classAtkComponent = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkComponent");
-       jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAtkComponent, "contains", "(III)Z");
-       jboolean jcontains = (*jniEnv)->CallBooleanMethod(jniEnv, atk_component, jmid, (jint)x, (jint)y, 
(jint)coord_type);
-
-       if (jcontains == JNI_TRUE) {
-               return TRUE;
-       } else {
-               return FALSE;
-       }
+  JawObject *jaw_obj = JAW_OBJECT(component);
+  ComponentData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_COMPONENT);
+  jobject atk_component = data->atk_component;
+
+  JNIEnv *jniEnv = jaw_util_get_jni_env();
+  jclass classAtkComponent = (*jniEnv)->FindClass(jniEnv,
+                                                  "org/GNOME/Accessibility/AtkComponent");
+
+  jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                          classAtkComponent,
+                                          "contains",
+                                          "(III)Z");
+
+  jboolean jcontains = (*jniEnv)->CallBooleanMethod(jniEnv,
+                                                    atk_component,
+                                                    jmid,
+                                                    (jint)x,
+                                                    (jint)y,
+                                                    (jint)coord_type);
+
+  if (jcontains == JNI_TRUE)
+  {
+    return TRUE;
+  } else {
+    return FALSE;
+  }
 }
 
 static AtkObject*
-jaw_component_ref_accessible_at_point (AtkComponent *component,
-                               gint x, gint y, AtkCoordType coord_type)
+jaw_component_ref_accessible_at_point (AtkComponent *component, gint x, gint y, AtkCoordType coord_type)
 {
-       JawObject *jaw_obj = JAW_OBJECT(component);
-       ComponentData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_COMPONENT);
-       jobject atk_component = data->atk_component;
-
-       JNIEnv *jniEnv = jaw_util_get_jni_env();
-       jclass classAtkComponent = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkComponent");
-       jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAtkComponent, "get_accessible_at_point", 
"(III)Ljavax/accessibility/AccessibleContext;");
-       jobject child_ac = (*jniEnv)->CallObjectMethod(jniEnv, atk_component, jmid, (jint)x, (jint)y, 
(jint)coord_type);
-       JawImpl* jaw_impl = jaw_impl_get_instance( jniEnv, child_ac );
-
-       g_object_ref( G_OBJECT(jaw_impl) );
-
-       return ATK_OBJECT(jaw_impl);
+  JawObject *jaw_obj = JAW_OBJECT(component);
+  ComponentData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_COMPONENT);
+  jobject atk_component = data->atk_component;
+
+  JNIEnv *jniEnv = jaw_util_get_jni_env();
+  jclass classAtkComponent = (*jniEnv)->FindClass(jniEnv,
+                                                  "org/GNOME/Accessibility/AtkComponent");
+  jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                          classAtkComponent,
+                                          "get_accessible_at_point",
+                                          "(III)Ljavax/accessibility/AccessibleContext;");
+  jobject child_ac = (*jniEnv)->CallObjectMethod(jniEnv,
+                                                 atk_component,
+                                                 jmid,
+                                                 (jint)x,
+                                                 (jint)y,
+                                                 (jint)coord_type);
+
+  JawImpl* jaw_impl = jaw_impl_get_instance( jniEnv, child_ac );
+
+  g_object_ref( G_OBJECT(jaw_impl) );
+
+  return ATK_OBJECT(jaw_impl);
 }
 
 static void
 jaw_component_get_extents (AtkComponent *component,
-                       gint *x, gint *y,
-                       gint *width, gint *height,
-                       AtkCoordType coord_type)
+                           gint         *x,
+                           gint         *y,
+                           gint         *width,
+                           gint         *height,
+                           AtkCoordType coord_type)
 {
-       jaw_component_get_position (component, x, y, coord_type);
-       jaw_component_get_size (component, width, height);
+  jaw_component_get_position (component, x, y, coord_type);
+  jaw_component_get_size (component, width, height);
 }
 
 static void
 jaw_component_get_position (AtkComponent *component,
-                       gint *x, gint *y, AtkCoordType coord_type)
+                            gint         *x,
+                            gint         *y,
+                            AtkCoordType coord_type)
 {
-       if (x == NULL || y == NULL) {
-               return;
-       }
-
-       JawObject *jaw_obj = JAW_OBJECT(component);
-       ComponentData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_COMPONENT);
-       jobject atk_component = data->atk_component;
-
-       JNIEnv *jniEnv = jaw_util_get_jni_env();
-       jclass classAtkComponent = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkComponent");
-       jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAtkComponent, "get_position", 
"(I)Ljava/awt/Point;");
-       jobject jpoint = (*jniEnv)->CallObjectMethod(jniEnv, atk_component, jmid, (jint)coord_type);
-
-       if (jpoint == NULL) {
-               (*x) = 0;
-               (*y) = 0;
-               return;
-       }
-
-       jclass classPoint = (*jniEnv)->FindClass(jniEnv, "java/awt/Point");
-       jfieldID jfidX = (*jniEnv)->GetFieldID(jniEnv, classPoint, "x", "I");
-       jfieldID jfidY = (*jniEnv)->GetFieldID(jniEnv, classPoint, "y", "I");
-       jint jx = (*jniEnv)->GetIntField(jniEnv, jpoint, jfidX);
-       jint jy = (*jniEnv)->GetIntField(jniEnv, jpoint, jfidY);
-
-       (*x) = (gint)jx;
-       (*y) = (gint)jy;
+  if (x == NULL || y == NULL)
+  {
+    return;
+  }
+
+  JawObject *jaw_obj = JAW_OBJECT(component);
+  ComponentData *data = jaw_object_get_interface_data(jaw_obj,
+                                                      INTERFACE_COMPONENT);
+  jobject atk_component = data->atk_component;
+
+  JNIEnv *jniEnv = jaw_util_get_jni_env();
+  jclass classAtkComponent = (*jniEnv)->FindClass(jniEnv,
+                                                  "org/GNOME/Accessibility/AtkComponent");
+  jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                          classAtkComponent,
+                                          "get_position",
+                                          "(I)Ljava/awt/Point;");
+  jobject jpoint = (*jniEnv)->CallObjectMethod(jniEnv,
+                                               atk_component,
+                                               jmid, (jint)coord_type);
+
+  if (jpoint == NULL)
+  {
+    (*x) = 0;
+    (*y) = 0;
+    return;
+  }
+
+  jclass classPoint = (*jniEnv)->FindClass(jniEnv, "java/awt/Point");
+  jfieldID jfidX = (*jniEnv)->GetFieldID(jniEnv, classPoint, "x", "I");
+  jfieldID jfidY = (*jniEnv)->GetFieldID(jniEnv, classPoint, "y", "I");
+  jint jx = (*jniEnv)->GetIntField(jniEnv, jpoint, jfidX);
+  jint jy = (*jniEnv)->GetIntField(jniEnv, jpoint, jfidY);
+
+  (*x) = (gint)jx;
+  (*y) = (gint)jy;
 }
 
 static void
-jaw_component_get_size (AtkComponent *component,
-                       gint *width, gint *height)
+jaw_component_get_size (AtkComponent *component, gint *width, gint *height)
 {
-       JawObject *jaw_obj = JAW_OBJECT(component);
-       ComponentData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_COMPONENT);
-       jobject atk_component = data->atk_component;
-
-       JNIEnv *jniEnv = jaw_util_get_jni_env();
-       jclass classAtkComponent = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkComponent");
-       jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAtkComponent, "get_size", 
"()Ljava/awt/Dimension;");
-       jobject jdimension = (*jniEnv)->CallObjectMethod(jniEnv, atk_component, jmid);
-
-       if (jdimension == NULL) {
-               (*width) = 0;
-               (*height) = 0;
-               return;
-       }
-
-       jclass classDimension = (*jniEnv)->FindClass(jniEnv, "java/awt/Dimension");
-       jfieldID jfidWidth = (*jniEnv)->GetFieldID(jniEnv, classDimension, "width", "I");
-       jfieldID jfidHeight = (*jniEnv)->GetFieldID(jniEnv, classDimension, "height", "I");
-       jint jwidth = (*jniEnv)->GetIntField(jniEnv, jdimension, jfidWidth);
-       jint jheight = (*jniEnv)->GetIntField(jniEnv, jdimension, jfidHeight);
-
-       (*width) = (gint)jwidth;
-       (*height) = (gint)jheight;
+  JawObject *jaw_obj = JAW_OBJECT(component);
+  ComponentData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_COMPONENT);
+  jobject atk_component = data->atk_component;
+
+  JNIEnv *jniEnv = jaw_util_get_jni_env();
+  jclass classAtkComponent = (*jniEnv)->FindClass(jniEnv,
+                                                  "org/GNOME/Accessibility/AtkComponent");
+
+  jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                          classAtkComponent,
+                                          "get_size",
+                                          "()Ljava/awt/Dimension;");
+
+  jobject jdimension = (*jniEnv)->CallObjectMethod(jniEnv, atk_component, jmid);
+
+  if (jdimension == NULL)
+  {
+    (*width) = 0;
+    (*height) = 0;
+    return;
+  }
+
+  jclass classDimension = (*jniEnv)->FindClass(jniEnv, "java/awt/Dimension");
+  jfieldID jfidWidth = (*jniEnv)->GetFieldID(jniEnv, classDimension, "width", "I");
+  jfieldID jfidHeight = (*jniEnv)->GetFieldID(jniEnv, classDimension, "height", "I");
+  jint jwidth = (*jniEnv)->GetIntField(jniEnv, jdimension, jfidWidth);
+  jint jheight = (*jniEnv)->GetIntField(jniEnv, jdimension, jfidHeight);
+
+  (*width) = (gint)jwidth;
+  (*height) = (gint)jheight;
 }
 
 static gboolean
 jaw_component_grab_focus (AtkComponent *component)
 {
-       JawObject *jaw_obj = JAW_OBJECT(component);
-       ComponentData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_COMPONENT);
-       jobject atk_component = data->atk_component;
-
-       JNIEnv *jniEnv = jaw_util_get_jni_env();
-       jclass classAtkComponent = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkComponent");
-       jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAtkComponent, "grab_focus", "()Z");
-       jboolean jresult = (*jniEnv)->CallBooleanMethod(jniEnv, atk_component, jmid);
-
-       if (jresult == JNI_TRUE) {
-               return TRUE;
-       }
-
-       return FALSE;
+  JawObject *jaw_obj = JAW_OBJECT(component);
+  ComponentData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_COMPONENT);
+  jobject atk_component = data->atk_component;
+
+  JNIEnv *jniEnv = jaw_util_get_jni_env();
+  jclass classAtkComponent = (*jniEnv)->FindClass(jniEnv,
+                                                  "org/GNOME/Accessibility/AtkComponent");
+  jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                          classAtkComponent,
+                                          "grab_focus",
+                                          "()Z");
+  jboolean jresult = (*jniEnv)->CallBooleanMethod(jniEnv, atk_component, jmid);
+
+  if (jresult == JNI_TRUE)
+  {
+    return TRUE;
+  }
+
+  return FALSE;
 }
 
 static AtkLayer
 jaw_component_get_layer (AtkComponent *component)
 {
-       JawObject *jaw_obj = JAW_OBJECT(component);
-       ComponentData *data = jaw_object_get_interface_data(jaw_obj, INTERFACE_COMPONENT);
-       jobject atk_component = data->atk_component;
-
-       JNIEnv *jniEnv = jaw_util_get_jni_env();
-       jclass classAtkComponent = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkComponent");
-       jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv, classAtkComponent, "get_layer", "()I");
-       jint jlayer = (*jniEnv)->CallIntMethod(jniEnv, atk_component, jmid);
-
-       return (AtkLayer)jlayer;
+  JawObject *jaw_obj = JAW_OBJECT(component);
+  ComponentData *data = jaw_object_get_interface_data(jaw_obj,
+                                                      INTERFACE_COMPONENT);
+  jobject atk_component = data->atk_component;
+
+  JNIEnv *jniEnv = jaw_util_get_jni_env();
+  jclass classAtkComponent = (*jniEnv)->FindClass(jniEnv,
+                                                  "org/GNOME/Accessibility/AtkComponent");
+  jmethodID jmid = (*jniEnv)->GetMethodID(jniEnv,
+                                          classAtkComponent,
+                                          "get_layer",
+                                          "()I");
+
+  jint jlayer = (*jniEnv)->CallIntMethod(jniEnv, atk_component, jmid);
+
+  return (AtkLayer)jlayer;
 }
 


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