circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-07 16:28:48 +00:00
Code Issues Projects Releases Wiki Activity

Now that struct winlink has a session pointer, can remove some arguments.

Browse Source
This commit is contained in:
nicm 2017-04-20 09:43:45 +00:00
parent 0f25ad3ca3
commit 21993105e5
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
format.c
View File

@ -71,7 +71,7 @@ static int format_replace(struct format_tree *, const char *, size_t,
static void format_defaults_session(struct format_tree *, static void format_defaults_session(struct format_tree *,
struct session *); struct session *);
static void format_defaults_client(struct format_tree *, struct client *); static void format_defaults_client(struct format_tree *, struct client *);
static void format_defaults_winlink(struct format_tree *, struct session *, static void format_defaults_winlink(struct format_tree *,
struct winlink *); struct winlink *);
/* Entry in format job tree. */ /* Entry in format job tree. */
@ -1121,8 +1121,8 @@ format_defaults(struct format_tree *ft, struct client *c, struct session *s,
format_defaults_client(ft, c); format_defaults_client(ft, c);
if (s != NULL) if (s != NULL)
format_defaults_session(ft, s); format_defaults_session(ft, s);
if (s != NULL && wl != NULL) if (wl != NULL)
format_defaults_winlink(ft, s, wl); format_defaults_winlink(ft, wl);
if (wp != NULL) if (wp != NULL)
format_defaults_pane(ft, wp); format_defaults_pane(ft, wp);
} }
@ -1233,9 +1233,9 @@ format_defaults_window(struct format_tree *ft, struct window *w)
/* Set default format keys for a winlink. */ /* Set default format keys for a winlink. */
static void static void
format_defaults_winlink(struct format_tree *ft, struct session *s, format_defaults_winlink(struct format_tree *ft, struct winlink *wl)
struct winlink *wl)
{ {
struct session *s = wl->session;
struct window *w = wl->window; struct window *w = wl->window;
if (ft->w == NULL) if (ft->w == NULL)
@ -1244,7 +1244,7 @@ format_defaults_winlink(struct format_tree *ft, struct session *s,
format_defaults_window(ft, w); format_defaults_window(ft, w);
format_add(ft, "window_index", "%d", wl->idx); format_add(ft, "window_index", "%d", wl->idx);
format_add(ft, "window_flags", "%s", window_printable_flags(s, wl)); format_add(ft, "window_flags", "%s", window_printable_flags(wl));
format_add(ft, "window_active", "%d", wl == s->curw); format_add(ft, "window_active", "%d", wl == s->curw);
format_add(ft, "window_bell_flag", "%d", format_add(ft, "window_bell_flag", "%d",

2
tmux.h
View File

@ -2120,7 +2120,7 @@ int window_pane_outside(struct window_pane *);
int window_pane_visible(struct window_pane *); int window_pane_visible(struct window_pane *);
char *window_pane_search(struct window_pane *, const char *, char *window_pane_search(struct window_pane *, const char *,
u_int *); u_int *);
const char *window_printable_flags(struct session *, struct winlink *); const char *window_printable_flags(struct winlink *);
struct window_pane *window_pane_find_up(struct window_pane *); struct window_pane *window_pane_find_up(struct window_pane *);
struct window_pane *window_pane_find_down(struct window_pane *); struct window_pane *window_pane_find_down(struct window_pane *);
struct window_pane *window_pane_find_left(struct window_pane *); struct window_pane *window_pane_find_left(struct window_pane *);

8
window.c
View File

@ -709,12 +709,12 @@ window_destroy_panes(struct window *w)
} }
} }
/* Retuns the printable flags on a window, empty string if no flags set. */
const char * const char *
window_printable_flags(struct session *s, struct winlink *wl) window_printable_flags(struct winlink *wl)
{ {
static char flags[32]; struct session *s = wl->session;
int pos; static char flags[32];
int pos;
pos = 0; pos = 0;
if (wl->flags & WINLINK_ACTIVITY) if (wl->flags & WINLINK_ACTIVITY)