comparison src/window.c @ 1325:f03e559aac3e

* window.c (struct save_window_data): Save the currently selected frame, too. (Fset_window_configuration): Restore the frame's selected window using Fselect_window, and then restore the selected frame using Fselect_frame. (Fcurrent_window_configuration): Record the currently selected frame. Update docstring to describe the information now recorded. * window.c (Fset_window_configuration): Clean up the way we save and restore the frame's size. * window.c (struct save_window_data): Add a member called focus_frame, to save and restore the screen's focus frame. (Fset_window_configuration): Redirect the frame's focus as indicated in the window configuration. (Fcurrent_window_configuration): Record the frame's current focus.

1324:44215417cf6e

struct save_window_data
  {
    int size_from_Lisp_Vector_struct;
    struct Lisp_Vector *next_from_Lisp_Vector_struct;
    Lisp_Object frame_width, frame_height;
    Lisp_Object current_window;
    Lisp_Object current_buffer;
    Lisp_Object minibuf_scroll_window;
    Lisp_Object root_window;
    /* A vector, interpreted as a struct saved_window */
    Lisp_Object saved_windows;
  };
#define SAVE_WINDOW_DATA_SIZE 7 /* Arg to Fmake_vector */

  register Lisp_Object tem;
  Lisp_Object new_current_buffer;
  int k;
  FRAME_PTR f;

  /* Save screen height here so we can go back to it at the end.  */
  int previous_frame_height;
  int previous_frame_width;
  int frame_size_change;

  while (XTYPE (configuration) != Lisp_Window_Configuration)
    {
      configuration = wrong_type_argument (intern ("window-configuration-p"),
					   configuration);

  data = (struct save_window_data *) XVECTOR (configuration);
  saved_windows = XVECTOR (data->saved_windows);

  f = XFRAME (XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame);

  if (XFASTINT (data->frame_height) != FRAME_HEIGHT (f)
      || XFASTINT (data->frame_width) != FRAME_WIDTH (f))
    {
      previous_frame_height = FRAME_HEIGHT (f);
      previous_frame_width =  FRAME_WIDTH  (f);
      frame_size_change = 1;

      change_frame_size (f, data->frame_height, data->frame_width, 0, 0);
    }
  else
    frame_size_change = 0;

  windows_or_buffers_changed++;
  new_current_buffer = data->current_buffer;
  if (NILP (XBUFFER (new_current_buffer)->name))
    new_current_buffer = Qnil;

  /* Kludge Alert!
     Mark all windows now on frame as "deleted".
     Restoring the new configuration "undeletes" any that are in it.

     Save their current buffers in their height fields, since we may
     need it later, if the buffer saved in the configuration is now
     dead.  */
  delete_all_subwindows (XWINDOW (FRAME_ROOT_WINDOW (f)));

  for (k = 0; k < saved_windows->size; k++)
    {

	      set_marker_restricted (w->start, Fmarker_position (p->start), w->buffer);
	      set_marker_restricted (w->pointm, Fmarker_position (p->pointm), w->buffer);
	      Fset_marker (XBUFFER (w->buffer)->mark,
			   Fmarker_position (p->mark), w->buffer);

	      if (!EQ (p->buffer, new_current_buffer) &&
		  XBUFFER (p->buffer) == current_buffer)
		Fgoto_char (w->pointm);
	    }
	  else if (NILP (XBUFFER (w->buffer)->name))

	    }
	}
    }

  FRAME_ROOT_WINDOW (f) = data->root_window;
  /* We also need to restore the frame's selected window; that's taken
     care of below, either by calling Fselect_window, or by explicit
     assignment.  */

#if 0  /* I don't understand why this is needed, and it causes
	  problems when the frame's old selected window has been
	  deleted.  */
#ifdef MULTI_FRAME

    Fselect_frame (WINDOW_FRAME (XWINDOW (data->root_window)), Qnil);
