comparison src/window.c @ 28463:4591d285fb65

* window.c (CURBEG, CURSIZE): Don't overload lisp object lvalues with int lvalues via casts; instead, just yield lisp object lvalues. (enlarge_window): Variable sizep now points to Lisp_Object. Use proper accessor macros. (shrink_window_lowest_first): w->top is Lisp_Object; use XINT. (grow_mini_window): Fix typo getting int value of root->height.

28462:0b6c9ff7efe1

  return XFASTINT (p->width);
}

	
#define CURBEG(w) \
  *(widthflag ? (int *) &(XWINDOW (w)->left) : (int *) &(XWINDOW (w)->top))

#define CURSIZE(w) \
  *(widthflag ? (int *) &(XWINDOW (w)->width) : (int *) &(XWINDOW (w)->height))


/* Enlarge selected_window by DELTA.  WIDTHFLAG non-zero means
   increase its width.  Siblings of the selected window are resized to
   fullfil the size request.  If they become too small in the process,

     Lisp_Object window;
     int delta, widthflag;
{
  Lisp_Object parent, next, prev;
  struct window *p;
  int *sizep, maximum;
  int (*sizefun) P_ ((Lisp_Object))
    = widthflag ? window_width : window_height;
  void (*setsizefun) P_ ((Lisp_Object, int, int))
    = (widthflag ? set_window_width : set_window_height);

  sizep = &CURSIZE (window);

  {
    register int maxdelta;

    maxdelta = (!NILP (parent) ? (*sizefun) (parent) - *sizep
		: !NILP (p->next) ? ((*sizefun) (p->next)
				     - window_min_size (XWINDOW (p->next),
							widthflag, 0, 0))
		: !NILP (p->prev) ? ((*sizefun) (p->prev)
				     - window_min_size (XWINDOW (p->prev),

	 the full frame, or make the only window aside from the
	 minibuffer the full frame.  */
      delta = maxdelta;
  }

  if (*sizep + delta < window_min_size (XWINDOW (window), widthflag, 0, 0))
    {
      delete_window (window);
      return;
    }

		{
		  if (this_one > delta)
		    this_one = delta;
		  
		  (*setsizefun) (next, (*sizefun) (next) - this_one, 0);
		  (*setsizefun) (window, *sizep + this_one, 0);

		  delta -= this_one;
		}
	      
	      next = XWINDOW (next)->next;

		    this_one = delta;
		  
		  first_affected = prev;
		  
		  (*setsizefun) (prev, (*sizefun) (prev) - this_one, 0);
		  (*setsizefun) (window, *sizep + this_one, 0);

		  delta -= this_one;
		}
	      
	      prev = XWINDOW (prev)->prev;

      first_unaffected = next;
      prev = first_affected;
      for (next = XWINDOW (prev)->next; ! EQ (next, first_unaffected);
	   prev = next, next = XWINDOW (next)->next)
	{
	  CURBEG (next) = CURBEG (prev) + (*sizefun) (prev);
	  /* This does not change size of NEXT,
	     but it propagates the new top edge to its children */
	  (*setsizefun) (next, (*sizefun) (next), 0);
	}
    }

      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 <= *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

	  delta1 = n * delta;
	}

      /* Add delta1 lines or columns to this window, and to the parent,
	 keeping things consistent while not affecting siblings.  */
      CURSIZE (parent) = opht + delta1;
      (*setsizefun) (window, *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,

	  shrink_window_lowest_first (c, XFASTINT (c->height) - this_one);
	  delta -= this_one;
	}

      /* Compute new positions.  */
      last_top = w->top;
      for (child = w->vchild; !NILP (child); child = c->next)
	{
	  c = XWINDOW (child);
	  c->top = make_number (last_top);
	  shrink_window_lowest_first (c, XFASTINT (c->height));

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

      /* Grow the mini-window.  */
      w->top = make_number (XFASTINT (root->top) + XFASTINT (root)->height);
      w->height = make_number (XFASTINT (w->height) + delta);
      XSETFASTINT (w->last_modified, 0);
      XSETFASTINT (w->last_overlay_modified, 0);
      
      adjust_glyphs (f);

28463:4591d285fb65

  return XFASTINT (p->width);
}

	
#define CURBEG(w) \
  *(widthflag ? &(XWINDOW (w)->left) : &(XWINDOW (w)->top))

#define CURSIZE(w) \
  *(widthflag ? &(XWINDOW (w)->width) : &(XWINDOW (w)->height))


/* Enlarge selected_window by DELTA.  WIDTHFLAG non-zero means
   increase its width.  Siblings of the selected window are resized to
   fullfil the size request.  If they become too small in the process,

     Lisp_Object window;
     int delta, widthflag;
{
  Lisp_Object parent, next, prev;
  struct window *p;
  Lisp_Object *sizep;
  int maximum;
  int (*sizefun) P_ ((Lisp_Object))
    = widthflag ? window_width : window_height;
  void (*setsizefun) P_ ((Lisp_Object, int, int))
    = (widthflag ? set_window_width : set_window_height);

  sizep = &CURSIZE (window);

  {
    register int maxdelta;

    maxdelta = (!NILP (parent) ? (*sizefun) (parent) - XINT (*sizep)
		: !NILP (p->next) ? ((*sizefun) (p->next)
				     - window_min_size (XWINDOW (p->next),
							widthflag, 0, 0))
		: !NILP (p->prev) ? ((*sizefun) (p->prev)
				     - window_min_size (XWINDOW (p->prev),

	 the full frame, or make the only window aside from the
	 minibuffer the full frame.  */
      delta = maxdelta;
  }

  if (XINT (*sizep) + delta < window_min_size (XWINDOW (window), widthflag, 0, 0))
    {
      delete_window (window);
      return;
    }

		{
		  if (this_one > delta)
		    this_one = delta;
		  
		  (*setsizefun) (next, (*sizefun) (next) - this_one, 0);
		  (*setsizefun) (window, XINT (*sizep) + this_one, 0);

		  delta -= this_one;
		}
	      
	      next = XWINDOW (next)->next;

		    this_one = delta;
		  
		  first_affected = prev;
		  
		  (*setsizefun) (prev, (*sizefun) (prev) - this_one, 0);
		  (*setsizefun) (window, XINT (*sizep) + this_one, 0);

		  delta -= this_one;
		}
	      
	      prev = XWINDOW (prev)->prev;

      first_unaffected = next;
      prev = first_affected;
      for (next = XWINDOW (prev)->next; ! EQ (next, first_unaffected);
	   prev = next, next = XWINDOW (next)->next)
	{
	  XSETINT (CURBEG (next), XINT (CURBEG (prev)) + (*sizefun) (prev));
	  /* This does not change size of NEXT,
	     but it propagates the new top edge to its children */
	  (*setsizefun) (next, (*sizefun) (next), 0);
	}
    }

      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

	  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,

	  shrink_window_lowest_first (c, XFASTINT (c->height) - this_one);
	  delta -= this_one;
	}

      /* Compute new positions.  */
      last_top = XINT (w->top);
      for (child = w->vchild; !NILP (child); child = c->next)
	{
	  c = XWINDOW (child);
	  c->top = make_number (last_top);
	  shrink_window_lowest_first (c, XFASTINT (c->height));

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

      /* Grow the mini-window.  */
      w->top = make_number (XFASTINT (root->top) + XFASTINT (root->height));
      w->height = make_number (XFASTINT (w->height) + delta);
      XSETFASTINT (w->last_modified, 0);
      XSETFASTINT (w->last_overlay_modified, 0);
      
      adjust_glyphs (f);