1 files changed, 49 insertions, 27 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index c74e81a3933..f19706005ad 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -943,7 +943,7 @@ redisplay_trace (char const *fmt, ...)
     {
       va_list ap;
       va_start (ap, fmt);
-      vprintf (fmt, ap);
+      vfprintf (stderr, fmt, ap);
       va_end (ap);
     }
 }
@@ -961,7 +961,7 @@ move_trace (char const *fmt, ...)
     {
       va_list ap;
       va_start (ap, fmt);
-      vprintf (fmt, ap);
+      vfprintf (stderr, fmt, ap);
       va_end (ap);
     }
 }
@@ -3348,9 +3348,7 @@ init_iterator (struct it *it, struct window *w,
      of the iterator's frame, when set, suppresses their display - by
      default for tooltip frames and when set via the 'no-special-glyphs'
      frame parameter.  */
-#ifdef HAVE_WINDOW_SYSTEM
-  if (!(FRAME_WINDOW_P (it->f) && it->f->no_special_glyphs))
-#endif
+  if (!it->f->no_special_glyphs)
     {
       if (it->line_wrap == TRUNCATE)
         {
@@ -13554,7 +13552,11 @@ echo_area_display (bool update_frame_p)
               flush_frame (f);
             }
           else
-            update_frame (f, true, true);
+            {
+              update_frame (f, true, true);
+              if (is_tty_frame (f))
+                combine_updates_for_frame (f, true, true);
+            }
 
           /* If cursor is in the echo area, make sure that the next
              redisplay displays the minibuffer, so that the cursor will
@@ -17033,6 +17035,9 @@ redisplay_internal (void)
   if (face_change)
     windows_or_buffers_changed = 47;
 
+  /* FIXME/tty: can we do better for tty child frames? It could be
+     a bit faster when we switch between child frames of the same
+     root frame. OTOH, it's probably not a frequent use case. */
   if ((FRAME_TERMCAP_P (sf) || FRAME_MSDOS_P (sf))
       && FRAME_TTY (sf)->previous_frame != sf)
     {
@@ -17055,6 +17060,7 @@ redisplay_internal (void)
     {
       struct frame *f = XFRAME (frame);
 
+      /* FRAME_REDISPLAY_P true basically means the frame is visible. */
       if (FRAME_REDISPLAY_P (f))
         {
           ++number_of_visible_frames;
@@ -17198,7 +17204,6 @@ redisplay_internal (void)
       && !current_buffer->clip_changed
       && !current_buffer->prevent_redisplay_optimizations_p
       && FRAME_REDISPLAY_P (XFRAME (w->frame))
-      && !FRAME_OBSCURED_P (XFRAME (w->frame))
       && !XFRAME (w->frame)->cursor_type_changed
       && !XFRAME (w->frame)->face_change
       /* Make sure recorded data applies to current buffer, etc.  */
@@ -17447,22 +17452,19 @@ redisplay_internal (void)
 
       propagate_buffer_redisplay ();
 
+      Lisp_Object tty_root_frames = Qnil;
       FOR_EACH_FRAME (tail, frame)
         {
           struct frame *f = XFRAME (frame);
 
-          /* We don't have to do anything for unselected terminal
-             frames.  */
-          if ((FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
-              && !EQ (FRAME_TTY (f)->top_frame, frame))
-            continue;
+          if (is_tty_root_frame (f))
+            tty_root_frames = Fcons (frame, tty_root_frames);
 
         retry_frame:
           if (FRAME_WINDOW_P (f) || FRAME_TERMCAP_P (f) || f == sf)
             {
-              bool gcscrollbars
-                /* Only GC scrollbars when we redisplay the whole frame.  */
-                = f->redisplay || !REDISPLAY_SOME_P ();
+              /* Only GC scrollbars when we redisplay the whole frame.  */
+              bool gcscrollbars = f->redisplay || !REDISPLAY_SOME_P ();
               bool f_redisplay_flag = f->redisplay;
 
               /* The X error handler may have deleted that frame before
@@ -17479,7 +17481,7 @@ redisplay_internal (void)
               if (gcscrollbars && FRAME_TERMINAL (f)->condemn_scroll_bars_hook)
                 FRAME_TERMINAL (f)->condemn_scroll_bars_hook (f);
 
-              if (FRAME_REDISPLAY_P (f) && !FRAME_OBSCURED_P (f))
+              if (FRAME_REDISPLAY_P (f))
                 {
                   /* Don't allow freeing images and faces for this
                      frame as long as the frame's update wasn't
@@ -17505,7 +17507,9 @@ redisplay_internal (void)
               if (gcscrollbars && FRAME_TERMINAL (f)->judge_scroll_bars_hook)
                 FRAME_TERMINAL (f)->judge_scroll_bars_hook (f);
 
-              if (FRAME_REDISPLAY_P (f) && !FRAME_OBSCURED_P (f))
+              /* FIXME/tty: The FRAME_OBSCURE_P (f->visible == 2, :-()
+                 seems to be something for Windows. I'm ignoring it. */
+              if (FRAME_REDISPLAY_P (f))
                 {
                   /* If fonts changed on visible frame, display again.  */
                   if (f->fonts_changed)
@@ -17590,6 +17594,9 @@ redisplay_internal (void)
             }
         }
 
+      if (CONSP (tty_root_frames))
+        pending |= combine_updates (tty_root_frames, false, false);
+
       eassert (EQ (XFRAME (selected_frame)->selected_window, selected_window));
 
       if (!pending)
@@ -17611,7 +17618,7 @@ redisplay_internal (void)
             }
         }
     }
-  else if (FRAME_REDISPLAY_P (sf) && !FRAME_OBSCURED_P (sf))
+  else if (FRAME_REDISPLAY_P (sf))
     {
       sf->inhibit_clear_image_cache = true;
       displayed_buffer = XBUFFER (XWINDOW (selected_window)->contents);
@@ -17662,7 +17669,7 @@ redisplay_internal (void)
         unrequest_sigio ();
       STOP_POLLING;
 
-      if (FRAME_REDISPLAY_P (sf) && !FRAME_OBSCURED_P (sf))
+      if (FRAME_REDISPLAY_P (sf))
         {
           if (hscroll_retries <= MAX_HSCROLL_RETRIES
               && hscroll_windows (selected_window))
@@ -17673,6 +17680,10 @@ redisplay_internal (void)
 
           XWINDOW (selected_window)->must_be_updated_p = true;
           pending = update_frame (sf, false, false);
+
+          if (is_tty_frame (sf))
+            pending |= combine_updates_for_frame (sf, false, false);
+
           sf->cursor_type_changed = false;
           sf->inhibit_clear_image_cache = false;
         }
@@ -17685,10 +17696,13 @@ redisplay_internal (void)
       Lisp_Object mini_window = FRAME_MINIBUF_WINDOW (sf);
       struct frame *mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
 
-      if (mini_frame != sf && FRAME_WINDOW_P (mini_frame))
+      /* FIXME/tty: is removing FRAME_WINDOW_P here right? */
+      if (mini_frame != sf /*&& FRAME_WINDOW_P (mini_frame)*/)
         {
           XWINDOW (mini_window)->must_be_updated_p = true;
           pending |= update_frame (mini_frame, false, false);
+          if (is_tty_frame (mini_frame))
+            pending |= combine_updates_for_frame (mini_frame, false, false);
           mini_frame->cursor_type_changed = false;
           if (!pending && hscroll_retries <= MAX_HSCROLL_RETRIES
               && hscroll_windows (mini_window))
@@ -23975,6 +23989,7 @@ extend_face_to_end_of_line (struct it *it)
         {
           it->glyph_row->glyphs[TEXT_AREA][0] = space_glyph;
           it->glyph_row->glyphs[TEXT_AREA][0].face_id = face->id;
+          it->glyph_row->glyphs[TEXT_AREA][0].frame = f;
           it->glyph_row->used[TEXT_AREA] = 1;
         }
       /* Mode line and the header line don't have margins, and
@@ -23994,6 +24009,7 @@ extend_face_to_end_of_line (struct it *it)
               it->glyph_row->glyphs[LEFT_MARGIN_AREA][0] = space_glyph;
               it->glyph_row->glyphs[LEFT_MARGIN_AREA][0].face_id =
                 default_face->id;
+              it->glyph_row->glyphs[LEFT_MARGIN_AREA][0].frame = f;
               it->glyph_row->used[LEFT_MARGIN_AREA] = 1;
             }
           if (WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0
@@ -24002,6 +24018,7 @@ extend_face_to_end_of_line (struct it *it)
               it->glyph_row->glyphs[RIGHT_MARGIN_AREA][0] = space_glyph;
               it->glyph_row->glyphs[RIGHT_MARGIN_AREA][0].face_id =
                 default_face->id;
+              it->glyph_row->glyphs[RIGHT_MARGIN_AREA][0].frame = f;
               it->glyph_row->used[RIGHT_MARGIN_AREA] = 1;
             }
 
@@ -24366,9 +24383,11 @@ highlight_trailing_whitespace (struct it *it)
               while (glyph >= start
                      && BUFFERP (glyph->object)
                      && (glyph->type == STRETCH_GLYPH
-                         || (glyph->type == CHAR_GLYPH
-                             && glyph->u.ch == ' ')))
-                (glyph--)->face_id = face_id;
+                         || (glyph->type == CHAR_GLYPH && glyph->u.ch == ' ')))
+                {
+                  glyph->frame = it->f;
+                  (glyph--)->face_id = face_id;
+                }
             }
           else
             {
@@ -24377,7 +24396,10 @@ highlight_trailing_whitespace (struct it *it)
                      && (glyph->type == STRETCH_GLYPH
                          || (glyph->type == CHAR_GLYPH
                              && glyph->u.ch == ' ')))
-                (glyph++)->face_id = face_id;
+                {
+                  glyph->frame = it->f;
+                  (glyph++)->face_id = face_id;
+                }
             }
         }
     }
@@ -27230,7 +27252,7 @@ display_menu_bar (struct window *w)
 
 /* Deep copy of a glyph row, including the glyphs.  */
 static void
-deep_copy_glyph_row (struct glyph_row *to, struct glyph_row *from)
+deep_copy_glyph_row (struct frame *f, struct glyph_row *to, struct glyph_row *from)
 {
   struct glyph *pointers[1 + LAST_AREA];
   int to_used = to->used[TEXT_AREA];
@@ -27251,7 +27273,7 @@ deep_copy_glyph_row (struct glyph_row *to, struct glyph_row *from)
   /* If we filled only part of the TO row, fill the rest with
      space_glyph (which will display as empty space).  */
   if (to_used > from->used[TEXT_AREA])
-    fill_up_frame_row_with_spaces (to, to_used);
+    fill_up_frame_row_with_spaces (f, to, to_used);
 }
 
 /* Display one menu item on a TTY, by overwriting the glyphs in the
@@ -27300,7 +27322,7 @@ display_tty_menu_item (const char *item_text, int width, int face_id,
   it.last_visible_x = FRAME_COLS (f) - 1;
   row = it.glyph_row;
   /* Start with the row contents from the current matrix.  */
-  deep_copy_glyph_row (row, f->current_matrix->rows + y);
+  deep_copy_glyph_row (f, row, f->current_matrix->rows + y);
   bool saved_width = row->full_width_p;
   row->full_width_p = true;
   bool saved_reversed = row->reversed_p;