#endif
#endif

  /* Set the screen height to the value it had before this function.  */
  if (frame_size_change)
    change_frame_size (f, previous_frame_height, previous_frame_width, 0, 0);

  if (f == selected_frame)
    {
      Fselect_window (data->current_window);
      if (!NILP (new_current_buffer))
	Fset_buffer (new_current_buffer);
      else
	Fset_buffer (XWINDOW (selected_window)->buffer);
    }
  else
    FRAME_SELECTED_WINDOW (f) = data->current_window;

  Vminibuf_scroll_window = data->minibuf_scroll_window;
  return (Qnil);
}

  "Return an object representing the current window configuration of FRAME.\n\
If FRAME is nil or omitted, use the selected frame.\n\
This describes the number of windows, their sizes and current buffers,\n\
and for each displayed buffer, where display starts, and the positions of\n\
point and mark.  An exception is made for point in the current buffer:\n\
its value is -not- saved.")
  (frame)
     Lisp_Object frame;
{
  register Lisp_Object tem;
  register int n_windows;

  data = (struct save_window_data *)
           XVECTOR (Fmake_vector (make_number (SAVE_WINDOW_DATA_SIZE),
				  Qnil));
  XFASTINT (data->frame_width) = FRAME_WIDTH (f);
  XFASTINT (data->frame_height) = FRAME_HEIGHT (f);
  data->current_window = FRAME_SELECTED_WINDOW (f);
  XSET (data->current_buffer, Lisp_Buffer, current_buffer);
  data->minibuf_scroll_window = Vminibuf_scroll_window;
  data->root_window = FRAME_ROOT_WINDOW (f);
  tem = Fmake_vector (make_number (n_windows), Qnil);
  data->saved_windows = tem;
  for (i = 0; i < n_windows; i++)
    XVECTOR (tem)->contents[i]
      = Fmake_vector (make_number (SAVED_WINDOW_VECTOR_SIZE), Qnil);

1325:f03e559aac3e

struct save_window_data
  {
    int size_from_Lisp_Vector_struct;
    struct Lisp_Vector *next_from_Lisp_Vector_struct;
    Lisp_Object frame_width, frame_height;
    Lisp_Object selected_frame;
    Lisp_Object current_window;
    Lisp_Object current_buffer;
    Lisp_Object minibuf_scroll_window;
    Lisp_Object root_window;
    Lisp_Object focus_frame;
    /* A vector, interpreted as a struct saved_window */
    Lisp_Object saved_windows;
  };
#define SAVE_WINDOW_DATA_SIZE 7 /* Arg to Fmake_vector */

  register Lisp_Object tem;
  Lisp_Object new_current_buffer;
  int k;
  FRAME_PTR f;

  /* If the frame has been resized since this window configuration was
     made, we change the frame to the size specified in the
     configuration, restore the configuration, and then resize it
     back.  We keep track of the prevailing height in these variables.  */
  int previous_frame_height;
  int previous_frame_width;

  while (XTYPE (configuration) != Lisp_Window_Configuration)
    {
      configuration = wrong_type_argument (intern ("window-configuration-p"),
					   configuration);

  data = (struct save_window_data *) XVECTOR (configuration);
  saved_windows = XVECTOR (data->saved_windows);

  f = XFRAME (XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame);

  previous_frame_height = FRAME_HEIGHT (f);
  previous_frame_width =  FRAME_WIDTH  (f);
  if (XFASTINT (data->frame_height) != previous_frame_height
      || XFASTINT (data->frame_width) != previous_frame_width)
    change_frame_size (f, data->frame_height, data->frame_width, 0, 0);

  windows_or_buffers_changed++;
  new_current_buffer = data->current_buffer;
  if (NILP (XBUFFER (new_current_buffer)->name))
    new_current_buffer = Qnil;

  /* Kludge Alert!
     Mark all windows now on frame as "deleted".
     Restoring the new configuration "undeletes" any that are in it.

     Save their current buffers in their height fields, since we may
     need it later, if a buffer saved in the configuration is now
     dead.  */
  delete_all_subwindows (XWINDOW (FRAME_ROOT_WINDOW (f)));

  for (k = 0; k < saved_windows->size; k++)
    {

	      set_marker_restricted (w->start, Fmarker_position (p->start), w->buffer);
	      set_marker_restricted (w->pointm, Fmarker_position (p->pointm), w->buffer);
	      Fset_marker (XBUFFER (w->buffer)->mark,
			   Fmarker_position (p->mark), w->buffer);

	      /* As documented in Fcurrent_window_configuration, don't
		 save the location of point in the buffer which was current
		 when the window configuration was recorded.  */
	      if (!EQ (p->buffer, new_current_buffer) &&
		  XBUFFER (p->buffer) == current_buffer)
		Fgoto_char (w->pointm);
	    }
	  else if (NILP (XBUFFER (w->buffer)->name))

	    }
	}
    }

  FRAME_ROOT_WINDOW (f) = data->root_window;
  Fselect_window (data->current_window);

  /* Fselect_window will have made f the selected frame, so we
     reselect the proper frame here.  Fselect_frame will change the
     selected window too, but that doesn't make the call to
     Fselect_window above totally superfluous; it still sets f's
     selected window.  */
  Fselect_frame (d->selected_frame);

  if (!NILP (new_current_buffer))
    Fset_buffer (new_current_buffer);

