comparison src/window.c @ 15902:985270efc514

(Fsplit_window): Treat width just like height; no special handling for scroll bars.

15901:4b6c924dfb89

{
  register Lisp_Object new;
  register struct window *o, *p;
  FRAME_PTR fo;
  register int size_int;
  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 (size))
    {
      if (!NILP (horflag))
	/* Calculate the size of the left-hand window, by dividing
	   the usable space in columns by two. */
	size_int = (internal_width - separator_width) >> 1;
      else
	size_int = XFASTINT (o->height) >> 1;
    }
  else
    {

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

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

15902:985270efc514

{
  register Lisp_Object new;
  register struct window *o, *p;
  FRAME_PTR fo;
  register int size_int;

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

  o = XWINDOW (window);
  fo = XFRAME (WINDOW_FRAME (o));
  width = XFASTINT (o->width);

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

    }
  else
    {
      if (size_int < window_min_width)
	error ("Window width %d too small (after splitting)", size_int);

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

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