circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	format.c
	osdep-openbsd.c
This commit is contained in:
Thomas Adam
2016-10-12 09:45:49 +01:00
parent 27126f8797 5c49e1d0c1
commit b9dc855016
98 changed files with 2110 additions and 2229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
session.c
View File

@ -26,16 +26,20 @@
#include "tmux.h"
struct sessions sessions;
u_int next_session_id;
struct session_groups session_groups;
struct sessions sessions;
static u_int next_session_id;
struct session_groups session_groups;
void session_free(int, short, void *);
static void session_free(int, short, void *);
void session_lock_timer(int, short, void *);
static void session_lock_timer(int, short, void *);
struct winlink *session_next_alert(struct winlink *);
struct winlink *session_previous_alert(struct winlink *);
static struct winlink *session_next_alert(struct winlink *);
static struct winlink *session_previous_alert(struct winlink *);
static void session_group_remove(struct session *);
static u_int session_group_count(struct session_group *);
static void session_group_synchronize1(struct session *, struct session *);
RB_GENERATE(sessions, session, entry, session_cmp);
@ -181,7 +185,7 @@ session_unref(struct session *s)
}
/* Free session. */
void
static void
session_free(__unused int fd, __unused short events, void *arg)
{
struct session *s = arg;
@ -238,7 +242,7 @@ session_check_name(const char *name)
}
/* Lock session if it has timed out. */
void
static void
session_lock_timer(__unused int fd, __unused short events, void *arg)
{
struct session *s = arg;
@ -425,7 +429,7 @@ session_is_linked(struct session *s, struct window *w)
return (w->references != 1);
}
struct winlink *
static struct winlink *
session_next_alert(struct winlink *wl)
{
while (wl != NULL) {
@ -456,7 +460,7 @@ session_next(struct session *s, int alert)
return (session_set_current(s, wl));
}
struct winlink *
static struct winlink *
session_previous_alert(struct winlink *wl)
{
while (wl != NULL) {
@ -581,7 +585,7 @@ session_group_add(struct session *target, struct session *s)
}
/* Remove a session from its group and destroy the group if empty. */
void
static void
session_group_remove(struct session *s)
{
struct session_group *sg;
@ -598,7 +602,7 @@ session_group_remove(struct session *s)
}
/* Count number of sessions in session group. */
u_int
static u_int
session_group_count(struct session_group *sg)
{
struct session *s;
@ -649,7 +653,7 @@ session_group_synchronize_from(struct session *target)
* winlinks then recreating them, then updating the current window, last window
* stack and alerts.
*/
void
static void
session_group_synchronize1(struct session *target, struct session *s)
{
struct winlinks old_windows, *ww;