diff src/dispnew.c @ 83100:4970ad4995f5

Eliminated updating_frame. src/termhooks.h (cursor_to_hook, raw_cursor_to_hook) (clear_to_end_hook, clear_end_of_line_hook, clear_frame_hook) (ins_del_lines_hook, insert_glyphs_hook, write_glyphs_hook) (delete_glyphs_hook, ring_bell_hook, set_terminal_window_hook): Added frame parameter. src/term.c (ring_bell, tty_ring_bell, set_terminal_window) (tty_set_terminal_window, set_scroll_region, cursor_to) (tty_cursor_to, raw_cursor_to, tty_raw_cursor_to, clear_to_end) (tty_clear_to_end, clear_frame, tty_clear_frame, clear_end_of_line) (tty_clear_end_of_line, write_glyphs, tty_write_glyphs, insert_glyphs) (tty_insert_glyphs, delete_glyphs, tty_delete_glyphs, ins_del_lines) (tty_ins_del_lines): Added frame parameter. src/xterm.c (x_delete_glyphs, x_clear_frame, x_ins_del_lines): Added frame parameter. src/scroll.c (do_direct_scrolling, do_scrolling): Added frame parameter. src/term.c (update_begin, update_end): Don't set updating_frame. src/xfns.c (x_set_tool_bar_lines): Ditto. src/term.c (updating_frame): Removed. src/dispextern.h: Updated prototypes. src/dispnew.c (Fredraw_frame, direct_output_for_insert) (direct_output_forward_char, update_frame_1, update_frame_line) (ding, bitch_at_user): Added frame parameter to calls to redisplay. src/xdisp.c (try_window_id): Ditto. src/scroll.c (do_scrolling, do_direct_scrolling, scrolling_1): Ditto. src/fileio.c (auto_save_error): Ditto. src/term.c (tty_ring_bell): Flush the output stream after beeping. src/dispnew.c (ding, bitch_at_user): Don't fflush CURTTY. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-140

--- a/src/dispnew.c	Fri Apr 16 13:36:07 2004 +0000
+++ b/src/dispnew.c	Fri Apr 16 15:03:58 2004 +0000
@@ -3312,7 +3312,7 @@
   if (FRAME_MSDOS_P (f))
     set_terminal_modes (FRAME_DISPLAY (f));
 #endif
-  clear_frame ();
+  clear_frame (f);
   clear_current_matrices (f);
   update_end (f);
   if (FRAME_TERMCAP_P (f))
@@ -3622,9 +3622,9 @@
   else
     {
       if (glyphs == end - n)
-	write_glyphs (glyphs, n);
+	write_glyphs (f, glyphs, n);
       else
-	insert_glyphs (glyphs, n);
+	insert_glyphs (f, glyphs, n);
     }
 
   w->cursor.hpos += n;
@@ -3647,7 +3647,7 @@
 	      ? XFASTINT (w->left_margin_cols)
 	      : 0));
       y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos);
-      cursor_to (y, x);
+      cursor_to (f, y, x);
     }
 
 #ifdef HAVE_WINDOW_SYSTEM
@@ -3747,7 +3747,7 @@
 	      ? XFASTINT (w->left_margin_cols)
 	      : 0));
       y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos);
-      cursor_to (y, x);
+      cursor_to (f, y, x);
     }
 
   if (FRAME_TERMCAP_P (f))
@@ -5234,7 +5234,7 @@
 		}
 	    }
 
-	  cursor_to (row, col);
+	  cursor_to (f, row, col);
 	}
       else
 	{
@@ -5256,7 +5256,7 @@
 		x += XFASTINT (w->left_margin_cols);
 
 	      /* x = max (min (x, FRAME_TOTAL_COLS (f) - 1), 0); */
-	      cursor_to (y, x);
+	      cursor_to (f, y, x);
 	    }
 	}
     }
@@ -5472,8 +5472,8 @@
       /* Write the contents of the desired line.  */
       if (nlen)
 	{
-          cursor_to (vpos, 0);
-	  write_glyphs (nbody, nlen);
+          cursor_to (f, vpos, 0);
+	  write_glyphs (f, nbody, nlen);
 	}
 
       /* Don't call clear_end_of_line if we already wrote the whole
@@ -5481,13 +5481,13 @@
 	 case but in the line below.  */
       if (nlen < FRAME_TOTAL_COLS (f))
 	{
-	  cursor_to (vpos, nlen);
-          clear_end_of_line (FRAME_TOTAL_COLS (f));
+	  cursor_to (f, vpos, nlen);
+          clear_end_of_line (f, FRAME_TOTAL_COLS (f));
 	}
       else
 	/* Make sure we are in the right row, otherwise cursor movement
 	   with cmgoto might use `ch' in the wrong row.  */
-	cursor_to (vpos, 0);
+	cursor_to (f, vpos, 0);
 
       make_current (desired_matrix, current_matrix, vpos);
       return;
@@ -5519,8 +5519,8 @@
 		++j;
 
 	      /* Output this run of non-matching chars.  */