#ifdef MULTI_FRAME
  {
    Lisp_Object frame;

    XSET (frame, Lisp_Frame, f);
    Fredirect_frame_focus (frame, data->focus_frame);
  }
#endif

#if 0  /* I don't understand why this is needed, and it causes
	  problems when the frame's old selected window has been
	  deleted.  */
#ifdef MULTI_FRAME

    Fselect_frame (WINDOW_FRAME (XWINDOW (data->root_window)), Qnil);
#endif
#endif

  /* Set the screen height to the value it had before this function.  */
  if (previous_frame_height != FRAME_HEIGHT (f)
      || previous_frame_width != FRAME_WIDTH (f))
    change_frame_size (f, previous_frame_height, previous_frame_width, 0, 0);

  Vminibuf_scroll_window = data->minibuf_scroll_window;
  return (Qnil);
}

  "Return an object representing the current window configuration of FRAME.\n\
If FRAME is nil or omitted, use the selected frame.\n\
This describes the number of windows, their sizes and current buffers,\n\
and for each displayed buffer, where display starts, and the positions of\n\
point and mark.  An exception is made for point in the current buffer:\n\
its value is -not- saved.\n\
This also records the currently selected frame, and FRAME's focus\n\
redirection (see `redirect-frame-focus').")
  (frame)
     Lisp_Object frame;
{
  register Lisp_Object tem;
  register int n_windows;

  data = (struct save_window_data *)
           XVECTOR (Fmake_vector (make_number (SAVE_WINDOW_DATA_SIZE),
				  Qnil));
  XFASTINT (data->frame_width) = FRAME_WIDTH (f);
  XFASTINT (data->frame_height) = FRAME_HEIGHT (f);
  XSET (data->selected_frame, Lisp_Frame, selected_frame);
  data->current_window = FRAME_SELECTED_WINDOW (f);
  XSET (data->current_buffer, Lisp_Buffer, current_buffer);
  data->minibuf_scroll_window = Vminibuf_scroll_window;
  data->root_window = FRAME_ROOT_WINDOW (f);
  data->focus_frame = FRAME_FOCUS_FRAME (f);
  tem = Fmake_vector (make_number (n_windows), Qnil);
  data->saved_windows = tem;
  for (i = 0; i < n_windows; i++)
    XVECTOR (tem)->contents[i]
      = Fmake_vector (make_number (SAVED_WINDOW_VECTOR_SIZE), Qnil);