summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/tmux.h
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2010-01-07 20:52:19 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2010-01-07 20:52:19 +0000
commit1241b457a2c904c3d40e20a5070cdbb0a70a341d (patch)
tree9dfd44ad80c4b284a5593f747fe59bd5ab8a6931 /usr.bin/tmux/tmux.h
parent46a4804a318e98fa797a71a43240f2fc521f38f0 (diff)
New command, join-pane, to split and move an existing pane into the space (like
splitw then movep, or the reverse of breakp).
Diffstat (limited to 'usr.bin/tmux/tmux.h')
-rw-r--r--usr.bin/tmux/tmux.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 259401d0537..3a4b409031c 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.197 2010/01/03 12:51:05 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.198 2010/01/07 20:52:18 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1437,6 +1437,7 @@ extern const struct cmd_entry cmd_down_pane_entry;
extern const struct cmd_entry cmd_find_window_entry;
extern const struct cmd_entry cmd_has_session_entry;
extern const struct cmd_entry cmd_if_shell_entry;
+extern const struct cmd_entry cmd_join_pane_entry;
extern const struct cmd_entry cmd_kill_pane_entry;
extern const struct cmd_entry cmd_kill_server_entry;
extern const struct cmd_entry cmd_kill_session_entry;
@@ -1833,8 +1834,9 @@ void layout_free(struct window *);
void layout_resize(struct window *, u_int, u_int);
void layout_resize_pane(
struct window_pane *, enum layout_type, int);
-int layout_split_pane(struct window_pane *,
- enum layout_type, int, struct window_pane *);
+void layout_assign_pane(struct layout_cell *, struct window_pane *);
+struct layout_cell *layout_split_pane(
+ struct window_pane *, enum layout_type, int);
void layout_close_pane(struct window_pane *);
/* layout-set.c */