comparison src/window.c @ 26046:9204dfa34c1b

(enum save_restore_action): New. (save_restore_orig_size): Change parameter list. Add functionality to check for valid orig_top and orig_height members in a window tree. (grow_mini_window): Call save_restore_orig_size with new parameter list. (shrink_mini_window): Restore old window sizes only if old size information is valid in all windows in a window tree.

26045:03ebfe42764f

/***********************************************************************
			Resizing Mini-Windows
 ***********************************************************************/

static void shrink_window_lowest_first P_ ((struct window *, int));
static void save_restore_orig_size P_ ((struct window *, int));


/* Shrink windows rooted in window W to HEIGHT.  Take the space needed
   from lowest windows first.  */

static void

	}
    }
}


/* Save or restore positions and sizes in the window tree rooted at W.
   SAVE_P non-zero means save top position and height in orig_top and
   orig_height members of the window structure.  Otherwise, restore top
   and height from orig_top and orig_height.  */

static void
save_restore_orig_size (w, save_p)
     struct window *w;
     int save_p;
{
  while (w)
    {
      if (!NILP (w->hchild))
	save_restore_orig_size (XWINDOW (w->hchild), save_p);
      else if (!NILP (w->vchild))
	save_restore_orig_size (XWINDOW (w->vchild), save_p);
      
      if (save_p)
	{
	  w->orig_top = w->top;
	  w->orig_height = w->height;
	}
      else
	{
	  xassert (INTEGERP (w->orig_top) && INTEGERP (w->orig_height));
	  w->top = w->orig_top;
	  w->height = w->orig_height;
	  w->orig_height = w->orig_top = Qnil;
	}
      
      XSETFASTINT (w->last_modified, 0);
      XSETFASTINT (w->last_overlay_modified, 0);
      w = NILP (w->next) ? NULL : XWINDOW (w->next);
    }
}


/* Grow mini-window W by DELTA lines, DELTA >= 0, or as much as we can
   without deleting other windows.  */

    }
    
  if (delta)
    {
      /* Save original window sizes and positions, if not already done.  */
      if (NILP (root->orig_top))
	save_restore_orig_size (root, 1);

      /* Shrink other windows.  */
      shrink_window_lowest_first (root, XFASTINT (root->height) - delta);

      /* Grow the mini-window.  */

     struct window *w;
{
  struct frame *f = XFRAME (w->frame);
  struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f));

  if (!NILP (root->orig_height))
    {
      save_restore_orig_size (root, 0);
      adjust_glyphs (f);
      FRAME_WINDOW_SIZES_CHANGED (f) = 1;
      windows_or_buffers_changed = 1;
    }
  else if (XFASTINT (w->height) > 1)

26046:9204dfa34c1b

/***********************************************************************
			Resizing Mini-Windows
 ***********************************************************************/

static void shrink_window_lowest_first P_ ((struct window *, int));

enum save_restore_action
{
    CHECK_ORIG_SIZES,
    SAVE_ORIG_SIZES,
    RESTORE_ORIG_SIZES
};

static int save_restore_orig_size P_ ((struct window *, 
                                       enum save_restore_action));

/* Shrink windows rooted in window W to HEIGHT.  Take the space needed
   from lowest windows first.  */

static void

	}
    }
}


/* Save, restore, or check positions and sizes in the window tree
   rooted at W.  ACTION says what to do.

   If ACTION is CHECK_ORIG_SIZES, check if orig_top and orig_height
   members are valid for all windows in the window tree.  Value is
   non-zero if they are valid.
   
   If ACTION is SAVE_ORIG_SIZES, save members top and height in
   orig_top and orig_height for all windows in the tree.

   If ACTION is RESTORE_ORIG_SIZES, restore top and height from
   values stored in orig_top and orig_height for all windows.  */

static int
save_restore_orig_size (w, action)
     struct window *w;
     enum save_restore_action action;
{
  int success_p = 1;

  while (w)
    {
      if (!NILP (w->hchild))
	{
	  if (!save_restore_orig_size (XWINDOW (w->hchild), action))
	    success_p = 0;
	}
      else if (!NILP (w->vchild))
	{
	  if (!save_restore_orig_size (XWINDOW (w->vchild), action))
	    success_p = 0;
	}
      
      switch (action)
	{
	case CHECK_ORIG_SIZES:
	  if (!INTEGERP (w->orig_top) || !INTEGERP (w->orig_height))
	    return 0;
	  break;

	case SAVE_ORIG_SIZES:
	  w->orig_top = w->top;
	  w->orig_height = w->height;
          XSETFASTINT (w->last_modified, 0);
          XSETFASTINT (w->last_overlay_modified, 0);
	  break;

	case RESTORE_ORIG_SIZES:
	  xassert (INTEGERP (w->orig_top) && INTEGERP (w->orig_height));
	  w->top = w->orig_top;
	  w->height = w->orig_height;
	  w->orig_height = w->orig_top = Qnil;
          XSETFASTINT (w->last_modified, 0);
          XSETFASTINT (w->last_overlay_modified, 0);
	  break;

	default:
	  abort ();
	}

      w = NILP (w->next) ? NULL : XWINDOW (w->next);
    }

  return success_p;
}


/* Grow mini-window W by DELTA lines, DELTA >= 0, or as much as we can
   without deleting other windows.  */

    }
    
  if (delta)
    {
      /* Save original window sizes and positions, if not already done.  */
      if (!save_restore_orig_size (root, CHECK_ORIG_SIZES))
	save_restore_orig_size (root, SAVE_ORIG_SIZES);

      /* Shrink other windows.  */
      shrink_window_lowest_first (root, XFASTINT (root->height) - delta);

      /* Grow the mini-window.  */

     struct window *w;
{
  struct frame *f = XFRAME (w->frame);
  struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f));

  if (save_restore_orig_size (root, CHECK_ORIG_SIZES))
    {
      save_restore_orig_size (root, RESTORE_ORIG_SIZES);
      adjust_glyphs (f);
      FRAME_WINDOW_SIZES_CHANGED (f) = 1;
      windows_or_buffers_changed = 1;
    }
  else if (XFASTINT (w->height) > 1)