Change FSF Address

[~andy/gtk] / gdk / quartz / GdkQuartzView.c

diff --git a/gdk/quartz/GdkQuartzView.c b/gdk/quartz/GdkQuartzView.c
index cb92928e7bac0705d431e0eb6838393ecc3ab143..d2f791c4f4c22a08f03be26042224cb21ef779ed 100644 (file)
--- a/gdk/quartz/GdkQuartzView.c
+++ b/gdk/quartz/GdkQuartzView.c
@@ -13,18 +13,27 @@
  * Lesser General Public License for more details.
  *
  * 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #import "GdkQuartzView.h"
-#include "gdkwindow-quartz.h"
+#include "gdkquartzwindow.h"
 #include "gdkprivate-quartz.h"
+#include "gdkquartz.h"
 
 @implementation GdkQuartzView
 
+-(void)dealloc
+{
+  if (trackingRect)
+    {
+      [self removeTrackingRect:trackingRect];
+      trackingRect = 0;
+    }
+
+  [super dealloc];
+}
+
 -(void)setGdkWindow:(GdkWindow *)window
 {
   gdk_window = window;
@@ -35,6 +44,11 @@
   return gdk_window;
 }
 
+-(NSTrackingRectTag)trackingRect
+{
+  return trackingRect;
+}
+
 -(BOOL)isFlipped
 {
   return YES;
@@ -45,31 +59,38 @@
   if (GDK_WINDOW_DESTROYED (gdk_window))
     return YES;
 
-  /* A view is opaque if its GdkWindow doesn't have the RGBA colormap */
-  return gdk_drawable_get_colormap (gdk_window) != gdk_screen_get_rgba_colormap (_gdk_screen);
+  /* A view is opaque if its GdkWindow doesn't have the RGBA visual */
+  return gdk_window_get_visual (gdk_window) != gdk_screen_get_rgba_visual (_gdk_screen);
 }
 
 -(void)drawRect:(NSRect)rect 
 {
   GdkRectangle gdk_rect;
-  GdkWindowObject *private = GDK_WINDOW_OBJECT (gdk_window);
-  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl);
+  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (gdk_window->impl);
   const NSRect *drawn_rects;
-  int count, i;
-  GdkRegion *region;
+  NSInteger count;
+  int i;
+  cairo_region_t *region;
 
   if (GDK_WINDOW_DESTROYED (gdk_window))
     return;
 
-  if (!(private->event_mask & GDK_EXPOSURE_MASK))
+  if (!(gdk_window->event_mask & GDK_EXPOSURE_MASK))
     return;
 
-  GDK_QUARTZ_ALLOC_POOL;
-
-  [self getRectsBeingDrawn:&drawn_rects count:&count];
+  if (NSEqualRects (rect, NSZeroRect))
+    return;
 
-  region = gdk_region_new ();
+  /* Clear our own bookkeeping of regions that need display */
+  if (impl->needs_display_region)
+    {
+      cairo_region_destroy (impl->needs_display_region);
+      impl->needs_display_region = NULL;
+    }
 
+  [self getRectsBeingDrawn:&drawn_rects count:&count];
+  region = cairo_region_create ();
+  
   for (i = 0; i < count; i++)
     {
       gdk_rect.x = drawn_rects[i].origin.x;
@@ -77,37 +98,25 @@
       gdk_rect.width = drawn_rects[i].size.width;
       gdk_rect.height = drawn_rects[i].size.height;
 
-      gdk_region_union_with_rect (region, &gdk_rect);
+      cairo_region_union_rectangle (region, &gdk_rect);
     }
 
-  if (!gdk_region_empty (region))
+  impl->in_paint_rect_count++;
+  _gdk_window_process_updates_recurse (gdk_window, region);
+  impl->in_paint_rect_count--;
+
+  cairo_region_destroy (region);
+
+  if (needsInvalidateShadow)
     {
-      GdkEvent event;
-      
-      gdk_rect.x = rect.origin.x;
-      gdk_rect.y = rect.origin.y;
-      gdk_rect.width = rect.size.width;
-      gdk_rect.height = rect.size.height;
-      
-      event.expose.type = GDK_EXPOSE;
-      event.expose.window = g_object_ref (gdk_window);
-      event.expose.send_event = FALSE;
-      event.expose.count = 0;
-      event.expose.region = region;
-      event.expose.area = gdk_rect;
-      
-      impl->in_paint_rect_count++;
-
-      (*_gdk_event_func) (&event, _gdk_event_data);
-
-      impl->in_paint_rect_count--;
-
-      g_object_unref (gdk_window);
+      [[self window] invalidateShadow];
+      needsInvalidateShadow = NO;
     }
+}
 
-  gdk_region_destroy (region);
-
-  GDK_QUARTZ_RELEASE_POOL;
+-(void)setNeedsInvalidateShadow:(BOOL)invalidate
+{
+  needsInvalidateShadow = invalidate;
 }
 
 /* For information on setting up tracking rects properly, see here:
@@ -115,14 +124,16 @@
  */
 -(void)updateTrackingRect
 {
-  GdkWindowObject *private = GDK_WINDOW_OBJECT (gdk_window);
-  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl);
+  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (gdk_window->impl);
   NSRect rect;
 
+  if (!impl->toplevel)
+    return;
+
   if (trackingRect)
     {
       [self removeTrackingRect:trackingRect];
-      trackingRect = nil;
+      trackingRect = 0;
     }
 
   if (!impl->toplevel)
@@ -132,11 +143,20 @@
    * NSPointInRect ([[self window] convertScreenToBase:[NSEvent mouseLocation]], rect)
    */
 
-  rect = NSMakeRect (0, 0, impl->width, impl->height);
+  rect = [self bounds];
   trackingRect = [self addTrackingRect:rect
                                  owner:self
                               userData:nil
                           assumeInside:NO];
+
+  if (NSPointInRect ([[self window] convertScreenToBase:[NSEvent mouseLocation]], rect))
+    {
+      /* When a new window (and thus view) has been created, and the mouse
+       * is in the window area, we will not receive an NSMouseEntered
+       * event.  Therefore, we synthesize an enter notify event manually.
+       */
+      _gdk_quartz_events_send_enter_notify_event (gdk_window);
+    }
 }
 
 -(void)viewDidMoveToWindow
@@ -152,14 +172,16 @@
   if (newWindow == nil && trackingRect)
     {
       [self removeTrackingRect:trackingRect];
-      trackingRect = nil;
+      trackingRect = 0;
     }
 }
 
--(void)setBounds:(NSRect)bounds
+-(void)setFrame:(NSRect)frame
 {
-  [super setBounds:bounds];
-  [self updateTrackingRect];
+  [super setFrame:frame];
+
+  if ([self window])
+    [self updateTrackingRect];
 }
 
 @end