diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2010-12-22 15:36:44 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2010-12-22 15:36:44 +0000 |
| commit | a373235106d22fdead116d478087d8f8f11c150d (patch) | |
| tree | 2f4aba9efa49f7855e918e095d13f6085f8d4d91 /tmux.h | |
| parent | 9f3399da001580aa8b2118bb38245c7c5f26e944 (diff) | |
| download | rtmux-a373235106d22fdead116d478087d8f8f11c150d.tar.gz rtmux-a373235106d22fdead116d478087d8f8f11c150d.tar.bz2 rtmux-a373235106d22fdead116d478087d8f8f11c150d.zip | |
Sync OpenBSD patchset 806:
Store sessions in an RB tree by name rather than a list, this is tidier
and allows them to easily be shown sorted in various lists
(list-sessions/choose-sessions).
Keep a session index which is used in a couple of places internally but
make it an ever-increasing number rather than filling in gaps with new
sessions.
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.590 2010-12-22 15:31:56 tcunha Exp $ */ +/* $Id: tmux.h,v 1.591 2010-12-22 15:36:44 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -928,6 +928,8 @@ struct session_group { TAILQ_HEAD(session_groups, session_group); struct session { + u_int idx; + char *name; char *cwd; @@ -955,8 +957,10 @@ struct session { int references; TAILQ_ENTRY(session) gentry; + RB_ENTRY(session) entry; }; -ARRAY_DECL(sessions, struct session *); +RB_HEAD(sessions, session); +ARRAY_DECL(sessionslist, struct session *); /* TTY information. */ struct tty_key { @@ -1965,13 +1969,15 @@ void clear_signals(int); extern struct sessions sessions; extern struct sessions dead_sessions; extern struct session_groups session_groups; +int session_cmp(struct session *, struct session *); +RB_PROTOTYPE(sessions, session, entry, session_cmp); int session_alive(struct session *); struct session *session_find(const char *); +struct session *session_find_by_index(u_int); struct session *session_create(const char *, const char *, const char *, struct environ *, struct termios *, int, u_int, u_int, char **); void session_destroy(struct session *); -int session_index(struct session *, u_int *); struct session *session_next_session(struct session *); struct session *session_previous_session(struct session *); struct winlink *session_new(struct session *, |