Minor tidyup for window flushing

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3695 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,8 @@
+Fri Feb 12 16:20:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/NSView.m: Improve window flushing
+	* Source/NSWindow.m: ditto
+
 Fri Feb 12 13:37:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/NSCell.m: Fixes to draw text using NSText (by Benhur)

Source/NSView.m

@@ -1042,6 +1042,7 @@ BOOL changedSize = NO;
 	    }
 	}
       needs_display = stillNeedsDisplay;
+      [window flushWindow];
     }
 }
 
@@ -1099,8 +1100,6 @@ BOOL changedSize = NO;
 	}
     }
 
-  [window flushWindow];
-
   /*
    *	If the rect we displayed contains the invalidRect
    *	for the view then we can empty invalidRect.
@@ -1115,6 +1114,7 @@ BOOL changedSize = NO;
       stillNeedsDisplay = YES;
     }
   needs_display = stillNeedsDisplay;
+  [window flushWindow];
 }
 
 - (void)drawRect:(NSRect)rect

Source/NSWindow.m

@@ -510,9 +510,12 @@ NSPoint basePoint;
 //
 // Managing the display
 //
-- (void)disableFlushWindow                  { disable_flush_window = YES; }
+- (void) disableFlushWindow
+{
+  disable_flush_window = YES;
+}
 
-- (void)display
+- (void) display
 {
   visible = YES;
   needs_display = NO;                             // inform first responder
@@ -524,9 +527,10 @@ NSPoint basePoint;
   [[content_view superview] display];             // Draw the window view
 
   [self enableFlushWindow];                       // Reenable displaying and
-}                                                   // flush the window
+  [self flushWindowIfNeeded];                     // flush the window
+}
 
-- (void)displayIfNeeded
+- (void) displayIfNeeded
 {
   if (needs_display)
     {
@@ -539,15 +543,20 @@ NSPoint basePoint;
 {
   NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
 
-  if (is_autodisplay && needs_display)              // if autodisplay is
+  /*
-    {                                               // enabled and window
+   *	if autodisplay is enabled and window display
-      [self displayIfNeeded];                       // display
+   */
+  if (is_autodisplay && needs_display)
+    {
+      [self disableFlushWindow];
+      [self displayIfNeeded];
+      [self enableFlushWindow];
       [self flushWindowIfNeeded];
     }
   [nc postNotificationName: NSWindowDidUpdateNotification object: self];
 }
 
-- (void)flushWindowIfNeeded
+- (void) flushWindowIfNeeded
 {
   if (!disable_flush_window && needs_flush)
     {
@@ -556,11 +565,30 @@ NSPoint basePoint;
     }
 }
 
-- (void)flushWindow                         {}      // implemented in back end
+- (void) flushWindow
-- (void)enableFlushWindow                   { disable_flush_window = NO; }
+{
-- (BOOL)isAutodisplay                       { return is_autodisplay; }
+  // implemented in back end
-- (BOOL)isFlushWindowDisabled               { return disable_flush_window; }
+}
-- (void)setAutodisplay:(BOOL)flag           { is_autodisplay = flag; }
+
+- (void) enableFlushWindow
+{
+  disable_flush_window = NO;
+}
+
+- (BOOL) isAutodisplay
+{
+  return is_autodisplay;
+}
+
+- (BOOL) isFlushWindowDisabled
+{
+  return disable_flush_window;
+}
+
+- (void) setAutodisplay: (BOOL)flag
+{
+  is_autodisplay = flag;
+}
 
 - (void) setViewsNeedDisplay: (BOOL)flag
 {
@@ -568,10 +596,17 @@ NSPoint basePoint;
   [[NSApplication sharedApplication] setWindowsNeedUpdate: YES];
 }
 
-- (BOOL)viewsNeedDisplay                    { return needs_display; }
+- (BOOL) viewsNeedDisplay
-- (void)useOptimizedDrawing:(BOOL)flag      { optimize_drawing = flag; }
+{
+  return needs_display;
+}
 
-- (BOOL)canStoreColor
+- (void) useOptimizedDrawing: (BOOL)flag
+{
+  optimize_drawing = flag;
+}
+
+- (BOOL) canStoreColor
 {
   if (depth_limit > 1)                            // If the depth is greater
     return YES;                                 // than a single bit