comparison src/xdisp.c @ 1992:37c45885540a

* xdisp.c (redisplay): Protect calls to request_sigio and unrequest_sigio in "#ifdef SIGIO" clauses; these are not defined Use the term `scroll bar', instead of `scrollbar'. * alloc.c, frame.c, frame.h, indent.c, keyboard.c, keyboard.h, lisp.h, term.c, termhooks.h, window.c, window.h, xdisp.c, xfns.c, xterm.c, xterm.h: Terminology changed.

1991:0f88f314fc34

	 This will be incremented each time such a window is displayed.  */
      buffer_shared = 0;

      FOR_EACH_FRAME (tail, f)
	{
	  /* Mark all the scrollbars to be removed; we'll redeem the ones
	     we want when we redisplay their windows.  */
	  if (condemn_scrollbars_hook)
	    (*condemn_scrollbars_hook) (f);

	  if (FRAME_VISIBLE_P (f))
	    redisplay_windows (FRAME_ROOT_WINDOW (f));

	  /* Any scrollbars which redisplay_windows should have nuked
	     should now go away.  */
	  if (judge_scrollbars_hook)
	    (*judge_scrollbars_hook) (f);
	}
    }
  else if (FRAME_VISIBLE_P (selected_frame))
    {
      redisplay_window (selected_window, 1);

    {
      if (w == XWINDOW (minibuf_window))
	{
	  if (echo_area_glyphs)
	    /* We've already displayed the echo area glyphs, if any.  */
	    goto finish_scrollbars;
	}
      else
	{
	  /* This is a minibuffer, but it's not the currently active one, so
	     clear it.  */

	    {
	      get_display_line (f, vpos + i, 0);
	      display_string (w, vpos + i, "", 0, 0, 0, width);
	    }
	  
	  goto finish_scrollbars;
	}
    }

  if (update_mode_lines)
    w->update_mode_line = Qt;

  if ((!NILP (w->update_mode_line)
       || (!just_this_one && width < FRAME_WIDTH (f) - 1))
      && height != XFASTINT (w->height))
    display_mode_line (w);

 finish_scrollbars:
  if (FRAME_HAS_VERTICAL_SCROLLBARS (f))
    {
      int start, end, whole;

      /* Calculate the start and end positions for the current window.
	 Note that minibuffers sometimes aren't displaying any text.  */

	  whole = Z - BEG;
	}
      else
	start = end = whole = 0;

      /* Indicate what this scrollbar ought to be displaying now.  */
      (*set_vertical_scrollbar_hook) (w, end - start, whole, start - 1);

      /* Note that we actually used the scrollbar attached to this window,
	 so it shouldn't be deleted at the end of redisplay.  */
      (*redeem_scrollbar_hook) (w);
    }

  SET_PT (opoint);
  current_buffer = old;
  SET_PT (lpoint);

    {
      endp++;
      if (p1 < startp) p1 = startp;
      while (p1 < endp) *p1++ = SPACEGLYPH;

      /* Don't draw vertical bars if we're using scrollbars.  They're
         covered up by the scrollbars, and it's distracting to see
         them when the scrollbar windows are flickering around to be
         reconfigured.  */
      *p1++ = (FRAME_HAS_VERTICAL_SCROLLBARS (f)
	       ? ' ' : '|');
    }
  desired_glyphs->used[vpos] = max (desired_glyphs->used[vpos],
				   p1 - desired_glyphs->glyphs[vpos]);
  desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0;

  start = desired_glyphs->glyphs[vpos] + XFASTINT (w->left);
  end = start + window_width - (truncate != 0);

  if ((window_width + XFASTINT (w->left)) != FRAME_WIDTH (f))
    {
      if (FRAME_HAS_VERTICAL_SCROLLBARS (f))
	{
	  int i;

	  for (i = 0; i < VERTICAL_SCROLLBAR_WIDTH; i++)
	    *end-- = ' ';
	}
      else
	*end-- = '|';
    }

1992:37c45885540a

	 This will be incremented each time such a window is displayed.  */
      buffer_shared = 0;

      FOR_EACH_FRAME (tail, f)
	{
	  /* Mark all the scroll bars to be removed; we'll redeem the ones
	     we want when we redisplay their windows.  */
	  if (condemn_scroll_bars_hook)
	    (*condemn_scroll_bars_hook) (f);

	  if (FRAME_VISIBLE_P (f))
	    redisplay_windows (FRAME_ROOT_WINDOW (f));

	  /* Any scroll bars which redisplay_windows should have nuked
	     should now go away.  */
	  if (judge_scroll_bars_hook)
	    (*judge_scroll_bars_hook) (f);
	}
    }
  else if (FRAME_VISIBLE_P (selected_frame))
    {
      redisplay_window (selected_window, 1);

    {
      if (w == XWINDOW (minibuf_window))
	{
	  if (echo_area_glyphs)
	    /* We've already displayed the echo area glyphs, if any.  */
	    goto finish_scroll_bars;
	}
      else
	{
	  /* This is a minibuffer, but it's not the currently active one, so
	     clear it.  */

	    {
	      get_display_line (f, vpos + i, 0);
	      display_string (w, vpos + i, "", 0, 0, 0, width);
	    }
	  
	  goto finish_scroll_bars;
	}
    }

  if (update_mode_lines)
    w->update_mode_line = Qt;

  if ((!NILP (w->update_mode_line)
       || (!just_this_one && width < FRAME_WIDTH (f) - 1))
      && height != XFASTINT (w->height))
    display_mode_line (w);

 finish_scroll_bars:
  if (FRAME_HAS_VERTICAL_SCROLL_BARS (f))
    {
      int start, end, whole;

      /* Calculate the start and end positions for the current window.
	 Note that minibuffers sometimes aren't displaying any text.  */

	  whole = Z - BEG;
	}
      else
	start = end = whole = 0;

      /* Indicate what this scroll bar ought to be displaying now.  */
      (*set_vertical_scroll_bar_hook) (w, end - start, whole, start - 1);

      /* Note that we actually used the scroll bar attached to this window,
	 so it shouldn't be deleted at the end of redisplay.  */
      (*redeem_scroll_bar_hook) (w);
    }

  SET_PT (opoint);
  current_buffer = old;
  SET_PT (lpoint);

    {
      endp++;
      if (p1 < startp) p1 = startp;
      while (p1 < endp) *p1++ = SPACEGLYPH;

      /* Don't draw vertical bars if we're using scroll bars.  They're
         covered up by the scroll bars, and it's distracting to see
         them when the scroll bar windows are flickering around to be
         reconfigured.  */
      *p1++ = (FRAME_HAS_VERTICAL_SCROLL_BARS (f)
	       ? ' ' : '|');
    }
  desired_glyphs->used[vpos] = max (desired_glyphs->used[vpos],
				   p1 - desired_glyphs->glyphs[vpos]);
  desired_glyphs->glyphs[vpos][desired_glyphs->used[vpos]] = 0;

  start = desired_glyphs->glyphs[vpos] + XFASTINT (w->left);
  end = start + window_width - (truncate != 0);

  if ((window_width + XFASTINT (w->left)) != FRAME_WIDTH (f))
    {
      if (FRAME_HAS_VERTICAL_SCROLL_BARS (f))
	{
	  int i;

	  for (i = 0; i < VERTICAL_SCROLL_BAR_WIDTH; i++)
	    *end-- = ' ';
	}
      else
	*end-- = '|';
    }