GNOME.org
 

[dia] [restructuring] Bezier* whitespace adaption

commit 238e6f28c5c1fa40caeec1dd532b027f09afd64a
Author: Hans Breuer <hans breuer org>
Date:   Tue Oct 2 11:36:07 2012 +0200

    [restructuring] Bezier* whitespace adaption

 lib/bezier_conn.c |  136 +++++++++++++++++++++++++++-----------------
 lib/beziershape.c |  161 ++++++++++++++++++++++++++++++++---------------------
 2 files changed, 182 insertions(+), 115 deletions(-)
---
diff --git a/lib/bezier_conn.c b/lib/bezier_conn.c
index b549d42..6c50fb2 100644
--- a/lib/bezier_conn.c
+++ b/lib/bezier_conn.c
@@ -48,6 +48,7 @@ struct PointChange {
   BezPoint point;
   BezCornerType corner_type;
   int pos;
+
   /* owning ref when not applied for ADD_POINT
    * owning ref when applied for REMOVE_POINT */
   Handle *handle1, *handle2, *handle3;
@@ -67,15 +68,22 @@ struct CornerChange {
 };
 
 static ObjectChange *
-bezierconn_create_point_change(BezierConn *bezier, enum change_type type,
-			       BezPoint *point, BezCornerType corner_type,
-			       int segment,
-			       Handle *handle1, ConnectionPoint *connected_to1,
-			       Handle *handle2, ConnectionPoint *connected_to2,
-			       Handle *handle3, ConnectionPoint *connected_to3);
+bezierconn_create_point_change (BezierConn *bezier,
+				enum change_type type,
+				BezPoint *point,
+				BezCornerType corner_type,
+				int segment,
+				Handle *handle1,
+				ConnectionPoint *connected_to1,
+				Handle *handle2,
+				ConnectionPoint *connected_to2,
+				Handle *handle3,
+				ConnectionPoint *connected_to3);
 static ObjectChange *
-bezierconn_create_corner_change(BezierConn *bezier, Handle *handle,
-				Point *point_left, Point *point_right,
+bezierconn_create_corner_change(BezierConn *bezier,
+				Handle *handle,
+				Point *point_left,
+				Point *point_right,
 				BezCornerType old_corner_type,
 				BezCornerType new_corner_type);
 
@@ -100,21 +108,21 @@ setup_handle(Handle *handle, HandleId id)
  *          `handle' is not in the array.
  */
 static int
-get_handle_nr(BezierConn *bezier, Handle *handle)
+get_handle_nr (BezierConn *bezier, Handle *handle)
 {
   int i = 0;
-  for (i=0;i<bezier->object.num_handles;i++) {
+  for (i = 0; i < bezier->object.num_handles; i++) {
     if (bezier->object.handles[i] == handle)
       return i;
   }
   return -1;
 }
 
-void new_handles(BezierConn *bezier, int num_points);
-
 #define get_comp_nr(hnum) (((int)(hnum)+2)/3)
 #define get_major_nr(hnum) (((int)(hnum)+1)/3)
 
+void new_handles(BezierConn *bezier, int num_points);
+
 /** Function called to move one of the handles associated with the
  *  bezierconn. 
  * @param bezier The object whose handle is being moved.
@@ -128,9 +136,12 @@ void new_handles(BezierConn *bezier, int num_points);
  * @return NULL
  */
 ObjectChange*
-bezierconn_move_handle(BezierConn *bezier, Handle *handle,
-		       Point *to, ConnectionPoint *cp,
-		       HandleMoveReason reason, ModifierKeys modifiers)
+bezierconn_move_handle (BezierConn *bezier,
+			Handle *handle,
+			Point *to,
+			ConnectionPoint *cp,
+			HandleMoveReason reason,
+			ModifierKeys modifiers)
 {
   int handle_nr, comp_nr;
   Point delta, pt;
@@ -235,7 +246,7 @@ bezierconn_move_handle(BezierConn *bezier, Handle *handle,
  * \memberof _BezierConn
  */
 ObjectChange*
-bezierconn_move(BezierConn *bezier, Point *to)
+bezierconn_move (BezierConn *bezier, Point *to)
 {
   Point p;
   int i;
@@ -249,6 +260,7 @@ bezierconn_move(BezierConn *bezier, Point *to)
     point_add(&bezier->points[i].p2, &p);
     point_add(&bezier->points[i].p3, &p);
   }
+
   return NULL;
 }
 
@@ -260,7 +272,9 @@ bezierconn_move(BezierConn *bezier, Point *to)
  * @returns The index of the segment closest to point.
  */
 int
-bezierconn_closest_segment(BezierConn *bezier, Point *point, real line_width)
+bezierconn_closest_segment (BezierConn *bezier,
+			    Point *point,
+			    real line_width)
 {
   Point last;
   int i;
@@ -290,7 +304,8 @@ bezierconn_closest_segment(BezierConn *bezier, Point *point, real line_width)
  * \memberof _BezierConn Conceptually this is a member function 
  */
 Handle *
-bezierconn_closest_handle(BezierConn *bezier, Point *point)
+bezierconn_closest_handle (BezierConn *bezier,
+			   Point *point)
 {
   int i, hn;
   real dist;
@@ -336,7 +351,7 @@ bezierconn_closest_handle(BezierConn *bezier, Point *point)
  * point close to the major handle.
  */
 Handle *
-bezierconn_closest_major_handle(BezierConn *bezier, Point *point)
+bezierconn_closest_major_handle (BezierConn *bezier, Point *point)
 {
   Handle *closest = bezierconn_closest_handle(bezier, point);
 
@@ -350,7 +365,7 @@ bezierconn_closest_major_handle(BezierConn *bezier, Point *point)
  * @returns The shortest distance from the point to any part of the bezier.
  */
 real
-bezierconn_distance_from(BezierConn *bezier, Point *point, real line_width)
+bezierconn_distance_from (BezierConn *bezier, Point *point, real line_width)
 {
   return distance_bez_line_point(bezier->points, bezier->numpoints,
 				 line_width, point);
@@ -367,9 +382,10 @@ bezierconn_distance_from(BezierConn *bezier, Point *point, real line_width)
  * @param handle3 The handle that will be put after handle1
  */
 static void
-add_handles(BezierConn *bezier, int pos, BezPoint *point,
-	    BezCornerType corner_type, Handle *handle1,
-	    Handle *handle2, Handle *handle3)
+add_handles (BezierConn *bezier,
+	     int pos, BezPoint *point,
+	     BezCornerType corner_type,
+	     Handle *handle1, Handle *handle2, Handle *handle3)
 {
   int i;
   DiaObject *obj;
@@ -386,7 +402,7 @@ add_handles(BezierConn *bezier, int pos, BezPoint *point,
     bezier->points[i] = bezier->points[i-1];
     bezier->corner_types[i] = bezier->corner_types[i-1];
   }
-  bezier->points[pos] = *point; 
+  bezier->points[pos] = *point;
   bezier->points[pos].p1 = bezier->points[pos+1].p1;
   bezier->points[pos+1].p1 = point->p1;
   bezier->corner_types[pos] = corner_type;
@@ -406,7 +422,7 @@ add_handles(BezierConn *bezier, int pos, BezPoint *point,
  *            bezpoint at.
  */
 static void
-remove_handles(BezierConn *bezier, int pos)
+remove_handles (BezierConn *bezier, int pos)
 {
   int i;
   DiaObject *obj;
@@ -452,7 +468,8 @@ remove_handles(BezierConn *bezier, int pos)
  * @returns An ObjectChange object with undo information for the split.
  */
 ObjectChange *
-bezierconn_add_segment(BezierConn *bezier, int segment, Point *point)
+bezierconn_add_segment (BezierConn *bezier,
+			int segment, Point *point)
 {
   BezPoint realpoint;
   BezCornerType corner_type = BEZ_CORNER_SYMMETRIC;
@@ -502,7 +519,7 @@ bezierconn_add_segment(BezierConn *bezier, int segment, Point *point)
  * @returns Undo information for the segment removal.
  */
 ObjectChange *
-bezierconn_remove_segment(BezierConn *bezier, int pos)
+bezierconn_remove_segment (BezierConn *bezier, int pos)
 {
   Handle *old_handle1, *old_handle2, *old_handle3;
   ConnectionPoint *cpt1, *cpt2, *cpt3;
@@ -548,7 +565,7 @@ bezierconn_remove_segment(BezierConn *bezier, int pos)
  *                straighten.
  */
 static void
-bezierconn_straighten_corner(BezierConn *bezier, int comp_nr)
+bezierconn_straighten_corner (BezierConn *bezier, int comp_nr)
 {
   /* Neat thing would be to have the kind of straigthening depend on
      which handle was chosen:  Mid-handle does average, other leaves that
@@ -610,8 +627,9 @@ bezierconn_straighten_corner(BezierConn *bezier, int comp_nr)
  * @returns Undo information about the corner change.
  */
 ObjectChange *
-bezierconn_set_corner_type(BezierConn *bezier, Handle *handle,
-			   BezCornerType corner_type)
+bezierconn_set_corner_type (BezierConn *bezier,
+			    Handle *handle,
+			    BezCornerType corner_type)
 {
   Handle *mid_handle;
   Point old_left, old_right;
@@ -655,7 +673,7 @@ bezierconn_set_corner_type(BezierConn *bezier, Handle *handle,
  * @param bezier A bezierconn to update.
  */
 void
-bezierconn_update_data(BezierConn *bezier)
+bezierconn_update_data (BezierConn *bezier)
 {
   int i;
   DiaObject *obj = &bezier->object;
@@ -701,7 +719,7 @@ bezierconn_update_data(BezierConn *bezier)
  * @param bezier A bezier line to update bounding box for.
  */
 void
-bezierconn_update_boundingbox(BezierConn *bezier)
+bezierconn_update_boundingbox (BezierConn *bezier)
 {
   g_assert(bezier != NULL);
 
@@ -717,7 +735,8 @@ bezierconn_update_boundingbox(BezierConn *bezier)
  * @param renderer A renderer to draw with.
  */
 void
-bezierconn_draw_control_lines(BezierConn *bezier, DiaRenderer *renderer)
+bezierconn_draw_control_lines (BezierConn *bezier,
+			       DiaRenderer *renderer)
 {
   Color line_colour = { 0.0, 0.0, 0.6, 1.0 };
   Point startpoint;
@@ -746,7 +765,7 @@ bezierconn_draw_control_lines(BezierConn *bezier, DiaRenderer *renderer)
  * @param num_points The number of points of the bezierconn.
  */
 void
-new_handles(BezierConn *bezier, int num_points)
+new_handles (BezierConn *bezier, int num_points)
 {
   DiaObject *obj;
   int i;
@@ -782,7 +801,8 @@ new_handles(BezierConn *bezier, int num_points)
  * @param num_points The initial number of points on the curve.
  */
 void
-bezierconn_init(BezierConn *bezier, int num_points)
+bezierconn_init (BezierConn *bezier,
+		 int num_points)
 {
   DiaObject *obj;
   int i;
@@ -814,7 +834,9 @@ bezierconn_init(BezierConn *bezier, int num_points)
  * @param points The new points that this bezier should be set to use.
  */
 void
-bezierconn_set_points(BezierConn *bezier, int num_points, BezPoint *points)
+bezierconn_set_points (BezierConn *bezier,
+		       int num_points,
+		       BezPoint *points)
 {
   int i;
 
@@ -836,7 +858,7 @@ bezierconn_set_points(BezierConn *bezier, int num_points, BezPoint *points)
  * @param to The object to copy to.
  */
 void
-bezierconn_copy(BezierConn *from, BezierConn *to)
+bezierconn_copy (BezierConn *from, BezierConn *to)
 {
   int i;
   DiaObject *toobj, *fromobj;
@@ -875,7 +897,7 @@ bezierconn_copy(BezierConn *from, BezierConn *to)
  * and frees structures allocated by this bezierconn, but not the object itself
  */
 void
-bezierconn_destroy(BezierConn *bezier)
+bezierconn_destroy (BezierConn *bezier)
 {
   int i, nh;
   Handle **temp_handles;
@@ -903,7 +925,8 @@ bezierconn_destroy(BezierConn *bezier)
  * @param obj_node The XML node to save it into
  */
 void
-bezierconn_save(BezierConn *bezier, ObjectNode obj_node)
+bezierconn_save (BezierConn *bezier,
+		 ObjectNode obj_node)
 {
   int i;
   AttributeNode attr;
@@ -933,7 +956,9 @@ bezierconn_save(BezierConn *bezier, ObjectNode obj_node)
  * @param ctx The context in which this function is called
  */
 void
-bezierconn_load(BezierConn *bezier, ObjectNode obj_node, DiaContext *ctx)
+bezierconn_load (BezierConn *bezier,
+		 ObjectNode obj_node,
+		 DiaContext *ctx)
 {
   int i;
   AttributeNode attr;
@@ -1015,7 +1040,7 @@ bezierconn_load(BezierConn *bezier, ObjectNode obj_node, DiaContext *ctx)
  * @param change The undo information to free.
  */
 static void
-bezierconn_point_change_free(struct PointChange *change)
+bezierconn_point_change_free (struct PointChange *change)
 {
   if ( (change->type==TYPE_ADD_POINT && !change->applied) ||
        (change->type==TYPE_REMOVE_POINT && change->applied) ){
@@ -1033,7 +1058,7 @@ bezierconn_point_change_free(struct PointChange *change)
  * @param obj The object (must be a BezierConn) to apply the change to.
  */
 static void
-bezierconn_point_change_apply(struct PointChange *change, DiaObject *obj)
+bezierconn_point_change_apply (struct PointChange *change, DiaObject *obj)
 {
   change->applied = 1;
   switch (change->type) {
@@ -1056,7 +1081,7 @@ bezierconn_point_change_apply(struct PointChange *change, DiaObject *obj)
  * @param obj The object (must be a BezierConn) to revert the change of.
  */
 static void
-bezierconn_point_change_revert(struct PointChange *change, DiaObject *obj)
+bezierconn_point_change_revert (struct PointChange *change, DiaObject *obj)
 {
   switch (change->type) {
   case TYPE_ADD_POINT:
@@ -1094,8 +1119,10 @@ bezierconn_point_change_revert(struct PointChange *change, DiaObject *obj)
  * @return Newly created undo information.
  */
 static ObjectChange *
-bezierconn_create_point_change(BezierConn *bezier, enum change_type type,
-			       BezPoint *point, BezCornerType corner_type,
+bezierconn_create_point_change(BezierConn *bezier,
+			       enum change_type type,
+			       BezPoint *point,
+			       BezCornerType corner_type,
 			       int pos,
 			       Handle *handle1, ConnectionPoint *connected_to1,
 			       Handle *handle2, ConnectionPoint *connected_to2,
@@ -1176,18 +1203,23 @@ bezierconn_corner_change_revert(struct CornerChange *change,
  * @returns Newly allocated undo information.
  */
 static ObjectChange *
-bezierconn_create_corner_change(BezierConn *bezier, Handle *handle,
-				Point *point_left, Point *point_right,
-				BezCornerType old_corner_type,
-				BezCornerType new_corner_type)
+bezierconn_create_corner_change (BezierConn *bezier,
+				 Handle *handle,
+				 Point *point_left,
+				 Point *point_right,
+				 BezCornerType old_corner_type,
+				 BezCornerType new_corner_type)
 {
   struct CornerChange *change;
 
   change = g_new(struct CornerChange, 1);
 
-  change->obj_change.apply = (ObjectChangeApplyFunc) bezierconn_corner_change_apply;
-  change->obj_change.revert = (ObjectChangeRevertFunc) bezierconn_corner_change_revert;
-  change->obj_change.free = (ObjectChangeFreeFunc) NULL;
+  change->obj_change.apply =
+	(ObjectChangeApplyFunc) bezierconn_corner_change_apply;
+  change->obj_change.revert =
+	(ObjectChangeRevertFunc) bezierconn_corner_change_revert;
+  change->obj_change.free =
+	(ObjectChangeFreeFunc) NULL;
 
   change->old_type = old_corner_type;
   change->new_type = new_corner_type;
diff --git a/lib/beziershape.c b/lib/beziershape.c
index ea4035e..3fc9989 100644
--- a/lib/beziershape.c
+++ b/lib/beziershape.c
@@ -71,20 +71,28 @@ struct CornerChange {
 };
 
 static ObjectChange *
-beziershape_create_point_change(BezierShape *bezier, enum change_type type,
-			BezPoint *point, BezCornerType corner_type,
-			int segment,
-			Handle *handle1, Handle *handle2, Handle *handle3,
-			ConnectionPoint *cp1, ConnectionPoint *cp2);
+beziershape_create_point_change(BezierShape *bezier,
+				enum change_type type,
+				BezPoint *point,
+				BezCornerType corner_type,
+				int segment,
+				Handle *handle1,
+				Handle *handle2,
+				Handle *handle3,
+				ConnectionPoint *cp1,
+				ConnectionPoint *cp2);
 static ObjectChange *
-beziershape_create_corner_change(BezierShape *bezier, Handle *handle,
-			Point *point_left, Point *point_right,
-			BezCornerType old_corner_type,
-			BezCornerType new_corner_type);
+beziershape_create_corner_change(BezierShape *bezier,
+				 Handle *handle,
+				 Point *point_left,
+				 Point *point_right,
+				 BezCornerType old_corner_type,
+				 BezCornerType new_corner_type);
 
 static void new_handles_and_connections(BezierShape *bezier, int num_points);
 
-static void setup_handle(Handle *handle, int handle_id)
+static void
+setup_handle (Handle *handle, int handle_id)
 {
   handle->id = handle_id;
   handle->type =
@@ -96,7 +104,8 @@ static void setup_handle(Handle *handle, int handle_id)
 }
 
 
-static int get_handle_nr(BezierShape *bezier, Handle *handle)
+static int
+get_handle_nr (BezierShape *bezier, Handle *handle)
 {
   int i = 0;
   for (i = 0; i < bezier->object.num_handles; i++) {
@@ -110,11 +119,15 @@ static int get_handle_nr(BezierShape *bezier, Handle *handle)
 #define get_major_nr(hnum) (((int)(hnum)+2)/3)
 
 ObjectChange *
-beziershape_move_handle(BezierShape *bezier, Handle *handle,
-			Point *to, ConnectionPoint *cp,
-			HandleMoveReason reason, ModifierKeys modifiers)
+beziershape_move_handle (BezierShape *bezier,
+			 Handle *handle,
+			 Point *to,
+			 ConnectionPoint *cp,
+			 HandleMoveReason reason,
+			 ModifierKeys modifiers)
 {
-  int handle_nr, comp_nr, next_nr, prev_nr;
+  int handle_nr, comp_nr;
+  int next_nr, prev_nr;
   Point delta, pt;
   
   delta = *to;
@@ -216,7 +229,7 @@ beziershape_move_handle(BezierShape *bezier, Handle *handle,
 }
 
 ObjectChange*
-beziershape_move(BezierShape *bezier, Point *to)
+beziershape_move (BezierShape *bezier, Point *to)
 {
   Point p;
   int i;
@@ -235,7 +248,9 @@ beziershape_move(BezierShape *bezier, Point *to)
 }
 
 int
-beziershape_closest_segment(BezierShape *bezier, Point *point, real line_width)
+beziershape_closest_segment (BezierShape *bezier,
+			     Point *point,
+			     real line_width)
 {
   Point last;
   int i;
@@ -259,7 +274,8 @@ beziershape_closest_segment(BezierShape *bezier, Point *point, real line_width)
 }
 
 Handle *
-beziershape_closest_handle(BezierShape *bezier, Point *point)
+beziershape_closest_handle (BezierShape *bezier,
+			    Point *point)
 {
   int i, hn;
   real dist = G_MAXDOUBLE;
@@ -268,21 +284,21 @@ beziershape_closest_handle(BezierShape *bezier, Point *point)
   for (i = 1, hn = 0; i < bezier->numpoints; i++, hn++) {
     real new_dist;
 
-    new_dist = distance_point_point( point, &bezier->points[i].p1);
+    new_dist = distance_point_point(point, &bezier->points[i].p1);
     if (new_dist < dist) {
       dist = new_dist;
       closest = bezier->object.handles[hn];
     }
     hn++;
 
-    new_dist = distance_point_point( point, &bezier->points[i].p2);
+    new_dist = distance_point_point(point, &bezier->points[i].p2);
     if (new_dist < dist) {
       dist = new_dist;
       closest = bezier->object.handles[hn];
     }
-
     hn++;
-    new_dist = distance_point_point( point, &bezier->points[i].p3);
+
+    new_dist = distance_point_point(point, &bezier->points[i].p3);
     if (new_dist < dist) {
       dist = new_dist;
       closest = bezier->object.handles[hn];
@@ -292,7 +308,7 @@ beziershape_closest_handle(BezierShape *bezier, Point *point)
 }
 
 Handle *
-beziershape_closest_major_handle(BezierShape *bezier, Point *point)
+beziershape_closest_major_handle (BezierShape *bezier, Point *point)
 {
   Handle *closest = beziershape_closest_handle(bezier, point);
   int pos = get_major_nr(get_handle_nr(bezier, closest));
@@ -303,17 +319,18 @@ beziershape_closest_major_handle(BezierShape *bezier, Point *point)
 }
 
 real
-beziershape_distance_from(BezierShape *bezier, Point *point, real line_width)
+beziershape_distance_from (BezierShape *bezier, Point *point, real line_width)
 {
   return distance_bez_shape_point(bezier->points, bezier->numpoints,
 				  line_width, point);
 }
 
 static void
-add_handles(BezierShape *bezier, int pos, BezPoint *point,
-	    BezCornerType corner_type, Handle *handle1,
-	    Handle *handle2, Handle *handle3,
-	    ConnectionPoint *cp1, ConnectionPoint *cp2)
+add_handles (BezierShape *bezier,
+	     int pos, BezPoint *point,
+	     BezCornerType corner_type,
+	     Handle *handle1, Handle *handle2, Handle *handle3,
+	     ConnectionPoint *cp1, ConnectionPoint *cp2)
 {
   int i, next;
   DiaObject *obj = &bezier->object;
@@ -348,7 +365,7 @@ add_handles(BezierShape *bezier, int pos, BezPoint *point,
 }
 
 static void
-remove_handles(BezierShape *bezier, int pos)
+remove_handles (BezierShape *bezier, int pos)
 {
   int i;
   DiaObject *obj;
@@ -386,7 +403,7 @@ remove_handles(BezierShape *bezier, int pos)
   bezier->points = g_realloc(bezier->points,
 			     bezier->numpoints * sizeof(BezPoint));
   bezier->corner_types = g_realloc(bezier->corner_types,
-				   bezier->numpoints * sizeof(BezCornerType));
+				bezier->numpoints * sizeof(BezCornerType));
 
   old_handle1 = obj->handles[3*pos-3];
   old_handle2 = obj->handles[3*pos-2];
@@ -404,7 +421,8 @@ remove_handles(BezierShape *bezier, int pos)
 /* Add a point by splitting segment into two, putting the new point at
  'point' or, if NULL, in the middle */
 ObjectChange *
-beziershape_add_segment(BezierShape *bezier, int segment, Point *point)
+beziershape_add_segment (BezierShape *bezier,
+			 int segment, Point *point)
 {
   BezPoint realpoint;
   BezCornerType corner_type = BEZ_CORNER_SYMMETRIC;
@@ -455,7 +473,7 @@ beziershape_add_segment(BezierShape *bezier, int segment, Point *point)
 }
 
 ObjectChange *
-beziershape_remove_segment(BezierShape *bezier, int pos)
+beziershape_remove_segment (BezierShape *bezier, int pos)
 {
   Handle *old_handle1, *old_handle2, *old_handle3;
   ConnectionPoint *old_cp1, *old_cp2;
@@ -496,7 +514,8 @@ beziershape_remove_segment(BezierShape *bezier, int pos)
 }
 
 static void
-beziershape_straighten_corner(BezierShape *bez, int comp_nr) {
+beziershape_straighten_corner (BezierShape *bez, int comp_nr)
+{
   int next_nr;
 
   if (comp_nr == 0) comp_nr = bez->numpoints - 1;
@@ -560,8 +579,9 @@ beziershape_straighten_corner(BezierShape *bez, int comp_nr) {
 }
 
 ObjectChange *
-beziershape_set_corner_type(BezierShape *bez, Handle *handle,
-			    BezCornerType corner_type)
+beziershape_set_corner_type (BezierShape *bez,
+			     Handle *handle,
+			     BezCornerType corner_type)
 {
   Handle *mid_handle = NULL;
   Point old_left, old_right;
@@ -616,7 +636,7 @@ beziershape_set_corner_type(BezierShape *bez, Handle *handle,
 }
 
 void
-beziershape_update_data(BezierShape *bezier)
+beziershape_update_data (BezierShape *bezier)
 {
   int i;
   Point last;
@@ -699,7 +719,7 @@ beziershape_update_data(BezierShape *bezier)
 }
 
 void
-beziershape_update_boundingbox(BezierShape *bezier)
+beziershape_update_boundingbox (BezierShape *bezier)
 {
   ElementBBExtras *extra;
   PolyBBExtras pextra;
@@ -718,7 +738,8 @@ beziershape_update_boundingbox(BezierShape *bezier)
 }
 
 void
-beziershape_draw_control_lines(BezierShape *bez, DiaRenderer *renderer)
+beziershape_draw_control_lines (BezierShape *bez,
+				DiaRenderer *renderer)
 {
   Color line_colour = { 0.0, 0.0, 0.6, 1.0 };
   Point startpoint;
@@ -742,7 +763,7 @@ beziershape_draw_control_lines(BezierShape *bez, DiaRenderer *renderer)
 }
 
 static void
-new_handles_and_connections(BezierShape *bezier, int num_points)
+new_handles_and_connections (BezierShape *bezier, int num_points)
 {
   DiaObject *obj;
   int i;
@@ -784,7 +805,7 @@ new_handles_and_connections(BezierShape *bezier, int num_points)
 }
 
 void
-beziershape_init(BezierShape *bezier, int num_points)
+beziershape_init (BezierShape *bezier, int num_points)
 {
   DiaObject *obj;
   int i;
@@ -813,7 +834,9 @@ beziershape_init(BezierShape *bezier, int num_points)
 
 /** This function does *not* set up handles */
 void
-beziershape_set_points(BezierShape *bez, int num_points, BezPoint *points)
+beziershape_set_points (BezierShape *bez,
+			int num_points,
+			BezPoint *points)
 {
   int i;
 
@@ -830,7 +853,7 @@ beziershape_set_points(BezierShape *bez, int num_points, BezPoint *points)
 }
 
 void
-beziershape_copy(BezierShape *from, BezierShape *to)
+beziershape_copy (BezierShape *from, BezierShape *to)
 {
   int i;
   DiaObject *toobj, *fromobj;
@@ -865,7 +888,7 @@ beziershape_copy(BezierShape *from, BezierShape *to)
 }
 
 void
-beziershape_destroy(BezierShape *bezier)
+beziershape_destroy (BezierShape *bezier)
 {
   int i;
   Handle **temp_handles;
@@ -897,7 +920,8 @@ beziershape_destroy(BezierShape *bezier)
 
 
 void
-beziershape_save(BezierShape *bezier, ObjectNode obj_node)
+beziershape_save (BezierShape *bezier,
+		  ObjectNode obj_node)
 {
   int i;
   AttributeNode attr;
@@ -922,7 +946,9 @@ beziershape_save(BezierShape *bezier, ObjectNode obj_node)
 }
 
 void
-beziershape_load(BezierShape *bezier, ObjectNode obj_node, DiaContext *ctx)
+beziershape_load (BezierShape *bezier,
+		  ObjectNode obj_node,
+		  DiaContext *ctx)
 {
   int i;
   AttributeNode attr;
@@ -996,7 +1022,7 @@ beziershape_load(BezierShape *bezier, ObjectNode obj_node, DiaContext *ctx)
 }
 
 static void
-beziershape_point_change_free(struct BezPointChange *change)
+beziershape_point_change_free (struct BezPointChange *change)
 {
   if ( (change->type==TYPE_ADD_POINT && !change->applied) ||
        (change->type==TYPE_REMOVE_POINT && change->applied) ){
@@ -1014,7 +1040,7 @@ beziershape_point_change_free(struct BezPointChange *change)
 }
 
 static void
-beziershape_point_change_apply(struct BezPointChange *change, DiaObject *obj)
+beziershape_point_change_apply (struct BezPointChange *change, DiaObject *obj)
 {
   change->applied = 1;
   switch (change->type) {
@@ -1034,7 +1060,7 @@ beziershape_point_change_apply(struct BezPointChange *change, DiaObject *obj)
 }
 
 static void
-beziershape_point_change_revert(struct BezPointChange *change, DiaObject *obj)
+beziershape_point_change_revert (struct BezPointChange *change, DiaObject *obj)
 {
   switch (change->type) {
   case TYPE_ADD_POINT:
@@ -1051,12 +1077,16 @@ beziershape_point_change_revert(struct BezPointChange *change, DiaObject *obj)
 }
 
 static ObjectChange *
-beziershape_create_point_change(BezierShape *bezier, enum change_type type,
-				BezPoint *point, BezCornerType corner_type,
-				int pos,
-				Handle *handle1, Handle *handle2,
-				Handle *handle3,
-				ConnectionPoint *cp1, ConnectionPoint *cp2)
+beziershape_create_point_change (BezierShape *bezier,
+				 enum change_type type,
+				 BezPoint *point,
+				 BezCornerType corner_type,
+				 int pos,
+				 Handle *handle1,
+				 Handle *handle2,
+				 Handle *handle3,
+				 ConnectionPoint *cp1,
+				 ConnectionPoint *cp2)
 {
   struct BezPointChange *change;
 
@@ -1084,7 +1114,8 @@ beziershape_create_point_change(BezierShape *bezier, enum change_type type,
 }
 
 static void
-beziershape_corner_change_apply(struct CornerChange *change, DiaObject *obj)
+beziershape_corner_change_apply (struct CornerChange *change,
+				 DiaObject *obj)
 {
   BezierShape *bez = (BezierShape *)obj;
   int handle_nr = get_handle_nr(bez, change->handle);
@@ -1102,7 +1133,8 @@ beziershape_corner_change_apply(struct CornerChange *change, DiaObject *obj)
 }
 
 static void
-beziershape_corner_change_revert(struct CornerChange *change, DiaObject *obj)
+beziershape_corner_change_revert (struct CornerChange *change,
+				  DiaObject *obj)
 {
   BezierShape *bez = (BezierShape *)obj;
   int handle_nr = get_handle_nr(bez, change->handle);
@@ -1123,20 +1155,23 @@ beziershape_corner_change_revert(struct CornerChange *change, DiaObject *obj)
 }
 
 static ObjectChange *
-beziershape_create_corner_change(BezierShape *bez, Handle *handle,
-				 Point *point_left, Point *point_right,
-				 BezCornerType old_corner_type,
-				 BezCornerType new_corner_type)
+beziershape_create_corner_change (BezierShape *bez,
+				  Handle *handle,
+				  Point *point_left,
+				  Point *point_right,
+				  BezCornerType old_corner_type,
+				  BezCornerType new_corner_type)
 {
   struct CornerChange *change;
 
   change = g_new(struct CornerChange, 1);
 
   change->obj_change.apply =
-    (ObjectChangeApplyFunc)beziershape_corner_change_apply;
+	(ObjectChangeApplyFunc)beziershape_corner_change_apply;
   change->obj_change.revert =
-    (ObjectChangeRevertFunc)beziershape_corner_change_revert;
-  change->obj_change.free = (ObjectChangeFreeFunc)NULL;
+	(ObjectChangeRevertFunc)beziershape_corner_change_revert;
+  change->obj_change.free =
+	(ObjectChangeFreeFunc)NULL;
 
   change->old_type = old_corner_type;
   change->new_type = new_corner_type;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]