Fix a bug in one of my earlier changes. (From Naofumi Yasufuku, #100023)

[~andy/gtk] / gdk / gdkrectangle.c

diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c
index 8fd435aa9e9d17b8a1d5a13742e2040e5bec90a0..c480d9f998a4f8e99cb65c48fed5817117310d50 100644 (file)
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.c
@@ -2,55 +2,56 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include "gdk.h"
-
-
+#include <gdk/gdk.h>
 
 void
 gdk_rectangle_union (GdkRectangle *src1,
                     GdkRectangle *src2,
                     GdkRectangle *dest)
 {
+  gint dest_x, dest_y;
+  
   g_return_if_fail (src1 != NULL);
   g_return_if_fail (src2 != NULL);
   g_return_if_fail (dest != NULL);
 
-  dest->x = MIN (src1->x, src2->x);
-  dest->y = MIN (src1->y, src2->y);
-  dest->width = MAX (src1->x + src1->width, src2->x + src2->width) - dest->x;
-  dest->height = MAX (src1->y + src1->height, src2->y + src2->height) - dest->y;
+  dest_x = MIN (src1->x, src2->x);
+  dest_y = MIN (src1->y, src2->y);
+  dest->width = MAX (src1->x + src1->width, src2->x + src2->width) - dest_x;
+  dest->height = MAX (src1->y + src1->height, src2->y + src2->height) - dest_y;
+  dest->x = dest_x;
+  dest->y = dest_y;
 }
 
-gint
+gboolean
 gdk_rectangle_intersect (GdkRectangle *src1,
                         GdkRectangle *src2,
                         GdkRectangle *dest)
 {
-  GdkRectangle *temp;
-  gint src1_x2, src1_y2;
-  gint src2_x2, src2_y2;
+  gint dest_x, dest_y;
+  gint dest_w, dest_h;
   gint return_val;
 
   g_return_val_if_fail (src1 != NULL, FALSE);
@@ -59,50 +60,46 @@ gdk_rectangle_intersect (GdkRectangle *src1,
 
   return_val = FALSE;
 
-  if (src2->x < src1->x)
+  dest_x = MAX (src1->x, src2->x);
+  dest_y = MAX (src1->y, src2->y);
+  dest_w = MIN (src1->x + src1->width, src2->x + src2->width) - dest_x;
+  dest_h = MIN (src1->y + src1->height, src2->y + src2->height) - dest_y;
+
+  if (dest_w > 0 && dest_h > 0)
     {
-      temp = src1;
-      src1 = src2;
-      src2 = temp;
+      dest->x = dest_x;
+      dest->y = dest_y;
+      dest->width = dest_w;
+      dest->height = dest_h;
+      return_val = TRUE;
     }
-  dest->x = src2->x;
-
-  src1_x2 = src1->x + src1->width;
-  src2_x2 = src2->x + src2->width;
-
-  if (src2->x < src1_x2)
+  else
     {
-      if (src1_x2 < src2_x2)
-       dest->width = src1_x2 - dest->x;
-      else
-       dest->width = src2_x2 - dest->x;
-
-      if (src2->y < src1->y)
-       {
-         temp = src1;
-         src1 = src2;
-         src2 = temp;
-       }
-      dest->y = src2->y;
-
-      src1_y2 = src1->y + src1->height;
-      src2_y2 = src2->y + src2->height;
+      dest->width = 0;
+      dest->height = 0;
+    }
 
-      if (src2->y < src1_y2)
-       {
-         return_val = TRUE;
+  return return_val;
+}
 
-         if (src1_y2 < src2_y2)
-           dest->height = src1_y2 - dest->y;
-         else
-           dest->height = src2_y2 - dest->y;
+static GdkRectangle *
+gdk_rectangle_copy (const GdkRectangle *rectangle)
+{
+  GdkRectangle *result = g_new (GdkRectangle, 1);
+  *result = *rectangle;
 
-         if (dest->height == 0)
-           return_val = FALSE;
-         if (dest->width == 0)
-           return_val = FALSE;
-       }
-    }
+  return result;
+}
 
-  return return_val;
+GType
+gdk_rectangle_get_type (void)
+{
+  static GType our_type = 0;
+  
+  if (our_type == 0)
+    our_type = g_boxed_type_register_static ("GdkRectangle",
+                                            (GBoxedCopyFunc)gdk_rectangle_copy,
+                                            (GBoxedFreeFunc)g_free);
+  return our_type;
 }
+