comparison src/window.c @ 9974:5cda62e4222a

(Fcurrent_window_configuration): Use allocate_vectorlike and VECSIZE. (SAVE_WINDOW_DATA_SIZE): Macro deleted.

9973:1d5a908f201e

    Lisp_Object min_width, min_height;
    /* A vector, interpreted as a struct saved_window */
    Lisp_Object saved_windows;
  };

/* Arg to Fmake_vector */
#define SAVE_WINDOW_DATA_SIZE						\
  ((sizeof (struct save_window_data)					\
    - (sizeof (struct Lisp_Vector)					\
       /* Don't count the contents member of the struct Lisp_Vector */	\
       - sizeof (Lisp_Object)))						\
   / sizeof (Lisp_Object))

/* This is saved as a Lisp_Vector */
struct saved_window
  {
    /* these first two must agree with struct Lisp_Vector in lisp.h */
    int size_from_Lisp_Vector_struct;

     Lisp_Object frame;
{
  register Lisp_Object tem;
  register int n_windows;
  register struct save_window_data *data;
  register int i;
  FRAME_PTR f;

  if (NILP (frame))
    f = selected_frame;

      CHECK_LIVE_FRAME (frame, 0);
      f = XFRAME (frame);
    }

  n_windows = count_windows (XWINDOW (FRAME_ROOT_WINDOW (f)));
  data = ((struct save_window_data *)
	  XVECTOR (Fmake_vector (make_number (SAVE_WINDOW_DATA_SIZE), Qnil)));
  XSETFASTINT (data->frame_width, FRAME_WIDTH (f));
  XSETFASTINT (data->frame_height, FRAME_HEIGHT (f));
  XSETFASTINT (data->frame_menu_bar_lines, FRAME_MENU_BAR_LINES (f));
#ifdef MULTI_FRAME
  XSETFRAME (data->selected_frame, selected_frame);

9974:5cda62e4222a

    Lisp_Object min_width, min_height;
    /* A vector, interpreted as a struct saved_window */
    Lisp_Object saved_windows;
  };

/* This is saved as a Lisp_Vector */
struct saved_window
  {
    /* these first two must agree with struct Lisp_Vector in lisp.h */
    int size_from_Lisp_Vector_struct;

     Lisp_Object frame;
{
  register Lisp_Object tem;
  register int n_windows;
  register struct save_window_data *data;
  register struct Lisp_Vector *vec;
  register int i;
  FRAME_PTR f;

  if (NILP (frame))
    f = selected_frame;

      CHECK_LIVE_FRAME (frame, 0);
      f = XFRAME (frame);
    }

  n_windows = count_windows (XWINDOW (FRAME_ROOT_WINDOW (f)));
  vec = allocate_vectorlike (VECSIZE (struct save_window_data));
  for (i = 0; i < VECSIZE (struct save_window_data); i++)
    vec->contents[i] = Qnil;
  vec->size = VECSIZE (struct save_window_data);
  data = (struct save_window_data *)vec;

  XSETFASTINT (data->frame_width, FRAME_WIDTH (f));
  XSETFASTINT (data->frame_height, FRAME_HEIGHT (f));
  XSETFASTINT (data->frame_menu_bar_lines, FRAME_MENU_BAR_LINES (f));
#ifdef MULTI_FRAME
  XSETFRAME (data->selected_frame, selected_frame);