comparison src/window.c @ 51674:c78e0c6e92aa

(Fset_window_dedicated_p): Simplify. (display_buffer_1): Don't raise the win from which minibuf was entered. (temp_output_buffer_show): Don't assume BEG == 1. Simplify. (Fminibuffer_selected_window): Simplify. (delete_window): Update for new types.

51673:af3e05d19939

     (window, arg)
     Lisp_Object window, arg;
{
  register struct window *w = decode_window (window);

  if (NILP (arg))
    w->dedicated = Qnil;
  else
    w->dedicated = Qt;

  return w->dedicated;
}

DEFUN ("window-display-table", Fwindow_display_table, Swindow_display_table,

  /* tem is null for dummy parent windows
     (which have inferiors but not any contents themselves) */
  if (!NILP (tem))
    {
      unshow_buffer (p);
      unchain_marker (p->pointm);
      unchain_marker (p->start);
    }

  /* Free window glyph matrices.  It is sure that they are allocated
     again when ADJUST_GLYPHS is called.  Block input so that expose
     events and other events that access glyph matrices are not

  set_window_buffer (window, buffer, 1, !NILP (keep_margins));
  return Qnil;
}

DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0,
       doc: /* Select WINDOW.  Most editing will apply to WINDOW's buffer.
If WINDOW is not already selected, also make WINDOW's buffer current.
Also make WINDOW the frame's selected window.
Optional second arg NORECORD non-nil means

  Lisp_Object frame = XWINDOW (window)->frame;
  FRAME_PTR f = XFRAME (frame);

  FRAME_SAMPLE_VISIBILITY (f);

  if (!EQ (frame, selected_frame))
    {
      if (FRAME_ICONIFIED_P (f))
	Fmake_frame_visible (frame);
      else if (FRAME_VISIBLE_P (f))
	Fraise_frame (frame);

	Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window)));
      Vminibuf_scroll_window = window;
      w = XWINDOW (window);
      XSETFASTINT (w->hscroll, 0);
      XSETFASTINT (w->min_hscroll, 0);
      set_marker_restricted_both (w->start, buf, 1, 1);
      set_marker_restricted_both (w->pointm, buf, 1, 1);

      /* Run temp-buffer-show-hook, with the chosen window selected
	 and its buffer current.  */
      if (!NILP (Vrun_hooks))
	{
	  Lisp_Object tem;
	  tem = Fboundp (Qtemp_buffer_show_hook);
	  if (!NILP (tem))
	    {
	      tem = Fsymbol_value (Qtemp_buffer_show_hook);
	      if (!NILP (tem))
		{
		  int count = SPECPDL_INDEX ();
		  Lisp_Object prev_window, prev_buffer;
		  prev_window = selected_window;
		  XSETBUFFER (prev_buffer, old);

		  /* Select the window that was chosen, for running the hook.
		     Note: Both Fselect_window and select_window_norecord may
		     set-buffer to the buffer displayed in the window,
		     so we need to save the current buffer.  --stef  */
		  record_unwind_protect (Fset_buffer, prev_buffer);
		  record_unwind_protect (select_window_norecord, prev_window);
		  Fselect_window (window, Qt);
		  Fset_buffer (w->buffer);
		  call1 (Vrun_hooks, Qtemp_buffer_show_hook);
		  unbind_to (count, Qnil);
		}
	    }
	}
    }
}

static void

Returns nil, if current window is not a minibuffer window.  */)
     ()
{
  if (minibuf_level > 0
      && MINI_WINDOW_P (XWINDOW (selected_window))
      && !NILP (minibuf_selected_window)
      && WINDOW_LIVE_P (minibuf_selected_window))
    return minibuf_selected_window;

  return Qnil;
}

51674:c78e0c6e92aa

     (window, arg)
     Lisp_Object window, arg;
{
  register struct window *w = decode_window (window);

  w->dedicated = arg;

  return w->dedicated;
}

DEFUN ("window-display-table", Fwindow_display_table, Swindow_display_table,

  /* tem is null for dummy parent windows
     (which have inferiors but not any contents themselves) */
  if (!NILP (tem))
    {
      unshow_buffer (p);
      unchain_marker (XMARKER (p->pointm));
      unchain_marker (XMARKER (p->start));
    }

  /* Free window glyph matrices.  It is sure that they are allocated
     again when ADJUST_GLYPHS is called.  Block input so that expose
     events and other events that access glyph matrices are not

  set_window_buffer (window, buffer, 1, !NILP (keep_margins));
  return Qnil;
}

/* Note that selected_window can be nil
   when this is called from Fset_window_configuration.  */

DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0,
       doc: /* Select WINDOW.  Most editing will apply to WINDOW's buffer.
If WINDOW is not already selected, also make WINDOW's buffer current.
Also make WINDOW the frame's selected window.
Optional second arg NORECORD non-nil means

  Lisp_Object frame = XWINDOW (window)->frame;
  FRAME_PTR f = XFRAME (frame);

  FRAME_SAMPLE_VISIBILITY (f);

  if (EQ (frame, selected_frame))
    ; /* Assume the selected frame is already visible enough.  */
  else if (minibuf_level > 0
	   && MINI_WINDOW_P (XWINDOW (selected_window))
	   && WINDOW_LIVE_P (minibuf_selected_window)
	   && EQ (frame, WINDOW_FRAME (XWINDOW (minibuf_selected_window))))
    ; /* Assume the frame from which we invoked the minibuffer is visible.  */
  else
    {
      if (FRAME_ICONIFIED_P (f))
	Fmake_frame_visible (frame);
      else if (FRAME_VISIBLE_P (f))
	Fraise_frame (frame);

	Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window)));
      Vminibuf_scroll_window = window;
      w = XWINDOW (window);
      XSETFASTINT (w->hscroll, 0);
      XSETFASTINT (w->min_hscroll, 0);
      set_marker_restricted_both (w->start, buf, BEG, BEG);
      set_marker_restricted_both (w->pointm, buf, BEG, BEG);

      /* Run temp-buffer-show-hook, with the chosen window selected
	 and its buffer current.  */

      if (!NILP (Vrun_hooks)
	  && !NILP (Fboundp (Qtemp_buffer_show_hook))
	  && !NILP (Fsymbol_value (Qtemp_buffer_show_hook)))
	{
	  int count = SPECPDL_INDEX ();
	  Lisp_Object prev_window, prev_buffer;
	  prev_window = selected_window;
	  XSETBUFFER (prev_buffer, old);
	  
	  /* Select the window that was chosen, for running the hook.
	     Note: Both Fselect_window and select_window_norecord may
	     set-buffer to the buffer displayed in the window,
	     so we need to save the current buffer.  --stef  */
	  record_unwind_protect (Fset_buffer, prev_buffer);
	  record_unwind_protect (select_window_norecord, prev_window);
	  Fselect_window (window, Qt);
	  Fset_buffer (w->buffer);
	  call1 (Vrun_hooks, Qtemp_buffer_show_hook);
	  unbind_to (count, Qnil);
	}
    }
}

static void

Returns nil, if current window is not a minibuffer window.  */)
     ()
{
  if (minibuf_level > 0
      && MINI_WINDOW_P (XWINDOW (selected_window))
      && WINDOW_LIVE_P (minibuf_selected_window))
    return minibuf_selected_window;

  return Qnil;
}