Review and drop old frame resize hack.

* frame.h (struct frame): Remove force_flush_display_p.
* dispnew.c (update_frame): Adjust user and don't call
flush_frame here.  The comment has said that there was an issues
with redisplaying fringes, but I don't see any differences with
and without this hack.  Hopefully we can continue without it.
* xdisp.c (clear_garbaged_frames): Adjust user and do not clear
current frame matrices twice if resized_p is set.

diff --git a/src/ChangeLog b/src/ChangeLog
index c6eb58071e835f212fc3b3ef9a93860e146e5c64..4b688e43430ad61a7da54adad24c1c740070bf23 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2013-09-09  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       Review and drop old frame resize hack.
+       * frame.h (struct frame): Remove force_flush_display_p.
+       * dispnew.c (update_frame): Adjust user and don't call
+       flush_frame here.  The comment has said that there was an issues
+       with redisplaying fringes, but I don't see any differences with
+       and without this hack.  Hopefully we can continue without it.
+       * xdisp.c (clear_garbaged_frames): Adjust user and do not clear
+       current frame matrices twice if resized_p is set.
+
 2013-09-09  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Do not populate pure Xism x_sync to other ports.

diff --git a/src/dispnew.c b/src/dispnew.c
index 74ecfa88bde8df4330073c285d43423de43de03f..a42b3da5fc57f6af6ef5960959de297ef7b2bb89 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3061,16 +3061,6 @@ update_frame (struct frame *f, bool force_p, bool inhibit_hairy_id_p)
       /* Update windows.  */
       paused_p = update_window_tree (root_window, force_p);
       update_end (f);
-
-      /* This flush is a performance bottleneck under X,
-        and it doesn't seem to be necessary anyway (in general).
-         It is necessary when resizing the window with the mouse, or
-        at least the fringes are not redrawn in a timely manner.  ++kfs */
-      if (f->force_flush_display_p)
-       {
-         flush_frame (f);
-         f->force_flush_display_p = 0;
-       }
     }
   else
     {

diff --git a/src/frame.h b/src/frame.h
index baf8d6b93a98c92b0c461d6285374515116fc439..87e218ee938cdf61977103dbe700c2ae77a3b7de 100644 (file)
--- a/src/frame.h
+++ b/src/frame.h
@@ -185,10 +185,6 @@ struct frame
      Clear the frame in clear_garbaged_frames if set.  */
   unsigned resized_p : 1;
 
-  /* Set to non-zero in when we want for force a flush_display in
-     update_frame, usually after resizing the frame.  */
-  unsigned force_flush_display_p : 1;
-
   /* Set to non-zero if the default face for the frame has been
      realized.  Reset to zero whenever the default face changes.
      Used to see the difference between a font change and face change.  */

diff --git a/src/xdisp.c b/src/xdisp.c
index 960ad18709bd67f09deea2496be8ca057bea34e2..df3fa3668036c981d2f07e3e119d35890e76eea9 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10767,11 +10767,9 @@ clear_garbaged_frames (void)
          if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f))
            {
              if (f->resized_p)
-               {
-                 redraw_frame (f);
-                 f->force_flush_display_p = 1;
-               }
-             clear_current_matrices (f);
+               redraw_frame (f);
+             else
+               clear_current_matrices (f);
              changed_count++;
              f->garbaged = 0;
              f->resized_p = 0;