comparison src/dispnew.c @ 960:17986889d3b6

* dispnew.c (Fredraw_frame): Call clear_frame_records before calling update_end, so that x_display_box_cursor can rely on the contents of f->current_glyphs. * dispnew.c (change_frame_size): Call check_frame_size here, rather than writing out its code. Don't declare newheight and newwidth to be register variables, since we take their address. * dispnew.c (in_display): Variable deleted; it's only ever used as an unofficial parameter to change_frame_size. (change_frame_size): New argument, DELAY, which when non-zero indicates to delay the size change until later. This should be passed as one from signal handlers. (window_change_signal): Call change_frame_size with a DELAY of 1. (do_pending_window_change): Call change_frame_size with DELAY of 0. * dispnew.c, frame.c, frame.h, keyboard.c, scroll.c, term.c, window.c, xdisp.c, xfns.c xterm.c (FRAME_IS_TERMCAP, FRAME_IS_X, FRAME_HAS_MINIBUF): Renamed these to FRAME_TERMCAP_P, FRAME_X_P, and FRAME_HAS_MINIBUF_P, for consistency with the rest of the frame macros.

959:c1fc76b79275

struct cm Wcm;		/* Structure for info on cursor positioning */

extern short ospeed;	/* Output speed (from sg_ospeed) */

int in_display;		/* 1 if in redisplay: can't handle SIGWINCH now.  */

int delayed_size_change;  /* 1 means SIGWINCH happened when not safe.  */

#ifdef MULTI_FRAME

DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0,

  CHECK_LIVE_FRAME (frame, 0);
  f = XFRAME (frame);
  update_begin (f);
  /*  set_terminal_modes (); */
  clear_frame ();
  update_end (f);
  fflush (stdout);
  clear_frame_records (f);
  windows_or_buffers_changed++;
  /* Mark all windows as INaccurate,
     so that every window will have its redisplay done.  */
  mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0);
  f->garbaged = 0;

  new->enable = (char *) xmalloc (height * sizeof (char));
  bzero (new->enable, height * sizeof (char));
  new->bufp = (int *) xmalloc (height * sizeof (int));

