gdk: Do final copy with OPERATOR_SOURCE in end_implicit_paint

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

diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c
index b3b17c43cccc0f7111f790833fe4f18f9ab35f06..060bd03ef523fe8decd1919ddfb820b4e80dd312 100644 (file)
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.c
@@ -24,12 +24,25 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include "config.h"
 #include <gdk/gdk.h>
 
+
+/**
+ * gdk_rectangle_union:
+ * @src1: a #GdkRectangle
+ * @src2: a #GdkRectangle
+ * @dest: return location for the union of @src1 and @src2
+ *
+ * Calculates the union of two rectangles.
+ * The union of rectangles @src1 and @src2 is the smallest rectangle which
+ * includes both @src1 and @src2 within it.
+ * It is allowed for @dest to be the same as either @src1 or @src2.
+ */
 void
-gdk_rectangle_union (GdkRectangle *src1,
-                    GdkRectangle *src2,
-                    GdkRectangle *dest)
+gdk_rectangle_union (const GdkRectangle *src1,
+                    const GdkRectangle *src2,
+                    GdkRectangle       *dest)
 {
   gint dest_x, dest_y;
   
@@ -45,68 +58,53 @@ gdk_rectangle_union (GdkRectangle *src1,
   dest->y = dest_y;
 }
 
+/**
+ * gdk_rectangle_intersect:
+ * @src1: a #GdkRectangle
+ * @src2: a #GdkRectangle
+ * @dest: (out caller-allocates) (allow-none): return location for the
+ * intersection of @src1 and @src2, or %NULL
+ *
+ * Calculates the intersection of two rectangles. It is allowed for
+ * @dest to be the same as either @src1 or @src2. If the rectangles 
+ * do not intersect, @dest's width and height is set to 0 and its x 
+ * and y values are undefined. If you are only interested in whether
+ * the rectangles intersect, but not in the intersecting area itself,
+ * pass %NULL for @dest.
+ *
+ * Returns: %TRUE if the rectangles intersect.
+ */
 gboolean
-gdk_rectangle_intersect (GdkRectangle *src1,
-                        GdkRectangle *src2,
-                        GdkRectangle *dest)
+gdk_rectangle_intersect (const GdkRectangle *src1,
+                        const GdkRectangle *src2,
+                        GdkRectangle       *dest)
 {
-  GdkRectangle *temp;
-  gint src1_x2, src1_y2;
-  gint src2_x2, src2_y2;
+  gint dest_x, dest_y;
+  gint dest_x2, dest_y2;
   gint return_val;
 
   g_return_val_if_fail (src1 != NULL, FALSE);
   g_return_val_if_fail (src2 != NULL, FALSE);
-  g_return_val_if_fail (dest != NULL, FALSE);
 
   return_val = FALSE;
 
-  if (src2->x < src1->x)
-    {
-      temp = src1;
-      src1 = src2;
-      src2 = temp;
-    }
-  src1_x2 = src1->x + src1->width;
-  src2_x2 = src2->x + src2->width;
+  dest_x = MAX (src1->x, src2->x);
+  dest_y = MAX (src1->y, src2->y);
+  dest_x2 = MIN (src1->x + src1->width, src2->x + src2->width);
+  dest_y2 = MIN (src1->y + src1->height, src2->y + src2->height);
 
-  if (src2->x < src1_x2)
+  if (dest_x2 > dest_x && dest_y2 > dest_y)
     {
-      dest->x = src2->x;
-
-      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;
-       }
-      src1_y2 = src1->y + src1->height;
-      src2_y2 = src2->y + src2->height;
-
-      if (src2->y < src1_y2)
-       {
-         return_val = TRUE;
-
-         dest->y = src2->y;
-
-         if (src1_y2 < src2_y2)
-           dest->height = src1_y2 - dest->y;
-         else
-           dest->height = src2_y2 - dest->y;
-
-         if (dest->height == 0)
-           return_val = FALSE;
-         if (dest->width == 0)
-           return_val = FALSE;
-       }
+      if (dest)
+        {
+          dest->x = dest_x;
+          dest->y = dest_y;
+          dest->width = dest_x2 - dest_x;
+          dest->height = dest_y2 - dest_y;
+        }
+      return_val = TRUE;
     }
-
-  if (!return_val)
+  else if (dest)
     {
       dest->width = 0;
       dest->height = 0;
@@ -114,3 +112,24 @@ gdk_rectangle_intersect (GdkRectangle *src1,
 
   return return_val;
 }
+
+static GdkRectangle *
+gdk_rectangle_copy (const GdkRectangle *rectangle)
+{
+  GdkRectangle *result = g_new (GdkRectangle, 1);
+  *result = *rectangle;
+
+  return result;
+}
+
+GType
+gdk_rectangle_get_type (void)
+{
+  static GType our_type = 0;
+  
+  if (our_type == 0)
+    our_type = g_boxed_type_register_static (g_intern_static_string ("GdkRectangle"),
+                                            (GBoxedCopyFunc)gdk_rectangle_copy,
+                                            (GBoxedFreeFunc)g_free);
+  return our_type;
+}