diff options
author | Thomas Adam <thomas@xteddy.org> | 2015-08-28 16:01:09 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2015-08-28 16:01:09 +0100 |
commit | 486421ceff1b4d618d84ac3cb8c4dd9135b7960d (patch) | |
tree | 5ff6d44f3a7f1dabd9a40d0fa7a9176190a9e131 /tmux.h | |
parent | 84eabb2658f9ad1bec81344aa425f66a903c931d (diff) | |
parent | b0940bdf5460ec3324254b5df68b5386513641b2 (diff) | |
download | rtmux-486421ceff1b4d618d84ac3cb8c4dd9135b7960d.tar.gz rtmux-486421ceff1b4d618d84ac3cb8c4dd9135b7960d.tar.bz2 rtmux-486421ceff1b4d618d84ac3cb8c4dd9135b7960d.zip |
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.h')
-rw-r--r-- | tmux.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -997,6 +997,8 @@ struct session { struct timeval activity_time; struct timeval last_activity_time; + struct event lock_timer; + u_int sx; u_int sy; @@ -2252,7 +2254,7 @@ struct session *session_create(const char *, int, char **, const char *, void session_destroy(struct session *); void session_unref(struct session *); int session_check_name(const char *); -void session_update_activity(struct session *); +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 **, |