#ifdef HAVE_X_WINDOWS
  if (FRAME_IS_X (frame))
    {
      new->nruns = (int *) xmalloc (height * sizeof (int));
      new->face_list
	= (struct run **) xmalloc (height * sizeof (struct run *));
      new->top_left_x = (short *) xmalloc (height * sizeof (short));

  free (glyphs->highlight);
  free (glyphs->enable);
  free (glyphs->bufp);

#ifdef HAVE_X_WINDOWS
  if (FRAME_IS_X (frame))
    {
      free (glyphs->nruns);
      free (glyphs->face_list);
      free (glyphs->top_left_x);
      free (glyphs->top_left_y);

      safe_bcopy (current_frame->bufp + from,
		  current_frame->bufp + from + amount,
		  (end - from) * sizeof current_frame->bufp[0]);

#ifdef HAVE_X_WINDOWS
      if (FRAME_IS_X (frame))
	{
	  safe_bcopy (current_frame->nruns + from,
		      current_frame->nruns + from + amount,
		      (end - from) * sizeof current_frame->nruns[0]);

      safe_bcopy (current_frame->bufp + from,
		  current_frame->bufp + from + amount,
		  (end - from) * sizeof current_frame->bufp[0]);

#ifdef HAVE_X_WINDOWS
      if (FRAME_IS_X (frame))
	{
	  safe_bcopy (current_frame->nruns + from,
		      current_frame->nruns + from + amount,
		      (end - from) * sizeof current_frame->nruns[0]);

  if (desired_frame->enable[FRAME_HEIGHT (f) - 1])
    update_line (f, FRAME_HEIGHT (f) - 1);

#ifdef HAVE_X_WINDOWS
  if (FRAME_IS_X (f))
    {
      leftmost = downto = f->display.x->internal_border_width;
      if (desired_frame->enable[0])
	{
	  current_frame->top_left_x[FRAME_HEIGHT (f) - 1] = leftmost;

  /* Now update the rest of the lines. */
  for (i = 0; i < FRAME_HEIGHT (f) - 1 && (force || !input_pending); i++)
    {
      if (desired_frame->enable[i])
	{
	  if (FRAME_IS_TERMCAP (f))
	    {
	      /* Flush out every so many lines.
		 Also flush out if likely to have more than 1k buffered
		 otherwise.   I'm told that some telnet connections get
		 really screwed by more than 1k output at once.  */

		detect_input_pending ();
	    }

	  update_line (f, i);
#ifdef HAVE_X_WINDOWS
	  if (FRAME_IS_X (f))
	    {
	      current_frame->top_left_y[i] = downto;
	      current_frame->top_left_x[i] = leftmost;
	    }
#endif /* HAVE_X_WINDOWS */
	}

#ifdef HAVE_X_WINDOWS
      if (FRAME_IS_X (f))
	downto += LINE_HEIGHT(f, i);
#endif
    }
  pause = (i < FRAME_HEIGHT (f) - 1) ? i : 0;

  current_frame->used[vpos] = desired_frame->used[vpos];
  current_frame->highlight[vpos] = desired_frame->highlight[vpos];
  current_frame->bufp[vpos] = desired_frame->bufp[vpos];

#ifdef HAVE_X_WINDOWS
  if (FRAME_IS_X (frame))
    {
      current_frame->pix_width[vpos]
	= current_frame->used[vpos]
	  * FONT_WIDTH (frame->display.x->font);
      current_frame->pix_height[vpos]

    Lisp_Object tail;
    FRAME_PTR f;

    FOR_EACH_FRAME (tail, f)
      {
	if (FRAME_IS_TERMCAP (f))
	  {
	    ++in_display;
	    change_frame_size (f, height, width, 0);
	    --in_display;
	    break;
	  }
      }
  }

	    
	  FRAME_NEW_HEIGHT (f) = 0;
	  FRAME_NEW_WIDTH (f) = 0;

	  if (height != 0)
	    change_frame_size (f, height, width, 0);
	}
    }
}


/* Change the frame height and/or width.  Values may be given as zero to
   indicate no change is to take place. */

change_frame_size (frame, newlength, newwidth, pretend)
     register FRAME_PTR frame;
     register int newlength, newwidth, pretend;
{
  /* If we can't deal with the change now, queue it for later.  */
  if (in_display)
    {
      FRAME_NEW_HEIGHT (frame) = newlength;
      FRAME_NEW_WIDTH (frame) = newwidth;
      delayed_size_change = 1;
      return;
    }

  /* This size-change overrides any pending one for this frame.  */
  FRAME_NEW_HEIGHT (frame) = 0;
  FRAME_NEW_WIDTH (frame) = 0;

  if ((newlength == 0 || newlength == FRAME_HEIGHT (frame))
      && (newwidth == 0 || newwidth == FRAME_WIDTH (frame)))
    return;

  if (newlength && newlength != FRAME_HEIGHT (frame))
    {
      if (FRAME_HAS_MINIBUF (frame)
	  && ! FRAME_MINIBUF_ONLY_P (frame))
	{
	  /* Frame has both root and minibuffer.  */
	  set_window_height (FRAME_ROOT_WINDOW (frame),
			     newlength - 1, 0);
	  XFASTINT (XWINDOW (FRAME_MINIBUF_WINDOW (frame))->top)
	    = newlength - 1;
	  set_window_height (FRAME_MINIBUF_WINDOW (frame), 1, 0);
	}
      else
	/* Frame has just one top-level window.  */
	set_window_height (FRAME_ROOT_WINDOW (frame), newlength, 0);
	
      if (FRAME_IS_TERMCAP (frame) && !pretend)
	FrameRows = newlength;

#if 0
      if (frame->output_method == output_termcap)
	{
	  frame_height = newlength;
	  if (!pretend)
	    FrameRows = newlength;
	}
#endif
    }

  if (newwidth && newwidth != FRAME_WIDTH (frame))
    {
      set_window_width (FRAME_ROOT_WINDOW (frame), newwidth, 0);
      if (FRAME_HAS_MINIBUF (frame))
	set_window_width (FRAME_MINIBUF_WINDOW (frame), newwidth, 0);
      FRAME_WIDTH (frame) = newwidth;

      if (FRAME_IS_TERMCAP (frame) && !pretend)
	FrameCols = newwidth;
#if 0
      if (frame->output_method == output_termcap)
	{
	  frame_width = newwidth;

	    FrameCols = newwidth;
	}
#endif
    }

  if (newlength)
    FRAME_HEIGHT (frame) = newlength;

  remake_frame_glyphs (frame);
  calculate_costs (frame);
}

DEFUN ("send-string-to-terminal", Fsend_string_to_terminal,

960:17986889d3b6

struct cm Wcm;		/* Structure for info on cursor positioning */

extern short ospeed;	/* Output speed (from sg_ospeed) */

int delayed_size_change;  /* 1 means SIGWINCH happened when not safe.  */

#ifdef MULTI_FRAME

DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0,

  CHECK_LIVE_FRAME (frame, 0);
  f = XFRAME (frame);
  update_begin (f);
  /*  set_terminal_modes (); */
  clear_frame ();
  clear_frame_records (f);
  update_end (f);
  fflush (stdout);
  windows_or_buffers_changed++;
  /* Mark all windows as INaccurate,
     so that every window will have its redisplay done.  */
  mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0);
  f->garbaged = 0;

  new->enable = (char *) xmalloc (height * sizeof (char));
  bzero (new->enable, height * sizeof (char));
  new->bufp = (int *) xmalloc (height * sizeof (int));

#ifdef HAVE_X_WINDOWS
  if (FRAME_X_P (frame))
    {
      new->nruns = (int *) xmalloc (height * sizeof (int));
      new->face_list
	= (struct run **) xmalloc (height * sizeof (struct run *));
      new->top_left_x = (short *) xmalloc (height * sizeof (short));

  free (glyphs->highlight);
  free (glyphs->enable);
  free (glyphs->bufp);

#ifdef HAVE_X_WINDOWS
  if (FRAME_X_P (frame))
    {
      free (glyphs->nruns);
      free (glyphs->face_list);
      free (glyphs->top_left_x);
      free (glyphs->top_left_y);

      safe_bcopy (current_frame->bufp + from,
		  current_frame->bufp + from + amount,
		  (end - from) * sizeof current_frame->bufp[0]);

#ifdef HAVE_X_WINDOWS
      if (FRAME_X_P (frame))
	{
	  safe_bcopy (current_frame->nruns + from,
		      current_frame->nruns + from + amount,
		      (end - from) * sizeof current_frame->nruns[0]);

      safe_bcopy (current_frame->bufp + from,
		  current_frame->bufp + from + amount,
		  (end - from) * sizeof current_frame->bufp[0]);

#ifdef HAVE_X_WINDOWS
      if (FRAME_X_P (frame))
	{
	  safe_bcopy (current_frame->nruns + from,
		      current_frame->nruns + from + amount,
		      (end - from) * sizeof current_frame->nruns[0]);

  if (desired_frame->enable[FRAME_HEIGHT (f) - 1])
    update_line (f, FRAME_HEIGHT (f) - 1);

#ifdef HAVE_X_WINDOWS
  if (FRAME_X_P (f))
    {
      leftmost = downto = f->display.x->internal_border_width;
      if (desired_frame->enable[0])
	{
	  current_frame->top_left_x[FRAME_HEIGHT (f) - 1] = leftmost;

  /* Now update the rest of the lines. */
  for (i = 0; i < FRAME_HEIGHT (f) - 1 && (force || !input_pending); i++)
    {
      if (desired_frame->enable[i])
	{
	  if (FRAME_TERMCAP_P (f))
	    {
	      /* Flush out every so many lines.
		 Also flush out if likely to have more than 1k buffered
		 otherwise.   I'm told that some telnet connections get
		 really screwed by more than 1k output at once.  */

		detect_input_pending ();
	    }

	  update_line (f, i);
#ifdef HAVE_X_WINDOWS
	  if (FRAME_X_P (f))
	    {
	      current_frame->top_left_y[i] = downto;
	      current_frame->top_left_x[i] = leftmost;
	    }
#endif /* HAVE_X_WINDOWS */
	}

#ifdef HAVE_X_WINDOWS
      if (FRAME_X_P (f))
	downto += LINE_HEIGHT(f, i);
#endif
    }
  pause = (i < FRAME_HEIGHT (f) - 1) ? i : 0;

  current_frame->used[vpos] = desired_frame->used[vpos];
  current_frame->highlight[vpos] = desired_frame->highlight[vpos];
  current_frame->bufp[vpos] = desired_frame->bufp[vpos];

#ifdef HAVE_X_WINDOWS
  if (FRAME_X_P (frame))
    {
      current_frame->pix_width[vpos]
	= current_frame->used[vpos]
	  * FONT_WIDTH (frame->display.x->font);
      current_frame->pix_height[vpos]

    Lisp_Object tail;
    FRAME_PTR f;

    FOR_EACH_FRAME (tail, f)
      {
	if (FRAME_TERMCAP_P (f))
	  {
	    change_frame_size (f, height, width, 0, 1);
	    break;
	  }
      }
  }

	    
	  FRAME_NEW_HEIGHT (f) = 0;
	  FRAME_NEW_WIDTH (f) = 0;

	  if (height != 0)
	    change_frame_size (f, height, width, 0, 0);
	}
    }
}


/* Change the frame height and/or width.  Values may be given as zero to
   indicate no change is to take place. 

   If DELAY is non-zero, then assume we're being called from a signal
   handler, and queue the change for later - perhaps the next
   redisplay.  Since this tries to resize windows, we can't call it
   from a signal handler.  */

change_frame_size (frame, newheight, newwidth, pretend, delay)
     register FRAME_PTR frame;
     int newheight, newwidth, pretend;
{
  /* If we can't deal with the change now, queue it for later.  */
  if (delay)
    {
      FRAME_NEW_HEIGHT (frame) = newheight;
      FRAME_NEW_WIDTH (frame) = newwidth;
      delayed_size_change = 1;
      return;
    }

  /* This size-change overrides any pending one for this frame.  */
  FRAME_NEW_HEIGHT (frame) = 0;
  FRAME_NEW_WIDTH  (frame) = 0;

  /* If an arguments is zero, set it to the current value.  */
  newheight || (newheight = FRAME_HEIGHT (frame));
  newwidth  || (newwidth  = FRAME_WIDTH  (frame));

  /* Round up to the smallest acceptable size.  */
  check_frame_size (frame, &newheight, &newwidth);

  /* If we're not changing the frame size, quit now.  */
  if (newheight == FRAME_HEIGHT (frame)
      && newwidth == FRAME_WIDTH (frame))
    return;

  if (newheight != FRAME_HEIGHT (frame))
    {
      if (FRAME_HAS_MINIBUF_P (frame)
	  && ! FRAME_MINIBUF_ONLY_P (frame))
	{
	  /* Frame has both root and minibuffer.  */
	  set_window_height (FRAME_ROOT_WINDOW (frame),
			     newheight - 1, 0);
	  XFASTINT (XWINDOW (FRAME_MINIBUF_WINDOW (frame))->top)
	    = newheight - 1;
	  set_window_height (FRAME_MINIBUF_WINDOW (frame), 1, 0);
	}
      else
	/* Frame has just one top-level window.  */
	set_window_height (FRAME_ROOT_WINDOW (frame), newheight, 0);

      if (FRAME_TERMCAP_P (frame) && !pretend)
	FrameRows = newheight;

#if 0
      if (frame->output_method == output_termcap)
	{
	  frame_height = newheight;
	  if (!pretend)
	    FrameRows = newheight;
	}
#endif
    }

  if (newwidth != FRAME_WIDTH (frame))
    {
      set_window_width (FRAME_ROOT_WINDOW (frame), newwidth, 0);
      if (FRAME_HAS_MINIBUF_P (frame))
	set_window_width (FRAME_MINIBUF_WINDOW (frame), newwidth, 0);

      if (FRAME_TERMCAP_P (frame) && !pretend)
	FrameCols = newwidth;
#if 0
      if (frame->output_method == output_termcap)
	{
	  frame_width = newwidth;

	    FrameCols = newwidth;
	}
#endif
    }

  FRAME_HEIGHT (frame) = newheight;
  FRAME_WIDTH (frame)  = newwidth;
	
  remake_frame_glyphs (frame);
  calculate_costs (frame);
}

DEFUN ("send-string-to-terminal", Fsend_string_to_terminal,