aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2012-05-22 21:05:30 +0000
committerTiago Cunha <tcunha@gmx.com>2012-05-22 21:05:30 +0000
commit17da2f7d5f16a20e70539248db9803ba3ac17350 (patch)
tree513cbc6fab671bf91d02a678160a34ccedae2dc2 /tmux.h
parentfff7c0b2768523f6732e8d3fa409c431aadd7bfc (diff)
downloadrtmux-17da2f7d5f16a20e70539248db9803ba3ac17350.tar.gz
rtmux-17da2f7d5f16a20e70539248db9803ba3ac17350.tar.bz2
rtmux-17da2f7d5f16a20e70539248db9803ba3ac17350.zip
Sync OpenBSD patchset 1121:
Store client in tty struct directly instead of using a callback function pointer.
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/tmux.h b/tmux.h
index b44f97e1..76c30330 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1096,6 +1096,8 @@ struct tty_term {
LIST_HEAD(tty_terms, tty_term);
struct tty {
+ struct client *client;
+
char *path;
u_int xterm_version;
@@ -1134,9 +1136,8 @@ struct tty {
int term_flags;
- struct mouse_event mouse_event;
- void (*key_callback)(int, struct mouse_event *, void *);
- void *key_data;
+ struct mouse_event mouse;
+
struct event key_timer;
struct tty_key *key_tree;
};
@@ -1529,7 +1530,7 @@ void tty_putcode_ptr2(struct tty *, enum tty_code_code, const void *, const void
void tty_puts(struct tty *, const char *);
void tty_putc(struct tty *, u_char);
void tty_pututf8(struct tty *, const struct grid_utf8 *);
-void tty_init(struct tty *, int, char *);
+void tty_init(struct tty *, struct client *, int, char *);
int tty_resize(struct tty *);
int tty_set_size(struct tty *, u_int, u_int);
void tty_start_tty(struct tty *);
@@ -1760,6 +1761,7 @@ void server_update_socket(void);
void server_add_accept(int);
/* server-client.c */
+void server_client_handle_key(struct client *, int);
void server_client_create(int);
int server_client_open(struct client *, struct session *, char **);
void server_client_lost(struct client *);