-	      cursor_to (vpos, i);
-	      write_glyphs (nbody + i, j - i);
+	      cursor_to (f, vpos, i);
+	      write_glyphs (f, nbody + i, j - i);
 	      i = j - 1;
 
 	      /* Now find the next non-match.  */
@@ -5530,8 +5530,8 @@
       /* Clear the rest of the line, or the non-clear part of it.  */
       if (olen > nlen)
 	{
-	  cursor_to (vpos, nlen);
-	  clear_end_of_line (olen);
+	  cursor_to (f, vpos, nlen);
+	  clear_end_of_line (f, olen);
 	}
 
       /* Make current row = desired row.  */
@@ -5553,8 +5553,8 @@
 
       if (nlen > nsp)
 	{
-	  cursor_to (vpos, nsp);
-	  write_glyphs (nbody + nsp, nlen - nsp);
+	  cursor_to (f, vpos, nsp);
+	  write_glyphs (f, nbody + nsp, nlen - nsp);
 	}
 
       /* Exchange contents between current_frame and new_frame.  */
@@ -5626,8 +5626,8 @@
 
   if (osp > nsp)
     {
-      cursor_to (vpos, nsp);
-      delete_glyphs (osp - nsp);
+      cursor_to (f, vpos, nsp);
+      delete_glyphs (f, osp - nsp);
     }
   else if (nsp > osp)
     {
@@ -5636,12 +5636,12 @@
 	 must delete first to avoid losing data in the insert */
       if (endmatch && nlen < olen + nsp - osp)
 	{
-	  cursor_to (vpos, nlen - endmatch + osp - nsp);
-	  delete_glyphs (olen + nsp - osp - nlen);
+	  cursor_to (f, vpos, nlen - endmatch + osp - nsp);
+	  delete_glyphs (f, olen + nsp - osp - nlen);
 	  olen = nlen - (nsp - osp);
 	}
-      cursor_to (vpos, osp);
-      insert_glyphs (0, nsp - osp);
+      cursor_to (f, vpos, osp);
+      insert_glyphs (f, 0, nsp - osp);
     }
   olen += nsp - osp;
 
@@ -5662,8 +5662,8 @@
 	     unnecessary cursor movement.  */
 	  if (nlen - tem > 0)
 	    {
-	      cursor_to (vpos, nsp + begmatch);
-	      write_glyphs (nbody + nsp + begmatch, nlen - tem);
+	      cursor_to (f, vpos, nsp + begmatch);
+	      write_glyphs (f, nbody + nsp + begmatch, nlen - tem);
 	    }
 	}
       else if (nlen > olen)
@@ -5678,27 +5678,27 @@
 	  int out = olen - tem;	/* Columns to be overwritten originally.  */
 	  int del;
 
-	  cursor_to (vpos, nsp + begmatch);
+	  cursor_to (f, vpos, nsp + begmatch);
 
 	  /* Calculate columns we can actually overwrite.  */
 	  while (CHAR_GLYPH_PADDING_P (nbody[nsp + begmatch + out]))
 	    out--;
-	  write_glyphs (nbody + nsp + begmatch, out);
+	  write_glyphs (f, nbody + nsp + begmatch, out);
 
 	  /* If we left columns to be overwritten, we must delete them.  */
 	  del = olen - tem - out;
 	  if (del > 0)
-	    delete_glyphs (del);
+	    delete_glyphs (f, del);
 
 	  /* At last, we insert columns not yet written out.  */
-	  insert_glyphs (nbody + nsp + begmatch + out, nlen - olen + del);
+	  insert_glyphs (f, nbody + nsp + begmatch + out, nlen - olen + del);
 	  olen = nlen;
 	}
       else if (olen > nlen)
 	{
-	  cursor_to (vpos, nsp + begmatch);
-	  write_glyphs (nbody + nsp + begmatch, nlen - tem);
-	  delete_glyphs (olen - nlen);
+	  cursor_to (f, vpos, nsp + begmatch);
+	  write_glyphs (f, nbody + nsp + begmatch, nlen - tem);
+	  delete_glyphs (f, olen - nlen);
 	  olen = nlen;
 	}
     }
@@ -5707,8 +5707,8 @@
   /* If any unerased characters remain after the new line, erase them.  */
   if (olen > nlen)
     {
-      cursor_to (vpos, nlen);
-      clear_end_of_line (olen);
+      cursor_to (f, vpos, nlen);
+      clear_end_of_line (f, olen);
     }
 
   /* Exchange contents between current_frame and new_frame.  */
@@ -6275,9 +6275,7 @@
       if (noninteractive)
 	putchar (07);
       else
-	ring_bell ();
-      if (FRAME_TERMCAP_P (XFRAME (selected_frame)))
-        fflush (CURTTY ()->output);
+	ring_bell (XFRAME (selected_frame));
     }
   else
     bitch_at_user ();
@@ -6293,9 +6291,7 @@
   else if (!INTERACTIVE)  /* Stop executing a keyboard macro.  */
     error ("Keyboard macro terminated by a command ringing the bell");
   else
-    ring_bell ();
-  if (FRAME_TERMCAP_P (XFRAME (selected_frame)))
-    fflush (CURTTY ()->output);
+    ring_bell (XFRAME (selected_frame));
 }