comparison src/xdisp.c @ 15381:91662157e604

(redisplay_internal): Use `Vterminal_frame' and other termcap frame code on MSDOS as well. (display_text_line) [HAVE_FACES]: Support faces on MSDOS. (decode_mode_spec): Return frame name on MSDOS like for termcap frames.

15380:8b01836a6b06

  if (popup_activated ())
    return;
#endif

#ifdef MULTI_FRAME
  if (FRAME_TERMCAP_P (selected_frame)
      && previous_terminal_frame != selected_frame)
    {
      /* Since frames on an ASCII terminal share the same display area,
	 displaying a different frame means redisplay the whole thing.  */
      windows_or_buffers_changed++;

      buffer_shared = 0;

      FOR_EACH_FRAME (tail, frame)
	{
	  FRAME_PTR f = XFRAME (frame);
	  if (! FRAME_TERMCAP_P (f) || f == selected_frame)
	    {

	      /* 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)

	  if (!FRAMEP (XCONS (tail)->car))
	    continue;

	  f = XFRAME (XCONS (tail)->car);

	  if ((! FRAME_TERMCAP_P (f) || f == selected_frame)
	      && FRAME_VISIBLE_P (f))
	    {
	      pause |= update_frame (f, 0, 0);
	      if (!pause)
		{

	mini_window = FRAME_MINIBUF_WINDOW (selected_frame);
	mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
	
	if (mini_frame != selected_frame
	    && ! FRAME_TERMCAP_P (mini_frame))
	  pause |= update_frame (mini_frame, 0, 0);
      }
    }

  /* If frame does not match, prevent doing single-line-update next time.

#ifdef HAVE_FACES
	  /* Did we hit a face change?  Figure out what face we should
	     use now.  We also hit this the first time through the
	     loop, to see what face we should start with.  */
	  if (pos >= next_face_change && (FRAME_WINDOW_P (f)))
	    current_face = compute_char_face (f, w, pos,
					      region_beg, region_end,
					      &next_face_change, pos + 50, 0);
#endif

    case 'F':
      /* %F displays the frame name.  */
#ifdef MULTI_FRAME
      if (!NILP (f->title))
	return (char *) XSTRING (f->title)->data;
      if (f->explicit_name || FRAME_TERMCAP_P (f))
	return (char *) XSTRING (f->name)->data;
#endif
      return "Emacs";

    case 'f': 

15381:91662157e604

  if (popup_activated ())
    return;
#endif

#ifdef MULTI_FRAME
  if ((FRAME_TERMCAP_P (selected_frame) || FRAME_MSDOS_P (selected_frame))
      && previous_terminal_frame != selected_frame)
    {
      /* Since frames on an ASCII terminal share the same display area,
	 displaying a different frame means redisplay the whole thing.  */
      windows_or_buffers_changed++;

      buffer_shared = 0;

      FOR_EACH_FRAME (tail, frame)
	{
	  FRAME_PTR f = XFRAME (frame);
	  if (! FRAME_TERMCAP_P (f) && ! FRAME_MSDOS_P (f)
	      || f == selected_frame)
	    {

	      /* 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)

	  if (!FRAMEP (XCONS (tail)->car))
	    continue;

	  f = XFRAME (XCONS (tail)->car);

	  if (((! FRAME_TERMCAP_P (f) && ! FRAME_MSDOS_P (f))
	       || f == selected_frame)
	      && FRAME_VISIBLE_P (f))
	    {
	      pause |= update_frame (f, 0, 0);
	      if (!pause)
		{

	mini_window = FRAME_MINIBUF_WINDOW (selected_frame);
	mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
	
	if (mini_frame != selected_frame
	    && ! FRAME_TERMCAP_P (mini_frame) && ! FRAME_MSDOS_P (mini_frame))
	  pause |= update_frame (mini_frame, 0, 0);
      }
    }

  /* If frame does not match, prevent doing single-line-update next time.

#ifdef HAVE_FACES
	  /* Did we hit a face change?  Figure out what face we should
	     use now.  We also hit this the first time through the
	     loop, to see what face we should start with.  */
	  if (pos >= next_face_change
	      && (FRAME_WINDOW_P (f) || FRAME_MSDOS_P (f)))
	    current_face = compute_char_face (f, w, pos,
					      region_beg, region_end,
					      &next_face_change, pos + 50, 0);
#endif

    case 'F':
      /* %F displays the frame name.  */
#ifdef MULTI_FRAME
      if (!NILP (f->title))
	return (char *) XSTRING (f->title)->data;
      if (f->explicit_name || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
	return (char *) XSTRING (f->name)->data;
#endif
      return "Emacs";

    case 'f':