aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-10-31 10:01:12 +0000
committerThomas Adam <thomas@xteddy.org>2015-10-31 10:01:12 +0000
commit17f6c3be8eeb0b67d07f916026dab918795c0317 (patch)
tree08a10a780a8de977d4452c10a7a9c03db1ae1702 /tmux.h
parente8bb385d6d9d8a91b5fa78e906531afc02320b80 (diff)
parent01defc9f4965bb174e1d1295754d5a8695683054 (diff)
downloadrtmux-17f6c3be8eeb0b67d07f916026dab918795c0317.tar.gz
rtmux-17f6c3be8eeb0b67d07f916026dab918795c0317.tar.bz2
rtmux-17f6c3be8eeb0b67d07f916026dab918795c0317.zip
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/tmux.h b/tmux.h
index 0fd8062e..6f54b1da 100644
--- a/tmux.h
+++ b/tmux.h
@@ -832,7 +832,7 @@ struct window_pane {
int argc;
char **argv;
char *shell;
- int cwd;
+ const char *cwd;
pid_t pid;
char tty[TTY_NAME_MAX];
@@ -979,7 +979,7 @@ struct session {
u_int id;
char *name;
- int cwd;
+ const char *cwd;
struct timeval creation_time;
struct timeval last_attached_time;
@@ -1184,7 +1184,7 @@ struct client {
struct environ *environ;
char *title;
- int cwd;
+ const char *cwd;
char *term;
char *ttyname;
@@ -1539,7 +1539,7 @@ int options_table_find(const char *, const struct options_table_entry **,
/* job.c */
extern struct joblist all_jobs;
-struct job *job_run(const char *, struct session *, int,
+struct job *job_run(const char *, struct session *, const char *,
void (*)(struct job *), void (*)(void *), void *);
void job_free(struct job *);
void job_died(struct job *, int);
@@ -1985,8 +1985,8 @@ struct window *window_find_by_id(u_int);
void window_update_activity(struct window *);
struct window *window_create1(u_int, u_int);
struct window *window_create(const char *, int, char **, const char *,
- const char *, int, struct environ *, struct termios *,
- u_int, u_int, u_int, char **);
+ const char *, const char *, struct environ *,
+ struct termios *, u_int, u_int, u_int, char **);
void window_destroy(struct window *);
struct window_pane *window_get_active_at(struct window *, u_int, u_int);
struct window_pane *window_find_string(struct window *, const char *);
@@ -2013,7 +2013,7 @@ struct window_pane *window_pane_find_by_id(u_int);
struct window_pane *window_pane_create(struct window *, u_int, u_int, u_int);
void window_pane_destroy(struct window_pane *);
int window_pane_spawn(struct window_pane *, int, char **,
- const char *, const char *, int, struct environ *,
+ const char *, const char *, const char *, struct environ *,
struct termios *, char **);
void window_pane_resize(struct window_pane *, u_int, u_int);
void window_pane_alternate_on(struct window_pane *,
@@ -2147,8 +2147,8 @@ struct session *session_find(const char *);
struct session *session_find_by_id_str(const char *);
struct session *session_find_by_id(u_int);
struct session *session_create(const char *, int, char **, const char *,
- int, struct environ *, struct termios *, int, u_int,
- u_int, char **);
+ const char *, struct environ *, struct termios *, int,
+ u_int, u_int, char **);
void session_destroy(struct session *);
void session_unref(struct session *);
int session_check_name(const char *);
@@ -2156,7 +2156,7 @@ void session_update_activity(struct session *, struct timeval *);
struct session *session_next_session(struct session *);
struct session *session_previous_session(struct session *);
struct winlink *session_new(struct session *, const char *, int, char **,
- const char *, int, int, char **);
+ const char *, const char *, int, char **);
struct winlink *session_attach(struct session *, struct window *, int,
char **);
int session_detach(struct session *, struct winlink *);