comparison src/window.c @ 13723:4e170419e83c

(Fsplit_window): Account for scroll bar width.

13722:e2669b8a46e2

  (window, chsize, horflag)
     Lisp_Object window, chsize, horflag;
{
  register Lisp_Object new;
  register struct window *o, *p;
  register int size;

  if (NILP (window))
    window = selected_window;
  else
    CHECK_LIVE_WINDOW (window, 0);

  o = XWINDOW (window);

  if (NILP (chsize))
    {
      if (!NILP (horflag))
	/* Round odd size up, since this is for the left-hand window,
	   and it will lose a column for the separators.  */
	size = ((XFASTINT (o->width) + 1) & -2) >> 1;
      else
	size = XFASTINT (o->height) >> 1;
    }
  else
    {

      size = XINT (chsize);
    }

  if (MINI_WINDOW_P (o))
    error ("Attempt to split minibuffer window");
  else if (FRAME_NO_SPLIT_P (XFRAME (WINDOW_FRAME (o))))
    error ("Attempt to split unsplittable frame");

  check_min_window_sizes ();

  if (NILP (horflag))

    }
  else
    {
      if (size < window_min_width)
	error ("Window width %d too small (after splitting)", size);
      if (size + window_min_width > XFASTINT (o->width))
	error ("Window width %d too small (after splitting)", 
	       XFASTINT (o->width) - size);
      if (NILP (o->parent)
	  || NILP (XWINDOW (o->parent)->hchild))
	{
	  make_dummy_parent (window);
	  new = o->parent;

  /* Now we know that window's parent is a vertical combination
     if we are dividing vertically, or a horizontal combination
     if we are making side-by-side windows */

  windows_or_buffers_changed++;
  FRAME_WINDOW_SIZES_CHANGED (XFRAME (WINDOW_FRAME (o))) = 1;
  new = make_window ();
  p = XWINDOW (new);

  p->frame = o->frame;
  p->next = o->next;

  if (!NILP (horflag))
    {
      p->height = o->height;
      p->top = o->top;
      XSETFASTINT (p->width, XFASTINT (o->width) - size);
      XSETFASTINT (o->width, size);
      XSETFASTINT (p->left, XFASTINT (o->left) + size);
    }
  else
    {

13723:4e170419e83c

  (window, chsize, horflag)
     Lisp_Object window, chsize, horflag;
{
  register Lisp_Object new;
  register struct window *o, *p;
  FRAME_PTR fo;
  register int size;
  int internal_width;
  int separator_width = 1;

  if (NILP (window))
    window = selected_window;
  else
    CHECK_LIVE_WINDOW (window, 0);

  o = XWINDOW (window);
  fo = XFRAME (WINDOW_FRAME (o));
  if (FRAME_HAS_VERTICAL_SCROLL_BARS (fo))
    separator_width = FRAME_SCROLL_BAR_COLS (fo);
  internal_width = window_internal_width (o);

  if (NILP (chsize))
    {
      if (!NILP (horflag))
	/* Calculate the size of the left-hand window, by dividing
	   the usable space in columns by two. */
        size = (internal_width - separator_width) >> 1;
      else
	size = XFASTINT (o->height) >> 1;
    }
  else
    {

      size = XINT (chsize);
    }

  if (MINI_WINDOW_P (o))
    error ("Attempt to split minibuffer window");
  else if (FRAME_NO_SPLIT_P (fo))
    error ("Attempt to split unsplittable frame");

  check_min_window_sizes ();

  if (NILP (horflag))

    }
  else
    {
      if (size < window_min_width)
	error ("Window width %d too small (after splitting)", size);
      if (internal_width - size - separator_width < window_min_width)
	error ("Window width %d too small (after splitting)", 
	       internal_width - size - separator_width);
      if (NILP (o->parent)
	  || NILP (XWINDOW (o->parent)->hchild))
	{
	  make_dummy_parent (window);
	  new = o->parent;

  /* Now we know that window's parent is a vertical combination
     if we are dividing vertically, or a horizontal combination
     if we are making side-by-side windows */

  windows_or_buffers_changed++;
  FRAME_WINDOW_SIZES_CHANGED (fo) = 1;
  new = make_window ();
  p = XWINDOW (new);

  p->frame = o->frame;
  p->next = o->next;

  if (!NILP (horflag))
    {
      p->height = o->height;
      p->top = o->top;
      size += separator_width;
      XSETFASTINT (p->width, internal_width - size);
      XSETFASTINT (o->width, size);
      XSETFASTINT (p->left, XFASTINT (o->left) + size);
    }
  else
    {