aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-04-27 21:21:55 +0100
committerThomas Adam <thomas@xteddy.org>2015-04-27 21:21:55 +0100
commit94a8ef1caef855d1a43b6373dd08ce0bbf4aadd5 (patch)
tree052d89cf9193a324fb646fe25152df6aa4070534 /tmux.h
parent72e9ebf2ece28c986050162bf4f401a6a7679f53 (diff)
parent95195f52584565483bf9850840f6d81cd88bf9b2 (diff)
downloadrtmux-94a8ef1caef855d1a43b6373dd08ce0bbf4aadd5.tar.gz
rtmux-94a8ef1caef855d1a43b6373dd08ce0bbf4aadd5.tar.bz2
rtmux-94a8ef1caef855d1a43b6373dd08ce0bbf4aadd5.zip
Merge branch 'obsd-master'
Conflicts: Makefile tmux.1
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h25
1 files changed, 13 insertions, 12 deletions
diff --git a/tmux.h b/tmux.h
index 2691750e..0504d8a4 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1738,8 +1738,19 @@ size_t args_print(struct args *, char *, size_t);
int args_has(struct args *, u_char);
void args_set(struct args *, u_char, const char *);
const char *args_get(struct args *, u_char);
-long long args_strtonum(
- struct args *, u_char, long long, long long, char **);
+long long args_strtonum(struct args *, u_char, long long, long long,
+ char **);
+
+/* cmd-find.c */
+struct session *cmd_find_current(struct cmd_q *);
+struct session *cmd_find_session(struct cmd_q *, const char *, int);
+struct winlink *cmd_find_window(struct cmd_q *, const char *,
+ struct session **);
+struct winlink *cmd_find_pane(struct cmd_q *, const char *, struct session **,
+ struct window_pane **);
+struct client *cmd_find_client(struct cmd_q *, const char *, int);
+int cmd_find_index(struct cmd_q *, const char *,
+ struct session **);
/* cmd.c */
int cmd_pack_argv(int, char **, char *, size_t);
@@ -1754,16 +1765,6 @@ int cmd_mouse_at(struct window_pane *, struct mouse_event *,
struct winlink *cmd_mouse_window(struct mouse_event *, struct session **);
struct window_pane *cmd_mouse_pane(struct mouse_event *, struct session **,
struct winlink **);
-struct session *cmd_current_session(struct cmd_q *, int);
-struct client *cmd_current_client(struct cmd_q *);
-struct client *cmd_find_client(struct cmd_q *, const char *, int);
-struct session *cmd_find_session(struct cmd_q *, const char *, int);
-struct winlink *cmd_find_window(struct cmd_q *, const char *,
- struct session **);
-int cmd_find_index(struct cmd_q *, const char *,
- struct session **);
-struct winlink *cmd_find_pane(struct cmd_q *, const char *, struct session **,
- struct window_pane **);
char *cmd_template_replace(const char *, const char *, int);
extern const struct cmd_entry *cmd_table[];
extern const struct cmd_entry cmd_attach_session_entry;