Return to cmd-resize-pane.c CVS log

Up to [local] / src / usr.bin / tmux

Improved layout code.

Each window now has a tree of layout cells associated with it. In this tree,
each node is either a horizontal or vertical cell containing a list of other
cells running from left-to-right or top-to-bottom, or a leaf cell which is
associated with a pane.

The major functional changes are:

- panes may now be split arbitrarily both horizontally (splitw -h, C-b %) and
  vertically (splitw -v, C-b ");
- panes may be resized both horizontally and vertically (resizep -L/-R/-U/-D,
  bound to C-b left/right/up/down and C-b M-left/right/up/down);
- layouts are now applied and then may be modified by resizing or splitting
  panes, rather than being fixed and reapplied when the window is resized or
  panes are added;
- manual-vertical layout is no longer necessary, and active-only layout is gone
  (but may return in future);
- the main-pane layouts now reduce the size of the main pane to fit all panes
  if possible.

Thanks to all who tested.

/* $OpenBSD: cmd-resize-pane.c,v 1.3 2009/07/19 13:21:40 nicm Exp $ */

/*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
 * copyright notice and this permission notice appear in all copies.
 *
 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
 * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

#include <sys/types.h>

#include <stdlib.h>

#include "tmux.h"

/*
 * Increase or decrease pane size.
 */

void	cmd_resize_pane_init(struct cmd *, int);
int	cmd_resize_pane_exec(struct cmd *, struct cmd_ctx *);

const struct cmd_entry cmd_resize_pane_entry = {
	"resize-pane", "resizep",
	CMD_PANE_WINDOW_USAGE "[-DU] [adjustment]",
	CMD_ARG01,
	CMD_CHFLAG('D')|CMD_CHFLAG('L')|CMD_CHFLAG('R')|CMD_CHFLAG('U'),
	cmd_resize_pane_init,
	cmd_pane_parse,
	cmd_resize_pane_exec,
       	cmd_pane_send,
	cmd_pane_recv,
	cmd_pane_free,
	cmd_pane_print
};

void
cmd_resize_pane_init(struct cmd *self, int key)
{
	struct cmd_pane_data	*data;

	cmd_pane_init(self, key);
	data = self->data;

	if (key == KEYC_ADDCTL(KEYC_UP))
		data->chflags |= CMD_CHFLAG('U');
	if (key == KEYC_ADDCTL(KEYC_DOWN))
		data->chflags |= CMD_CHFLAG('D');
	if (key == KEYC_ADDCTL(KEYC_LEFT))
		data->chflags |= CMD_CHFLAG('L');
	if (key == KEYC_ADDCTL(KEYC_RIGHT))
		data->chflags |= CMD_CHFLAG('R');

	if (key == KEYC_ADDESC(KEYC_UP)) {
		data->chflags |= CMD_CHFLAG('U');
		data->arg = xstrdup("5");
	}
	if (key == KEYC_ADDESC(KEYC_DOWN)) {
		data->chflags |= CMD_CHFLAG('D');
		data->arg = xstrdup("5");
	}
	if (key == KEYC_ADDESC(KEYC_LEFT)) {
		data->chflags |= CMD_CHFLAG('L');
		data->arg = xstrdup("5");
	}
	if (key == KEYC_ADDESC(KEYC_RIGHT)) {
		data->chflags |= CMD_CHFLAG('R');
		data->arg = xstrdup("5");
	}
}

int
cmd_resize_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
{
	struct cmd_pane_data	*data = self->data;
	struct winlink		*wl;
	const char	       	*errstr;
	struct window_pane	*wp;
	u_int			 adjust;

	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
		return (-1);
	if (data->pane == -1)
		wp = wl->window->active;
	else {
		wp = window_pane_at_index(wl->window, data->pane);
		if (wp == NULL) {
			ctx->error(ctx, "no pane: %d", data->pane);
			return (-1);
		}
	}

	if (data->arg == NULL)
		adjust = 1;
	else {
		adjust = strtonum(data->arg, 1, INT_MAX, &errstr);
		if (errstr != NULL) {
			ctx->error(ctx, "adjustment %s: %s", errstr, data->arg);
			return (-1);
		}
	}

	if (data->chflags & (CMD_CHFLAG('L')|CMD_CHFLAG('R'))) {
		if (data->chflags & CMD_CHFLAG('L'))
			adjust = -adjust;
		layout_resize_pane(wp, LAYOUT_LEFTRIGHT, adjust);
	} else {
		if (data->chflags & CMD_CHFLAG('U'))
			adjust = -adjust;
		layout_resize_pane(wp, LAYOUT_TOPBOTTOM, adjust);
	}
	server_redraw_window(wl->window);

	return (0);
}