[Emacs-diffs] trunk r114182: Review and drop old frame resize hack.

[Dmitry Antipov]

------------------------------------------------------------
revno: 114182
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-09 20:47:43 +0400
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/dispnew.c                  dispnew.c-20091113204419-o5vbwnq5f7feedwu-258
  src/frame.h                    frame.h-20091113204419-o5vbwnq5f7feedwu-229
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-09 14:01:02 +0000
+++ b/src/ChangeLog     2013-09-09 16:47:43 +0000
@@ -1,5 +1,16 @@
 2013-09-09  Dmitry Antipov  <address@hidden>
 
+       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  <address@hidden>
+
        Do not populate pure Xism x_sync to other ports.
        * frame.h (x_sync): Move under HAVE_X_WINDOWS.
        * frame.c (other_visible_frames) [HAVE_X_WINDOWS]: Use as such.

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2013-09-09 12:15:45 +0000
+++ b/src/dispnew.c     2013-09-09 16:47:43 +0000
@@ -3061,16 +3061,6 @@
       /* 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
     {

=== modified file 'src/frame.h'
--- a/src/frame.h       2013-09-09 14:01:02 +0000
+++ b/src/frame.h       2013-09-09 16:47:43 +0000
@@ -185,10 +185,6 @@
      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.  */

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-09-09 12:15:45 +0000
+++ b/src/xdisp.c       2013-09-09 16:47:43 +0000
@@ -10767,11 +10767,9 @@
          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;