mirror of https://github.com/tmux/tmux.git
Merge branch 'master' into sixel
commit
6da391f460
15
format.c
15
format.c
|
@ -2077,6 +2077,18 @@ format_cb_scroll_region_upper(struct format_tree *ft)
|
||||||
return (NULL);
|
return (NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Callback for server_sessions. */
|
||||||
|
static void *
|
||||||
|
format_cb_server_sessions(__unused struct format_tree *ft)
|
||||||
|
{
|
||||||
|
struct session *s;
|
||||||
|
u_int n = 0;
|
||||||
|
|
||||||
|
RB_FOREACH(s, sessions, &sessions)
|
||||||
|
n++;
|
||||||
|
return (format_printf("%u", n));
|
||||||
|
}
|
||||||
|
|
||||||
/* Callback for session_attached. */
|
/* Callback for session_attached. */
|
||||||
static void *
|
static void *
|
||||||
format_cb_session_attached(struct format_tree *ft)
|
format_cb_session_attached(struct format_tree *ft)
|
||||||
|
@ -2980,6 +2992,9 @@ static const struct format_table_entry format_table[] = {
|
||||||
{ "scroll_region_upper", FORMAT_TABLE_STRING,
|
{ "scroll_region_upper", FORMAT_TABLE_STRING,
|
||||||
format_cb_scroll_region_upper
|
format_cb_scroll_region_upper
|
||||||
},
|
},
|
||||||
|
{ "server_sessions", FORMAT_TABLE_STRING,
|
||||||
|
format_cb_server_sessions
|
||||||
|
},
|
||||||
{ "session_activity", FORMAT_TABLE_TIME,
|
{ "session_activity", FORMAT_TABLE_TIME,
|
||||||
format_cb_session_activity
|
format_cb_session_activity
|
||||||
},
|
},
|
||||||
|
|
2
grid.c
2
grid.c
|
@ -53,7 +53,7 @@ static const struct grid_cell grid_cleared_cell = {
|
||||||
{ { ' ' }, 0, 1, 1 }, 0, GRID_FLAG_CLEARED, 8, 8, 0, 0
|
{ { ' ' }, 0, 1, 1 }, 0, GRID_FLAG_CLEARED, 8, 8, 0, 0
|
||||||
};
|
};
|
||||||
static const struct grid_cell_entry grid_cleared_entry = {
|
static const struct grid_cell_entry grid_cleared_entry = {
|
||||||
GRID_FLAG_CLEARED, { .data = { 0, 8, 8, ' ' } }
|
{ .data = { 0, 8, 8, ' ' } }, GRID_FLAG_CLEARED
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Store cell in entry. */
|
/* Store cell in entry. */
|
||||||
|
|
1
tmux.1
1
tmux.1
|
@ -5278,6 +5278,7 @@ The following variables are available, where appropriate:
|
||||||
.It Li "selection_present" Ta "" Ta "1 if selection started in copy mode"
|
.It Li "selection_present" Ta "" Ta "1 if selection started in copy mode"
|
||||||
.It Li "selection_start_x" Ta "" Ta "X position of the start of the selection"
|
.It Li "selection_start_x" Ta "" Ta "X position of the start of the selection"
|
||||||
.It Li "selection_start_y" Ta "" Ta "Y position of the start of the selection"
|
.It Li "selection_start_y" Ta "" Ta "Y position of the start of the selection"
|
||||||
|
.It Li "server_sessions" Ta "" Ta "Number of sessions"
|
||||||
.It Li "session_activity" Ta "" Ta "Time of session last activity"
|
.It Li "session_activity" Ta "" Ta "Time of session last activity"
|
||||||
.It Li "session_alerts" Ta "" Ta "List of window indexes with alerts"
|
.It Li "session_alerts" Ta "" Ta "List of window indexes with alerts"
|
||||||
.It Li "session_attached" Ta "" Ta "Number of clients session is attached to"
|
.It Li "session_attached" Ta "" Ta "Number of clients session is attached to"
|
||||||
|
|
2
tmux.h
2
tmux.h
|
@ -728,7 +728,6 @@ struct grid_extd_entry {
|
||||||
|
|
||||||
/* Grid cell entry. */
|
/* Grid cell entry. */
|
||||||
struct grid_cell_entry {
|
struct grid_cell_entry {
|
||||||
u_char flags;
|
|
||||||
union {
|
union {
|
||||||
u_int offset;
|
u_int offset;
|
||||||
struct {
|
struct {
|
||||||
|
@ -738,6 +737,7 @@ struct grid_cell_entry {
|
||||||
u_char data;
|
u_char data;
|
||||||
} data;
|
} data;
|
||||||
};
|
};
|
||||||
|
u_char flags;
|
||||||
} __packed;
|
} __packed;
|
||||||
|
|
||||||
/* Grid line. */
|
/* Grid line. */
|
||||||
|
|
Loading…
Reference in New Issue