aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2010-01-08 16:31:35 +0000
committerTiago Cunha <tcunha@gmx.com>2010-01-08 16:31:35 +0000
commitda194cc4359d16f27815be18b3be6cc6efabe5fd (patch)
tree6913c0d34cd61314a0d39eff14386f17e80facf1 /tmux.h
parentf5dd79a01a439d3c37e7a9ca60f4c2be26d30415 (diff)
downloadrtmux-da194cc4359d16f27815be18b3be6cc6efabe5fd.tar.gz
rtmux-da194cc4359d16f27815be18b3be6cc6efabe5fd.tar.bz2
rtmux-da194cc4359d16f27815be18b3be6cc6efabe5fd.zip
Sync OpenBSD patchset 604:
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 'tmux.h')
-rw-r--r--tmux.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/tmux.h b/tmux.h
index 93d90b14..abc7d95c 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.535 2010-01-05 23:52:37 tcunha Exp $ */
+/* $Id: tmux.h,v 1.536 2010-01-08 16:31:35 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1436,6 +1436,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;
@@ -1832,8 +1833,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 */