comparison src/window.c @ 42816:3ba600a336b4

(enlarge_window): When exceeding size of parent, directly delete all the siblings instead of trying to resize it.

42815:b672e0acf1a3

  else
    {
      register int delta1;
      register int opht = (*sizefun) (parent);

      /* If trying to grow this window to or beyond size of the parent,
	 make delta1 so big that, on shrinking back down,
	 all the siblings end up with less than one line and are deleted.  */
      if (opht <= XINT (*sizep) + delta)
	delta1 = opht * opht * 2;
      else
	{
	  /* Otherwise, make delta1 just right so that if we add
	     delta1 lines to this window and to the parent, and then
	     shrink the parent back to its original size, the new

	  for (s = w->prev; !NILP (s); s = XWINDOW (s)->prev)
	    if (!window_fixed_size_p (XWINDOW (s), widthflag, 0))
	      ++n;

	  delta1 = n * delta;
	}

      /* Add delta1 lines or columns to this window, and to the parent,
	 keeping things consistent while not affecting siblings.  */
      XSETINT (CURSIZE (parent), opht + delta1);
      (*setsizefun) (window, XINT (*sizep) + delta1, 0);

      /* Squeeze out delta1 lines or columns from our parent,
	 shriking this window and siblings proportionately.
	 This brings parent back to correct size.
	 Delta1 was calculated so this makes this window the desired size,
	 taking it all out of the siblings.  */
      (*setsizefun) (parent, opht, 0);
    }

  XSETFASTINT (p->last_modified, 0);
  XSETFASTINT (p->last_overlay_modified, 0);

42816:3ba600a336b4

  else
    {
      register int delta1;
      register int opht = (*sizefun) (parent);

      if (opht <= XINT (*sizep) + delta)
	{
	  /* If trying to grow this window to or beyond size of the parent,
	     just delete all the sibling windows.  */
	  Lisp_Object tem, next;

	  tem = XWINDOW (parent)->vchild;
	  if (NILP (tem))
	    tem = XWINDOW (parent)->hchild;

	  while (! NILP (tem))
	    {
	      next = XWINDOW (tem)->next;
	      if (!EQ (tem, window))
		delete_window (tem);
	      tem = next;
	    }
	}
      else
	{
	  /* Otherwise, make delta1 just right so that if we add
	     delta1 lines to this window and to the parent, and then
	     shrink the parent back to its original size, the new

	  for (s = w->prev; !NILP (s); s = XWINDOW (s)->prev)
	    if (!window_fixed_size_p (XWINDOW (s), widthflag, 0))
	      ++n;

	  delta1 = n * delta;

	  /* Add delta1 lines or columns to this window, and to the parent,
	     keeping things consistent while not affecting siblings.  */
	  XSETINT (CURSIZE (parent), opht + delta1);
	  (*setsizefun) (window, XINT (*sizep) + delta1, 0);

	  /* Squeeze out delta1 lines or columns from our parent,
	     shriking this window and siblings proportionately.
	     This brings parent back to correct size.
	     Delta1 was calculated so this makes this window the desired size,
	     taking it all out of the siblings.  */
	  (*setsizefun) (parent, opht, 0);

	}
    }

  XSETFASTINT (p->last_modified, 0);
  XSETFASTINT (p->last_overlay_modified, 0);