* nsterm.m (ns_update_begin): Set clip path to whole view by using

NSBezierPath.

Fixes: debbugs:12131

diff --git a/src/ChangeLog b/src/ChangeLog
index 548c80b3b853206b25b975c99b7c701118179fbd..412321563bad61233c3b47d7f2485d30aa475553 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-10  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsterm.m (ns_update_begin): Set clip path to whole view by using
+       NSBezierPath (Bug#12131).
+
 2012-09-10  Chong Yidong  <cyd@gnu.org>
 
        * fns.c (Fdelq, Fdelete): Doc fix.

diff --git a/src/nsterm.m b/src/nsterm.m
index 74a3d8587104399f2a166ce773ef6f57cdc44693..798c975837625ba37c36251453f355f6297ddfba 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -627,6 +627,8 @@ ns_update_begin (struct frame *f)
    -------------------------------------------------------------------------- */
 {
   NSView *view = FRAME_NS_VIEW (f);
+  NSRect r = [view frame];
+  NSBezierPath *bp = [NSBezierPath bezierPath];
   NSTRACE (ns_update_begin);
 
   ns_update_auto_hide_menu_bar ();
@@ -634,6 +636,13 @@ ns_update_begin (struct frame *f)
   ns_updating_frame = f;
   [view lockFocus];
 
+  /* drawRect may have been called for say the minibuffer, and then clip path
+     is for the minibuffer.  But the display engine may draw more because
+     we have set the frame as garbaged.  So reset clip path to the whole
+     view.  */
+  [bp appendBezierPathWithRect: r];
+  [bp setClip];
+
 #ifdef NS_IMPL_GNUSTEP
   uRect = NSMakeRect (0, 0, 0, 0);
 #endif