circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-05 02:18:47 +00:00
Code Issues Projects Releases Wiki Activity
572a6b21b5
tmux/format.c

3102 lines
72 KiB
C
Raw Normal View History

No need for $Id$ now.
2014-11-08 12:27:43 +00:00
/* $OpenBSD$ */
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
/*
I no longer use my SourceForge address so replace it.
2016-01-19 15:59:12 +00:00
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/types.h>
Add pane_dead_status for exit status of dead panes.
2014-12-09 19:23:35 +00:00
#include <sys/wait.h>
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Allow any punctuation (except :) as separator in s/x/y/, not only /. From JINNOUCHI Yasushi in GitHub issue 1386.
2018-06-27 17:36:10 +00:00
#include <ctype.h>
Add length limit operator for formats.
2013-08-03 20:06:38 +00:00
#include <errno.h>
Add m: for fnmatch(3) format matching.
2017-05-29 15:43:48 +00:00
#include <fnmatch.h>
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
#include <libgen.h>
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
#include <math.h>
Add regular expression support for the format search, match and substitute modifiers.
2019-06-13 19:46:00 +00:00
#include <regex.h>
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
#include <stdarg.h>
Sync OpenBSD patchset 1150: xfree is not particularly helpful, remove it. From Thomas Adam.
2012-07-11 19:34:16 +00:00
#include <stdlib.h>
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
#include <string.h>
#include <time.h>
#include <unistd.h>
#include "tmux.h"
/*
* Build a list of key-value pairs and use them to expand #{key} entries in a
* string.
*/
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
struct format_expand_state;
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
static char *format_job_get(struct format_expand_state *, const char *);
static void format_job_timer(int, short, void *);
static char *format_expand1(struct format_expand_state *, const char *);
static int format_replace(struct format_expand_state *, const char *,
size_t, char **, size_t *, size_t *);
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static void format_defaults_session(struct format_tree *,
struct session *);
static void format_defaults_client(struct format_tree *, struct client *);
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
static void format_defaults_winlink(struct format_tree *,
struct winlink *);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
/* Entry in format job tree. */
struct format_job {
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
struct client *client;
Add a window or pane id "tag" to each format tree and use it to separate jobs, this means that if the same job is used for different windows or panes (for example in pane-border-format), it will be run separately for each pane.
2017-02-03 11:57:27 +00:00
u_int tag;
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
const char *cmd;
Key running commands for #() by the unexpanded command, and run them again if the expanded form changes (otherwise at most once per second as usual). Fixes issues reported by Gregory Pakosz.
2016-11-17 10:06:08 +00:00
const char *expanded;
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
time_t last;
char *out;
If a #() command doesn't exit, use its most recent line of output (it must be a full line). Don't let it redraw the status line more than once a second. Requested by someone about 10 years ago...
2017-04-20 09:20:22 +00:00
int updated;
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
struct job *job;
int status;
RB_ENTRY(format_job) entry;
};
/* Format job tree. */
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static struct event format_job_event;
static int format_job_cmp(struct format_job *, struct format_job *);
Some other stuff that can be local to one file.
2016-10-11 13:45:47 +00:00
static RB_HEAD(format_job_tree, format_job) format_jobs = RB_INITIALIZER();
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
RB_GENERATE_STATIC(format_job_tree, format_job, entry, format_job_cmp);
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
/* Format job tree comparison function. */
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static int
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
format_job_cmp(struct format_job *fj1, struct format_job *fj2)
{
Add a window or pane id "tag" to each format tree and use it to separate jobs, this means that if the same job is used for different windows or panes (for example in pane-border-format), it will be run separately for each pane.
2017-02-03 11:57:27 +00:00
if (fj1->tag < fj2->tag)
return (-1);
if (fj1->tag > fj2->tag)
return (1);
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
return (strcmp(fj1->cmd, fj2->cmd));
}
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
/* Format modifiers. */
#define FORMAT_TIMESTRING 0x1
#define FORMAT_BASENAME 0x2
#define FORMAT_DIRNAME 0x4
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
#define FORMAT_QUOTE 0x8
#define FORMAT_LITERAL 0x10
Add E: format to expand a format twice (useful to expand the value of an option).
2019-03-13 14:19:54 +00:00
#define FORMAT_EXPAND 0x20
Add T format modifier like E but also do strftime(3).
2019-03-14 21:31:43 +00:00
#define FORMAT_EXPANDTIME 0x40
#define FORMAT_SESSIONS 0x80
#define FORMAT_WINDOWS 0x100
#define FORMAT_PANES 0x200
Tweak the default choose modes formats: - Only show pane title if it is not default and not empty. - Add a prettier time format and use that instead of long ctime(). - Remove clutter and change the order.
2020-04-23 05:30:15 +00:00
#define FORMAT_PRETTY 0x400
Add n: modifier to get length of a format, also automatically expand variable name arguments again if they contain a #{.
2020-08-20 16:57:40 +00:00
#define FORMAT_LENGTH 0x800
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
Add a limit on how far format_expand can recurse.
2019-03-14 23:34:41 +00:00
/* Limit on recursion. */
#define FORMAT_LOOP_LIMIT 10
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
/* Format expand flags. */
#define FORMAT_EXPAND_TIME 0x1
#define FORMAT_EXPAND_NOJOBS 0x2
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
/* Entry in format tree. */
struct format_entry {
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
char *key;
char *value;
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
time_t time;
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
format_cb cb;
RB_ENTRY(format_entry) entry;
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
};
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
/* Format entry tree. */
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
struct format_tree {
Add formats for when window is larger than client, and show offset in status-right by default when larger.
2018-09-26 17:41:18 +00:00
struct client *c;
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
struct session *s;
Add formats for when window is larger than client, and show offset in status-right by default when larger.
2018-09-26 17:41:18 +00:00
struct winlink *wl;
struct window *w;
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
struct window_pane *wp;
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
struct cmdq_item *item;
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
struct client *client;
Make refresh-client force update of jobs, from Sina Siadat.
2015-09-14 10:25:52 +00:00
int flags;
Allow a custom time format to be given to the t format modifier.
2020-05-07 10:04:43 +00:00
u_int tag;
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
struct mouse_event m;
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
RB_HEAD(format_entry_tree, format_entry) tree;
};
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static int format_entry_cmp(struct format_entry *, struct format_entry *);
RB_GENERATE_STATIC(format_entry_tree, format_entry, entry, format_entry_cmp);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
/* Format expand state. */
struct format_expand_state {
struct format_tree *ft;
u_int loop;
time_t time;
int flags;
};
The pane and window loops need to pass the window and pane tags when they build their format.
2019-03-15 10:07:24 +00:00
/* Format modifier. */
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
struct format_modifier {
char modifier[3];
u_int size;
char **argv;
int argc;
};
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
/* Format entry tree comparison function. */
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static int
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
format_entry_cmp(struct format_entry *fe1, struct format_entry *fe2)
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
{
return (strcmp(fe1->key, fe2->key));
}
Add host_short format, from Tiago Cunha.
2013-05-31 19:46:42 +00:00
/* Single-character uppercase aliases. */
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static const char *format_upper[] = {
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
NULL, /* A */
NULL, /* B */
NULL, /* C */
"pane_id", /* D */
NULL, /* E */
"window_flags", /* F */
NULL, /* G */
"host", /* H */
"window_index", /* I */
NULL, /* J */
NULL, /* K */
NULL, /* L */
NULL, /* M */
NULL, /* N */
NULL, /* O */
"pane_index", /* P */
NULL, /* Q */
NULL, /* R */
"session_name", /* S */
"pane_title", /* T */
NULL, /* U */
NULL, /* V */
"window_name", /* W */
NULL, /* X */
NULL, /* Y */
NULL /* Z */
};
Add host_short format, from Tiago Cunha.
2013-05-31 19:46:42 +00:00
/* Single-character lowercase aliases. */
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static const char *format_lower[] = {
Add host_short format, from Tiago Cunha.
2013-05-31 19:46:42 +00:00
NULL, /* a */
NULL, /* b */
NULL, /* c */
NULL, /* d */
NULL, /* e */
NULL, /* f */
NULL, /* g */
"host_short", /* h */
NULL, /* i */
NULL, /* j */
NULL, /* k */
NULL, /* l */
NULL, /* m */
NULL, /* n */
NULL, /* o */
NULL, /* p */
NULL, /* q */
NULL, /* r */
NULL, /* s */
NULL, /* t */
NULL, /* u */
NULL, /* v */
NULL, /* w */
NULL, /* x */
NULL, /* y */
NULL /* z */
};
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
/* Is logging enabled? */
static inline int
format_logging(struct format_tree *ft)
{
return (log_get_level() != 0 || (ft->flags & FORMAT_VERBOSE));
}
/* Log a message if verbose. */
static void printflike(3, 4)
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log1(struct format_expand_state *es, const char *from, const char *fmt,
...)
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
{
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
struct format_tree *ft = es->ft;
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
va_list ap;
char *s;
static const char spaces[] = " ";
if (!format_logging(ft))
return;
va_start(ap, fmt);
Use xvasprintf not vasprintf.
2020-06-23 05:23:26 +00:00
xvasprintf(&s, fmt, ap);
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
va_end(ap);
log_debug("%s: %s", from, s);
Only print format logging when the flag is set, even if also sending to log_debug.
2019-03-15 10:22:57 +00:00
if (ft->item != NULL && (ft->flags & FORMAT_VERBOSE))
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
cmdq_print(ft->item, "#%.*s%s", es->loop, spaces, s);
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
free(s);
}
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
#define format_log(es, fmt, ...) format_log1(es, __func__, fmt, ##__VA_ARGS__)
/* Copy expand state. */
static void
format_copy_state(struct format_expand_state *to,
struct format_expand_state *from, int flags)
{
to->ft = from->ft;
to->loop = from->loop;
to->time = from->time;
Fix a last minute change in previous.
2020-10-06 07:36:42 +00:00
to->flags = from->flags|flags;
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
}
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
If a #() command doesn't exit, use its most recent line of output (it must be a full line). Don't let it redraw the status line more than once a second. Requested by someone about 10 years ago...
2017-04-20 09:20:22 +00:00
/* Format job update callback. */
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static void
If a #() command doesn't exit, use its most recent line of output (it must be a full line). Don't let it redraw the status line more than once a second. Requested by someone about 10 years ago...
2017-04-20 09:20:22 +00:00
format_job_update(struct job *job)
{
Move job struct into job.c.
2018-08-23 15:45:05 +00:00
struct format_job *fj = job_get_data(job);
struct evbuffer *evb = job_get_event(job)->input;
Discard all but the last line when reading from a #() command - the callback is just going to be fired again straight away to go through all the lines, it is better just to use the last one straight away.
2018-01-18 14:28:11 +00:00
char *line = NULL, *next;
If a #() command doesn't exit, use its most recent line of output (it must be a full line). Don't let it redraw the status line more than once a second. Requested by someone about 10 years ago...
2017-04-20 09:20:22 +00:00
time_t t;
Discard all but the last line when reading from a #() command - the callback is just going to be fired again straight away to go through all the lines, it is better just to use the last one straight away.
2018-01-18 14:28:11 +00:00
while ((next = evbuffer_readline(evb)) != NULL) {
free(line);
line = next;
}
if (line == NULL)
If a #() command doesn't exit, use its most recent line of output (it must be a full line). Don't let it redraw the status line more than once a second. Requested by someone about 10 years ago...
2017-04-20 09:20:22 +00:00
return;
fj->updated = 1;
free(fj->out);
fj->out = line;
Only redraw single client, and tweak some logging.
2017-05-12 13:27:57 +00:00
log_debug("%s: %p %s: %s", __func__, fj, fj->cmd, fj->out);
If a #() command doesn't exit, use its most recent line of output (it must be a full line). Don't let it redraw the status line more than once a second. Requested by someone about 10 years ago...
2017-04-20 09:20:22 +00:00
Style and spacing nits.
2017-05-31 17:56:48 +00:00
t = time(NULL);
If a #() command doesn't exit, use its most recent line of output (it must be a full line). Don't let it redraw the status line more than once a second. Requested by someone about 10 years ago...
2017-04-20 09:20:22 +00:00
if (fj->status && fj->last != t) {
Only redraw single client, and tweak some logging.
2017-05-12 13:27:57 +00:00
if (fj->client != NULL)
server_status_client(fj->client);
If a #() command doesn't exit, use its most recent line of output (it must be a full line). Don't let it redraw the status line more than once a second. Requested by someone about 10 years ago...
2017-04-20 09:20:22 +00:00
fj->last = t;
}
}
/* Format job complete callback. */
static void
format_job_complete(struct job *job)
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
{
Move job struct into job.c.
2018-08-23 15:45:05 +00:00
struct format_job *fj = job_get_data(job);
struct evbuffer *evb = job_get_event(job)->input;
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
char *line, *buf;
size_t len;
fj->job = NULL;
buf = NULL;
Move job struct into job.c.
2018-08-23 15:45:05 +00:00
if ((line = evbuffer_readline(evb)) == NULL) {
len = EVBUFFER_LENGTH(evb);
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
buf = xmalloc(len + 1);
if (len != 0)
Move job struct into job.c.
2018-08-23 15:45:05 +00:00
memcpy(buf, EVBUFFER_DATA(evb), len);
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
buf[len] = '\0';
} else
buf = line;
If a #() command doesn't exit, use its most recent line of output (it must be a full line). Don't let it redraw the status line more than once a second. Requested by someone about 10 years ago...
2017-04-20 09:20:22 +00:00
Only redraw single client, and tweak some logging.
2017-05-12 13:27:57 +00:00
log_debug("%s: %p %s: %s", __func__, fj, fj->cmd, buf);
If a #() command doesn't exit, use its most recent line of output (it must be a full line). Don't let it redraw the status line more than once a second. Requested by someone about 10 years ago...
2017-04-20 09:20:22 +00:00
if (*buf != '\0' || !fj->updated) {
free(fj->out);
fj->out = buf;
} else
free(buf);
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
if (fj->status) {
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
if (fj->client != NULL)
server_status_client(fj->client);
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
fj->status = 0;
}
}
/* Find a job. */
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static char *
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_job_get(struct format_expand_state *es, const char *cmd)
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
{
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
struct format_tree *ft = es->ft;
struct format_job_tree *jobs;
struct format_job fj0, *fj;
time_t t;
char *expanded;
int force;
struct format_expand_state next;
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
if (ft->client == NULL)
jobs = &format_jobs;
else if (ft->client->jobs != NULL)
jobs = ft->client->jobs;
else {
jobs = ft->client->jobs = xmalloc(sizeof *ft->client->jobs);
RB_INIT(jobs);
}
Add a window or pane id "tag" to each format tree and use it to separate jobs, this means that if the same job is used for different windows or panes (for example in pane-border-format), it will be run separately for each pane.
2017-02-03 11:57:27 +00:00
fj0.tag = ft->tag;
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
fj0.cmd = cmd;
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
if ((fj = RB_FIND(format_job_tree, jobs, &fj0)) == NULL) {
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
fj = xcalloc(1, sizeof *fj);
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
fj->client = ft->client;
Add a window or pane id "tag" to each format tree and use it to separate jobs, this means that if the same job is used for different windows or panes (for example in pane-border-format), it will be run separately for each pane.
2017-02-03 11:57:27 +00:00
fj->tag = ft->tag;
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
fj->cmd = xstrdup(cmd);
Key running commands for #() by the unexpanded command, and run them again if the expanded form changes (otherwise at most once per second as usual). Fixes issues reported by Gregory Pakosz.
2016-11-17 10:06:08 +00:00
fj->expanded = NULL;
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
xasprintf(&fj->out, "<'%s' not ready>", fj->cmd);
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
RB_INSERT(format_job_tree, jobs, fj);
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
}
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
expanded = format_expand1(es, cmd);
Key running commands for #() by the unexpanded command, and run them again if the expanded form changes (otherwise at most once per second as usual). Fixes issues reported by Gregory Pakosz.
2016-11-17 10:06:08 +00:00
if (fj->expanded == NULL || strcmp(expanded, fj->expanded) != 0) {
free((void *)fj->expanded);
fj->expanded = xstrdup(expanded);
force = 1;
} else
force = (ft->flags & FORMAT_FORCE);
Make refresh-client force update of jobs, from Sina Siadat.
2015-09-14 10:25:52 +00:00
t = time(NULL);
With force, kill previous job before starting new. Fixes problem reported by Scott Mcdermott in GitHub issue 1627.
2019-03-18 09:46:42 +00:00
if (force && fj->job != NULL)
job_free(fj->job);
if (force || (fj->job == NULL && fj->last != t)) {
Use same working directory rules for jobs as new windows rather than always starting in home, GitHub issue 1488.
2018-09-27 07:43:18 +00:00
fj->job = job_run(expanded, NULL,
server_client_get_cwd(ft->client, NULL), format_job_update,
Add a flag to run a background process in a pty as well, not used for anything yet.
2020-03-19 13:43:18 +00:00
format_job_complete, NULL, fj, JOB_NOWAIT, -1, -1);
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
if (fj->job == NULL) {
free(fj->out);
xasprintf(&fj->out, "<'%s' didn't start>", fj->cmd);
}
Make refresh-client force update of jobs, from Sina Siadat.
2015-09-14 10:25:52 +00:00
fj->last = t;
Remove an unused variable.
2017-05-12 22:43:15 +00:00
fj->updated = 0;
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
}
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
free(expanded);
Make refresh-client force update of jobs, from Sina Siadat.
2015-09-14 10:25:52 +00:00
if (ft->flags & FORMAT_STATUS)
fj->status = 1;
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_copy_state(&next, es, FORMAT_EXPAND_NOJOBS);
return (format_expand1(&next, fj->out));
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
}
/* Remove old jobs. */
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static void
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
format_job_tidy(struct format_job_tree *jobs, int force)
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
{
struct format_job *fj, *fj1;
time_t now;
now = time(NULL);
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
RB_FOREACH_SAFE(fj, format_job_tree, jobs, fj1) {
if (!force && (fj->last > now || now - fj->last < 3600))
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
continue;
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
RB_REMOVE(format_job_tree, jobs, fj);
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
Move format job cleanup onto its own timer.
2015-08-28 11:38:27 +00:00
log_debug("%s: %s", __func__, fj->cmd);
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
if (fj->job != NULL)
job_free(fj->job);
Key running commands for #() by the unexpanded command, and run them again if the expanded form changes (otherwise at most once per second as usual). Fixes issues reported by Gregory Pakosz.
2016-11-17 10:06:08 +00:00
free((void *)fj->expanded);
Run status update on a per-client timer at status-interval.
2015-08-28 12:16:28 +00:00
free((void *)fj->cmd);
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
free(fj->out);
free(fj);
}
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
}
/* Remove old jobs for client. */
void
format_lost_client(struct client *c)
{
if (c->jobs != NULL)
format_job_tidy(c->jobs, 1);
free(c->jobs);
}
/* Remove old jobs periodically. */
static void
format_job_timer(__unused int fd, __unused short events, __unused void *arg)
{
struct client *c;
struct timeval tv = { .tv_sec = 60 };
format_job_tidy(&format_jobs, 0);
TAILQ_FOREACH(c, &clients, entry) {
if (c->jobs != NULL)
format_job_tidy(c->jobs, 0);
}
Move format job cleanup onto its own timer.
2015-08-28 11:38:27 +00:00
evtimer_del(&format_job_event);
evtimer_add(&format_job_event, &tv);
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
}
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
/* Callback for host. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_host(__unused struct format_tree *ft)
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
{
char host[HOST_NAME_MAX + 1];
if (gethostname(host, sizeof host) != 0)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (xstrdup(""));
return (xstrdup(host));
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
}
/* Callback for host_short. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_host_short(__unused struct format_tree *ft)
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
{
char host[HOST_NAME_MAX + 1], *cp;
if (gethostname(host, sizeof host) != 0)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (xstrdup(""));
if ((cp = strchr(host, '.')) != NULL)
*cp = '\0';
return (xstrdup(host));
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
}
/* Callback for pid. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_pid(__unused struct format_tree *ft)
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
{
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value;
xasprintf(&value, "%ld", (long)getpid());
return (value);
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
}
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
/* Callback for session_attached_list. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_session_attached_list(struct format_tree *ft)
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
{
struct session *s = ft->s;
struct client *loop;
struct evbuffer *buffer;
int size;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value = NULL;
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
if (s == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
buffer = evbuffer_new();
if (buffer == NULL)
fatalx("out of memory");
TAILQ_FOREACH(loop, &clients, entry) {
if (loop->session == s) {
if (EVBUFFER_LENGTH(buffer) > 0)
evbuffer_add(buffer, ",", 1);
evbuffer_add_printf(buffer, "%s", loop->name);
}
}
if ((size = EVBUFFER_LENGTH(buffer)) != 0)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%.*s", size, EVBUFFER_DATA(buffer));
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
evbuffer_free(buffer);
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (value);
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
}
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
/* Callback for session_alerts. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_session_alerts(struct format_tree *ft)
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
{
struct session *s = ft->s;
struct winlink *wl;
Add some formats to look at the session window stack, suggested by Scott ROCHFORD.
2017-05-05 11:59:47 +00:00
char alerts[1024], tmp[16];
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
if (s == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
*alerts = '\0';
RB_FOREACH(wl, winlinks, &s->windows) {
if ((wl->flags & WINLINK_ALERTFLAGS) == 0)
continue;
xsnprintf(tmp, sizeof tmp, "%u", wl->idx);
if (*alerts != '\0')
strlcat(alerts, ",", sizeof alerts);
strlcat(alerts, tmp, sizeof alerts);
if (wl->flags & WINLINK_ACTIVITY)
strlcat(alerts, "#", sizeof alerts);
if (wl->flags & WINLINK_BELL)
strlcat(alerts, "!", sizeof alerts);
if (wl->flags & WINLINK_SILENCE)
strlcat(alerts, "~", sizeof alerts);
}
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (xstrdup(alerts));
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
}
Add some formats to look at the session window stack, suggested by Scott ROCHFORD.
2017-05-05 11:59:47 +00:00
/* Callback for session_stack. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_session_stack(struct format_tree *ft)
Add some formats to look at the session window stack, suggested by Scott ROCHFORD.
2017-05-05 11:59:47 +00:00
{
struct session *s = ft->s;
struct winlink *wl;
char result[1024], tmp[16];
if (s == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Add some formats to look at the session window stack, suggested by Scott ROCHFORD.
2017-05-05 11:59:47 +00:00
xsnprintf(result, sizeof result, "%u", s->curw->idx);
TAILQ_FOREACH(wl, &s->lastw, sentry) {
xsnprintf(tmp, sizeof tmp, "%u", wl->idx);
if (*result != '\0')
strlcat(result, ",", sizeof result);
strlcat(result, tmp, sizeof result);
}
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (xstrdup(result));
Add some formats to look at the session window stack, suggested by Scott ROCHFORD.
2017-05-05 11:59:47 +00:00
}
/* Callback for window_stack_index. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_window_stack_index(struct format_tree *ft)
Add some formats to look at the session window stack, suggested by Scott ROCHFORD.
2017-05-05 11:59:47 +00:00
{
struct session *s = ft->wl->session;
struct winlink *wl;
u_int idx;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value = NULL;
Add some formats to look at the session window stack, suggested by Scott ROCHFORD.
2017-05-05 11:59:47 +00:00
idx = 0;
TAILQ_FOREACH(wl, &s->lastw, sentry) {
idx++;
if (wl == ft->wl)
break;
}
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
if (wl == NULL)
return (xstrdup("0"));
xasprintf(&value, "%u", idx);
return (value);
Add some formats to look at the session window stack, suggested by Scott ROCHFORD.
2017-05-05 11:59:47 +00:00
}
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
/* Callback for window_linked_sessions_list. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_window_linked_sessions_list(struct format_tree *ft)
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
{
struct window *w = ft->wl->window;
struct winlink *wl;
struct evbuffer *buffer;
int size;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value = NULL;
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
buffer = evbuffer_new();
if (buffer == NULL)
fatalx("out of memory");
TAILQ_FOREACH(wl, &w->winlinks, wentry) {
if (EVBUFFER_LENGTH(buffer) > 0)
evbuffer_add(buffer, ",", 1);
evbuffer_add_printf(buffer, "%s", wl->session->name);
}
if ((size = EVBUFFER_LENGTH(buffer)) != 0)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%.*s", size, EVBUFFER_DATA(buffer));
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
evbuffer_free(buffer);
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (value);
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
}
/* Callback for window_active_sessions. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_window_active_sessions(struct format_tree *ft)
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
{
struct window *w = ft->wl->window;
struct winlink *wl;
u_int n = 0;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value;
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
TAILQ_FOREACH(wl, &w->winlinks, wentry) {
if (wl->session->curw == wl)
n++;
}
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%u", n);
return (value);
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
}
/* Callback for window_active_sessions_list. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_window_active_sessions_list(struct format_tree *ft)
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
{
struct window *w = ft->wl->window;
struct winlink *wl;
struct evbuffer *buffer;
int size;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value = NULL;
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
buffer = evbuffer_new();
if (buffer == NULL)
fatalx("out of memory");
TAILQ_FOREACH(wl, &w->winlinks, wentry) {
if (wl->session->curw == wl) {
if (EVBUFFER_LENGTH(buffer) > 0)
evbuffer_add(buffer, ",", 1);
evbuffer_add_printf(buffer, "%s", wl->session->name);
}
}
if ((size = EVBUFFER_LENGTH(buffer)) != 0)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%.*s", size, EVBUFFER_DATA(buffer));
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
evbuffer_free(buffer);
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (value);
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
}
/* Callback for window_active_clients. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_window_active_clients(struct format_tree *ft)
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
{
struct window *w = ft->wl->window;
struct client *loop;
struct session *client_session;
u_int n = 0;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value;
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
TAILQ_FOREACH(loop, &clients, entry) {
client_session = loop->session;
if (client_session == NULL)
continue;
if (w == client_session->curw->window)
n++;
}
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%u", n);
return (value);
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
}
/* Callback for window_active_clients_list. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_window_active_clients_list(struct format_tree *ft)
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
{
struct window *w = ft->wl->window;
struct client *loop;
struct session *client_session;
struct evbuffer *buffer;
int size;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value = NULL;
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
buffer = evbuffer_new();
if (buffer == NULL)
fatalx("out of memory");
TAILQ_FOREACH(loop, &clients, entry) {
client_session = loop->session;
if (client_session == NULL)
continue;
if (w == client_session->curw->window) {
if (EVBUFFER_LENGTH(buffer) > 0)
evbuffer_add(buffer, ",", 1);
evbuffer_add_printf(buffer, "%s", loop->name);
}
}
if ((size = EVBUFFER_LENGTH(buffer)) != 0)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%.*s", size, EVBUFFER_DATA(buffer));
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
evbuffer_free(buffer);
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (value);
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
}
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
/* Callback for window_layout. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_window_layout(struct format_tree *ft)
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
{
struct window *w = ft->w;
if (w == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
if (w->saved_layout_root != NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (layout_dump(w->saved_layout_root));
return (layout_dump(w->layout_root));
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
}
Add window_visible_layout which ignores zoomed panes and use it for control mode (which needs to know all panes), from George Nachman.
2015-11-13 10:00:26 +00:00
/* Callback for window_visible_layout. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_window_visible_layout(struct format_tree *ft)
Add window_visible_layout which ignores zoomed panes and use it for control mode (which needs to know all panes), from George Nachman.
2015-11-13 10:00:26 +00:00
{
struct window *w = ft->w;
if (w == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Add window_visible_layout which ignores zoomed panes and use it for control mode (which needs to know all panes), from George Nachman.
2015-11-13 10:00:26 +00:00
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (layout_dump(w->layout_root));
Add window_visible_layout which ignores zoomed panes and use it for control mode (which needs to know all panes), from George Nachman.
2015-11-13 10:00:26 +00:00
}
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
/* Callback for pane_start_command. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_start_command(struct format_tree *ft)
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
{
struct window_pane *wp = ft->wp;
if (wp == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (cmd_stringify_argv(wp->argc, wp->argv));
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
}
/* Callback for pane_current_command. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_current_command(struct format_tree *ft)
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
{
struct window_pane *wp = ft->wp;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *cmd, *value;
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
Do not crash with pane_current_command if the pane is newly created and has no shell set, from Thomas Adam.
2019-10-14 09:24:06 +00:00
if (wp == NULL || wp->shell == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
Linux: get_proc_name() -> osdep_get_name()
2015-08-30 20:47:50 +00:00
cmd = osdep_get_name(wp->fd, wp->tty);
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
if (cmd == NULL || *cmd == '\0') {
free(cmd);
cmd = cmd_stringify_argv(wp->argc, wp->argv);
if (cmd == NULL || *cmd == '\0') {
free(cmd);
cmd = xstrdup(wp->shell);
}
}
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
value = parse_window_name(cmd);
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
free(cmd);
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (value);
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
}
Bring back pane_current_path.
2015-08-31 18:57:37 +00:00
/* Callback for pane_current_path. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_current_path(struct format_tree *ft)
Bring back pane_current_path.
2015-08-31 18:57:37 +00:00
{
struct window_pane *wp = ft->wp;
char *cwd;
if (wp == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Bring back pane_current_path.
2015-08-31 18:57:37 +00:00
cwd = osdep_get_cwd(wp->fd);
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
if (cwd == NULL)
return (NULL);
return (xstrdup(cwd));
Bring back pane_current_path.
2015-08-31 18:57:37 +00:00
}
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
/* Callback for history_bytes. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_history_bytes(struct format_tree *ft)
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
{
struct window_pane *wp = ft->wp;
struct grid *gd;
struct grid_line *gl;
Make some data types consistent.
2020-05-25 15:02:25 +00:00
size_t size = 0;
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
u_int i;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value;
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
if (wp == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
gd = wp->base.grid;
Make some data types consistent.
2020-05-25 15:02:25 +00:00
for (i = 0; i < gd->hsize + gd->sy; i++) {
Add accessors for grid linedata member, for some future work. From Dan Aloni.
2018-07-04 09:44:07 +00:00
gl = grid_get_line(gd, i);
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
size += gl->cellsize * sizeof *gl->celldata;
Long overdue change to the way we store cells in the grid: now, instead of storing a full grid_cell with UTF-8 data and everything, store a new type grid_cell_entry. This can either be the cell itself (for ASCII cells), or an offset into an extended array (per line) for UTF-8 data. This avoid a large (8 byte) overhead on non-UTF-8 cells (by far the majority for most users) without the complexity of the shadow array we had before. Grid memory without any UTF-8 is about half. The disadvantage that cells can no longer be modified in place and need to be copied out of the grid and back but it turned out to be lot less complicated than I expected.
2015-11-13 08:09:28 +00:00
size += gl->extdsize * sizeof *gl->extddata;
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
}
Make some data types consistent.
2020-05-25 15:02:25 +00:00
size += (gd->hsize + gd->sy) * sizeof *gl;
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%zu", size);
return (value);
Make some data types consistent.
2020-05-25 15:02:25 +00:00
}
/* Callback for history_all_bytes. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_history_all_bytes(struct format_tree *ft)
Make some data types consistent.
2020-05-25 15:02:25 +00:00
{
struct window_pane *wp = ft->wp;
struct grid *gd;
struct grid_line *gl;
u_int i, lines, cells = 0, extended_cells = 0;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value;
Make some data types consistent.
2020-05-25 15:02:25 +00:00
if (wp == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Make some data types consistent.
2020-05-25 15:02:25 +00:00
gd = wp->base.grid;
lines = gd->hsize + gd->sy;
for (i = 0; i < lines; i++) {
gl = grid_get_line(gd, i);
cells += gl->cellsize;
extended_cells += gl->extdsize;
}
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%u,%zu,%u,%zu,%u,%zu", lines,
Make some data types consistent.
2020-05-25 15:02:25 +00:00
lines * sizeof *gl, cells, cells * sizeof *gl->celldata,
extended_cells, extended_cells * sizeof *gl->extddata);
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (value);
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
}
/* Callback for pane_tabs. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_pane_tabs(struct format_tree *ft)
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
{
struct window_pane *wp = ft->wp;
struct evbuffer *buffer;
u_int i;
int size;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value = NULL;
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
if (wp == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
buffer = evbuffer_new();
evbuffer_new and bufferevent_new can both fail (when malloc fails) and return NULL. GitHub issue 1547.
2018-11-19 13:35:40 +00:00
if (buffer == NULL)
fatalx("out of memory");
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
for (i = 0; i < wp->base.grid->sx; i++) {
if (!bit_test(wp->base.tabs, i))
continue;
if (EVBUFFER_LENGTH(buffer) > 0)
evbuffer_add(buffer, ",", 1);
evbuffer_add_printf(buffer, "%u", i);
}
Only show the first member of session groups in tree mode (-G flag disables).
2017-11-02 18:27:35 +00:00
if ((size = EVBUFFER_LENGTH(buffer)) != 0)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%.*s", size, EVBUFFER_DATA(buffer));
Only show the first member of session groups in tree mode (-G flag disables).
2017-11-02 18:27:35 +00:00
evbuffer_free(buffer);
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (value);
Only show the first member of session groups in tree mode (-G flag disables).
2017-11-02 18:27:35 +00:00
}
Format for group list of "other sessions" is a bit weird, just list all the sessions in the group.
2017-11-02 18:52:05 +00:00
/* Callback for session_group_list. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_session_group_list(struct format_tree *ft)
Only show the first member of session groups in tree mode (-G flag disables).
2017-11-02 18:27:35 +00:00
{
struct session *s = ft->s;
struct session_group *sg;
struct session *loop;
struct evbuffer *buffer;
int size;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value = NULL;
Only show the first member of session groups in tree mode (-G flag disables).
2017-11-02 18:27:35 +00:00
if (s == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Only show the first member of session groups in tree mode (-G flag disables).
2017-11-02 18:27:35 +00:00
sg = session_group_contains(s);
if (sg == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Only show the first member of session groups in tree mode (-G flag disables).
2017-11-02 18:27:35 +00:00
buffer = evbuffer_new();
evbuffer_new and bufferevent_new can both fail (when malloc fails) and return NULL. GitHub issue 1547.
2018-11-19 13:35:40 +00:00
if (buffer == NULL)
fatalx("out of memory");
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
Only show the first member of session groups in tree mode (-G flag disables).
2017-11-02 18:27:35 +00:00
TAILQ_FOREACH(loop, &sg->sessions, gentry) {
if (EVBUFFER_LENGTH(buffer) > 0)
evbuffer_add(buffer, ",", 1);
evbuffer_add_printf(buffer, "%s", loop->name);
}
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
if ((size = EVBUFFER_LENGTH(buffer)) != 0)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%.*s", size, EVBUFFER_DATA(buffer));
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
evbuffer_free(buffer);
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (value);
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
}
/* Callback for session_group_attached_list. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_session_group_attached_list(struct format_tree *ft)
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
{
struct session *s = ft->s, *client_session, *session_loop;
struct session_group *sg;
struct client *loop;
struct evbuffer *buffer;
int size;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value = NULL;
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
if (s == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
sg = session_group_contains(s);
if (sg == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
buffer = evbuffer_new();
if (buffer == NULL)
fatalx("out of memory");
TAILQ_FOREACH(loop, &clients, entry) {
client_session = loop->session;
if (client_session == NULL)
continue;
TAILQ_FOREACH(session_loop, &sg->sessions, gentry) {
if (session_loop == client_session){
if (EVBUFFER_LENGTH(buffer) > 0)
evbuffer_add(buffer, ",", 1);
evbuffer_add_printf(buffer, "%s", loop->name);
}
}
}
Only show the first member of session groups in tree mode (-G flag disables).
2017-11-02 18:27:35 +00:00
if ((size = EVBUFFER_LENGTH(buffer)) != 0)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%.*s", size, EVBUFFER_DATA(buffer));
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
evbuffer_free(buffer);
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (value);
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
}
Allow multiple modes to be open in a pane. A stack of open modes is kept and the previous restored when the top is exited. If a mode that is already on the stack is entered, the existing instance is moved to the top as the active mode rather than being opened new.
2019-03-12 11:16:49 +00:00
/* Callback for pane_in_mode. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_pane_in_mode(struct format_tree *ft)
Allow multiple modes to be open in a pane. A stack of open modes is kept and the previous restored when the top is exited. If a mode that is already on the stack is entered, the existing instance is moved to the top as the active mode rather than being opened new.
2019-03-12 11:16:49 +00:00
{
struct window_pane *wp = ft->wp;
u_int n = 0;
struct window_mode_entry *wme;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value;
Allow multiple modes to be open in a pane. A stack of open modes is kept and the previous restored when the top is exited. If a mode that is already on the stack is entered, the existing instance is moved to the top as the active mode rather than being opened new.
2019-03-12 11:16:49 +00:00
if (wp == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Allow multiple modes to be open in a pane. A stack of open modes is kept and the previous restored when the top is exited. If a mode that is already on the stack is entered, the existing instance is moved to the top as the active mode rather than being opened new.
2019-03-12 11:16:49 +00:00
TAILQ_FOREACH(wme, &wp->modes, entry)
n++;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%u", n);
return (value);
Allow multiple modes to be open in a pane. A stack of open modes is kept and the previous restored when the top is exited. If a mode that is already on the stack is entered, the existing instance is moved to the top as the active mode rather than being opened new.
2019-03-12 11:16:49 +00:00
}
Fix top/bottom pane calculation with pane border status enabled, reported by Stanislav Spassov.
2020-02-14 13:57:58 +00:00
/* Callback for pane_at_top. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_pane_at_top(struct format_tree *ft)
Fix top/bottom pane calculation with pane border status enabled, reported by Stanislav Spassov.
2020-02-14 13:57:58 +00:00
{
struct window_pane *wp = ft->wp;
Some more, and use of wp->window before wp NULL check in format.c.
2020-04-09 13:53:50 +00:00
struct window *w;
Fix top/bottom pane calculation with pane border status enabled, reported by Stanislav Spassov.
2020-02-14 13:57:58 +00:00
int status, flag;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value;
Fix top/bottom pane calculation with pane border status enabled, reported by Stanislav Spassov.
2020-02-14 13:57:58 +00:00
if (wp == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Some more, and use of wp->window before wp NULL check in format.c.
2020-04-09 13:53:50 +00:00
w = wp->window;
Fix top/bottom pane calculation with pane border status enabled, reported by Stanislav Spassov.
2020-02-14 13:57:58 +00:00
status = options_get_number(w->options, "pane-border-status");
if (status == PANE_STATUS_TOP)
flag = (wp->yoff == 1);
else
flag = (wp->yoff == 0);
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%d", flag);
return (value);
Fix top/bottom pane calculation with pane border status enabled, reported by Stanislav Spassov.
2020-02-14 13:57:58 +00:00
}
/* Callback for pane_at_bottom. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_pane_at_bottom(struct format_tree *ft)
Fix top/bottom pane calculation with pane border status enabled, reported by Stanislav Spassov.
2020-02-14 13:57:58 +00:00
{
struct window_pane *wp = ft->wp;
Some more, and use of wp->window before wp NULL check in format.c.
2020-04-09 13:53:50 +00:00
struct window *w;
Fix top/bottom pane calculation with pane border status enabled, reported by Stanislav Spassov.
2020-02-14 13:57:58 +00:00
int status, flag;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value;
Fix top/bottom pane calculation with pane border status enabled, reported by Stanislav Spassov.
2020-02-14 13:57:58 +00:00
if (wp == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Some more, and use of wp->window before wp NULL check in format.c.
2020-04-09 13:53:50 +00:00
w = wp->window;
Fix top/bottom pane calculation with pane border status enabled, reported by Stanislav Spassov.
2020-02-14 13:57:58 +00:00
status = options_get_number(w->options, "pane-border-status");
if (status == PANE_STATUS_BOTTOM)
flag = (wp->yoff + wp->sy == w->sy - 1);
else
flag = (wp->yoff + wp->sy == w->sy);
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%d", flag);
return (value);
Fix top/bottom pane calculation with pane border status enabled, reported by Stanislav Spassov.
2020-02-14 13:57:58 +00:00
}
Add a cursor_character format.
2019-03-19 19:01:50 +00:00
/* Callback for cursor_character. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_cursor_character(struct format_tree *ft)
Add a cursor_character format.
2019-03-19 19:01:50 +00:00
{
struct window_pane *wp = ft->wp;
struct grid_cell gc;
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
char *value = NULL;
Add a cursor_character format.
2019-03-19 19:01:50 +00:00
if (wp == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Add a cursor_character format.
2019-03-19 19:01:50 +00:00
grid_view_get_cell(wp->base.grid, wp->base.cx, wp->base.cy, &gc);
if (~gc.flags & GRID_FLAG_PADDING)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
xasprintf(&value, "%.*s", (int)gc.data.size, gc.data.data);
return (value);
Add a cursor_character format.
2019-03-19 19:01:50 +00:00
}
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
/* Return word at given coordinates. Caller frees. */
char *
format_grid_word(struct grid *gd, u_int x, u_int y)
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
{
Use size_t not u_int for the bytes counters and fix a const missing.
2020-04-18 14:21:39 +00:00
const struct grid_line *gl;
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
struct grid_cell gc;
const char *ws;
struct utf8_data *ud = NULL;
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
u_int end;
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
size_t size = 0;
int found = 0;
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
char *s = NULL;
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
ws = options_get_string(global_s_options, "word-separators");
for (;;) {
grid_get_cell(gd, x, y, &gc);
if (gc.flags & GRID_FLAG_PADDING)
break;
if (utf8_cstrhas(ws, &gc.data)) {
found = 1;
break;
}
if (x == 0) {
if (y == 0)
break;
Use peek line function instead of hoking in the array directly.
2020-04-18 09:00:31 +00:00
gl = grid_peek_line(gd, y - 1);
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
if (~gl->flags & GRID_LINE_WRAPPED)
break;
y--;
x = grid_line_length(gd, y);
if (x == 0)
break;
}
x--;
}
for (;;) {
if (found) {
end = grid_line_length(gd, y);
if (end == 0 || x == end - 1) {
if (y == gd->hsize + gd->sy - 1)
break;
Use peek line function instead of hoking in the array directly.
2020-04-18 09:00:31 +00:00
gl = grid_peek_line(gd, y);
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
if (~gl->flags & GRID_LINE_WRAPPED)
break;
y++;
x = 0;
} else
x++;
}
found = 1;
grid_get_cell(gd, x, y, &gc);
if (gc.flags & GRID_FLAG_PADDING)
break;
if (utf8_cstrhas(ws, &gc.data))
break;
ud = xreallocarray(ud, size + 2, sizeof *ud);
memcpy(&ud[size++], &gc.data, sizeof *ud);
}
if (size != 0) {
ud[size].size = 0;
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
s = utf8_tocstr(ud);
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
free(ud);
}
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
return (s);
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
}
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
/* Callback for mouse_word. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_mouse_word(struct format_tree *ft)
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
{
struct window_pane *wp;
Make the mouse_word and mouse_line formats work in copy mode and enable the default pane menu in copy mode.
2020-03-20 17:59:39 +00:00
struct grid *gd;
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
u_int x, y;
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
char *s;
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
if (!ft->m.valid)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
wp = cmd_mouse_pane(&ft->m, NULL, NULL);
if (wp == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
if (cmd_mouse_at(wp, &ft->m, &x, &y, 0) != 0)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
Make the mouse_word and mouse_line formats work in copy mode and enable the default pane menu in copy mode.
2020-03-20 17:59:39 +00:00
if (!TAILQ_EMPTY(&wp->modes)) {
Apply same menu items to view mode like copy mode.
2020-03-20 18:35:53 +00:00
if (TAILQ_FIRST(&wp->modes)->mode == &window_copy_mode ||
TAILQ_FIRST(&wp->modes)->mode == &window_view_mode)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (s = window_copy_get_word(wp, x, y));
return (NULL);
Make the mouse_word and mouse_line formats work in copy mode and enable the default pane menu in copy mode.
2020-03-20 17:59:39 +00:00
}
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
gd = wp->base.grid;
return (format_grid_word(gd, x, gd->hsize + y));
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
}
/* Return line at given coordinates. Caller frees. */
char *
format_grid_line(struct grid *gd, u_int y)
{
struct grid_cell gc;
struct utf8_data *ud = NULL;
u_int x;
size_t size = 0;
char *s = NULL;
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
for (x = 0; x < grid_line_length(gd, y); x++) {
grid_get_cell(gd, x, y, &gc);
if (gc.flags & GRID_FLAG_PADDING)
break;
ud = xreallocarray(ud, size + 2, sizeof *ud);
memcpy(&ud[size++], &gc.data, sizeof *ud);
}
if (size != 0) {
ud[size].size = 0;
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
s = utf8_tocstr(ud);
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
free(ud);
}
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
return (s);
}
/* Callback for mouse_line. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
static char *
format_cb_mouse_line(struct format_tree *ft)
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
{
struct window_pane *wp;
Make the mouse_word and mouse_line formats work in copy mode and enable the default pane menu in copy mode.
2020-03-20 17:59:39 +00:00
struct grid *gd;
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
u_int x, y;
if (!ft->m.valid)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
wp = cmd_mouse_pane(&ft->m, NULL, NULL);
if (wp == NULL)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
if (cmd_mouse_at(wp, &ft->m, &x, &y, 0) != 0)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (NULL);
Use the existing code in format.c to add foramts for word and line at cursor position in copy mode, from Anindya Mukherjee.
2019-10-23 07:42:05 +00:00
Make the mouse_word and mouse_line formats work in copy mode and enable the default pane menu in copy mode.
2020-03-20 17:59:39 +00:00
if (!TAILQ_EMPTY(&wp->modes)) {
Apply same menu items to view mode like copy mode.
2020-03-20 18:35:53 +00:00
if (TAILQ_FIRST(&wp->modes)->mode == &window_copy_mode ||
TAILQ_FIRST(&wp->modes)->mode == &window_view_mode)
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
return (window_copy_get_line(wp, y));
return (NULL);
Make the mouse_word and mouse_line formats work in copy mode and enable the default pane menu in copy mode.
2020-03-20 17:59:39 +00:00
}
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
gd = wp->base.grid;
return (format_grid_line(gd, gd->hsize + y));
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
}
Also move cmdq_item and cmdq_list into cmd-queue.c (this is to make its use more clearly defined and preparation for some future work).
2020-04-13 10:59:58 +00:00
/* Merge one format tree into another. */
void
Provide a way for hooks to tag formats onto the commands they fire so that the user can get at additional information - now used for the "hook" format, more to come.
2016-10-16 19:36:37 +00:00
format_merge(struct format_tree *ft, struct format_tree *from)
{
struct format_entry *fe;
RB_FOREACH(fe, format_entry_tree, &from->tree) {
if (fe->value != NULL)
format_add(ft, fe->key, "%s", fe->value);
}
}
Add some formats for search in copy mode (search_present, search_match). GitHub issue 2268.
2020-06-11 19:43:34 +00:00
/* Get format pane. */
struct window_pane *
format_get_pane(struct format_tree *ft)
{
return (ft->wp);
}
Add a way to append or prepend to a format if the length has been limited.
2019-05-26 12:02:42 +00:00
/* Add item bits to tree. */
static void
format_create_add_item(struct format_tree *ft, struct cmdq_item *item)
{
Move cmdq_state into cmd-queue.c.
2020-04-13 14:46:04 +00:00
struct key_event *event = cmdq_get_event(item);
struct mouse_event *m = &event->m;
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
struct window_pane *wp;
u_int x, y;
Also move cmdq_item and cmdq_list into cmd-queue.c (this is to make its use more clearly defined and preparation for some future work).
2020-04-13 10:59:58 +00:00
cmdq_merge_formats(item, ft);
Add formats for word and line under the mouse and use them to add some items to the pane menu.
2019-05-26 17:34:45 +00:00
if (m->valid && ((wp = cmd_mouse_pane(m, NULL, NULL)) != NULL)) {
format_add(ft, "mouse_pane", "%%%u", wp->id);
if (cmd_mouse_at(wp, m, &x, &y, 0) == 0) {
format_add(ft, "mouse_x", "%u", x);
format_add(ft, "mouse_y", "%u", y);
format_add_cb(ft, "mouse_word", format_cb_mouse_word);
format_add_cb(ft, "mouse_line", format_cb_mouse_line);
}
}
memcpy(&ft->m, m, sizeof ft->m);
Add a way to append or prepend to a format if the length has been limited.
2019-05-26 12:02:42 +00:00
}
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
/* Create a new tree. */
struct format_tree *
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
format_create(struct client *c, struct cmdq_item *item, int tag, int flags)
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
{
Add format variables for the default formats for the various modes (tree_mode_format and so on) and add a -a flag to display-message to list variables with values.
2019-03-18 14:10:25 +00:00
struct format_tree *ft;
const struct window_mode **wm;
char tmp[64];
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Move format job cleanup onto its own timer.
2015-08-28 11:38:27 +00:00
if (!event_initialized(&format_job_event)) {
evtimer_set(&format_job_event, format_job_timer, NULL);
format_job_timer(-1, 0, NULL);
}
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
ft = xcalloc(1, sizeof *ft);
RB_INIT(&ft->tree);
Add a window or pane id "tag" to each format tree and use it to separate jobs, this means that if the same job is used for different windows or panes (for example in pane-border-format), it will be run separately for each pane.
2017-02-03 11:57:27 +00:00
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
if (c != NULL) {
ft->client = c;
ft->client->references++;
}
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
ft->item = item;
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
Add a window or pane id "tag" to each format tree and use it to separate jobs, this means that if the same job is used for different windows or panes (for example in pane-border-format), it will be run separately for each pane.
2017-02-03 11:57:27 +00:00
ft->tag = tag;
Make refresh-client force update of jobs, from Sina Siadat.
2015-09-14 10:25:52 +00:00
ft->flags = flags;
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Reduce a difference with portable tmux by adding the -V flag and #{version} format; on OpenBSD these just report the OpenBSD version.
2020-01-28 10:44:30 +00:00
format_add(ft, "version", "%s", getversion());
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
format_add_cb(ft, "host", format_cb_host);
format_add_cb(ft, "host_short", format_cb_host_short);
format_add_cb(ft, "pid", format_cb_pid);
Remove the -I part of show-messages which isn't really that useful; the server start time can now be accessed with a new start_time format (use: tmux display -p '#{t:start_time}')
2015-11-24 21:52:06 +00:00
format_add(ft, "socket_path", "%s", socket_path);
format_add_tv(ft, "start_time", &start_time);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Add format variables for the default formats for the various modes (tree_mode_format and so on) and add a -a flag to display-message to list variables with values.
2019-03-18 14:10:25 +00:00
for (wm = all_window_modes; *wm != NULL; wm++) {
if ((*wm)->default_format != NULL) {
xsnprintf(tmp, sizeof tmp, "%s_format", (*wm)->name);
tmp[strcspn(tmp, "-")] = '_';
format_add(ft, tmp, "%s", (*wm)->default_format);
}
}
Add a way to append or prepend to a format if the length has been limited.
2019-05-26 12:02:42 +00:00
if (item != NULL)
format_create_add_item(ft, item);
Add cmdq as an argument to format_create and add a format for the command name (will also be used for more later).
2015-12-11 12:27:36 +00:00
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
return (ft);
}
/* Free a tree. */
void
format_free(struct format_tree *ft)
{
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
struct format_entry *fe, *fe1;
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
RB_FOREACH_SAFE(fe, format_entry_tree, &ft->tree, fe1) {
RB_REMOVE(format_entry_tree, &ft->tree, fe);
Sync OpenBSD patchset 1150: xfree is not particularly helpful, remove it. From Thomas Adam.
2012-07-11 19:34:16 +00:00
free(fe->value);
free(fe->key);
free(fe);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
}
In order that people can use formats like #D in #() in the status line and not have to wait for an update when they change pane, we allow commands to run more than once a second if the expanded form changes. Unfortunately this can mean them being run far too often (pretty much continually) when multiple clients exist, because some formats (including #D) will always differ between clients. To avoid this, give each client its own tree of jobs which means that the same command will be different instances for each client - similar to how we have the tag to separate commands for different panes. GitHub issue 889; test case reported by Paul Johnson.
2017-05-01 12:20:55 +00:00
if (ft->client != NULL)
server_client_unref(ft->client);
Add host_short format, from Tiago Cunha.
2013-05-31 19:46:42 +00:00
free(ft);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
}
Add format variables for the default formats for the various modes (tree_mode_format and so on) and add a -a flag to display-message to list variables with values.
2019-03-18 14:10:25 +00:00
/* Walk each format. */
void
format_each(struct format_tree *ft, void (*cb)(const char *, const char *,
void *), void *arg)
{
struct format_entry *fe;
Pass correct value into iterator callback for time formats.
2019-12-26 14:48:29 +00:00
char s[64];
Add format variables for the default formats for the various modes (tree_mode_format and so on) and add a -a flag to display-message to list variables with values.
2019-03-18 14:10:25 +00:00
RB_FOREACH(fe, format_entry_tree, &ft->tree) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
if (fe->time != 0) {
xsnprintf(s, sizeof s, "%lld", (long long)fe->time);
Pass correct value into iterator callback for time formats.
2019-12-26 14:48:29 +00:00
cb(fe->key, s, arg);
Add format variables for the default formats for the various modes (tree_mode_format and so on) and add a -a flag to display-message to list variables with values.
2019-03-18 14:10:25 +00:00
} else {
if (fe->value == NULL && fe->cb != NULL) {
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
fe->value = fe->cb(ft);
Add format variables for the default formats for the various modes (tree_mode_format and so on) and add a -a flag to display-message to list variables with values.
2019-03-18 14:10:25 +00:00
if (fe->value == NULL)
fe->value = xstrdup("");
}
cb(fe->key, fe->value, arg);
}
}
}
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
/* Add a key-value pair. */
void
format_add(struct format_tree *ft, const char *key, const char *fmt, ...)
{
struct format_entry *fe;
Don't leak formats if they are added multiple times.
2013-08-01 22:40:44 +00:00
struct format_entry *fe_now;
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
va_list ap;
fe = xmalloc(sizeof *fe);
fe->key = xstrdup(key);
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
fe_now = RB_INSERT(format_entry_tree, &ft->tree, fe);
if (fe_now != NULL) {
free(fe->key);
free(fe);
free(fe_now->value);
fe = fe_now;
}
fe->cb = NULL;
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
fe->time = 0;
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
va_start(ap, fmt);
xvasprintf(&fe->value, fmt, ap);
va_end(ap);
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
}
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
/* Add a key and time. */
Change message log to be per server rather than per client and include every command that is run.
2020-05-06 12:43:22 +00:00
void
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
format_add_tv(struct format_tree *ft, const char *key, struct timeval *tv)
{
Pass correct value into iterator callback for time formats.
2019-12-26 14:48:29 +00:00
struct format_entry *fe, *fe_now;
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
fe = xmalloc(sizeof *fe);
fe->key = xstrdup(key);
fe_now = RB_INSERT(format_entry_tree, &ft->tree, fe);
if (fe_now != NULL) {
free(fe->key);
free(fe);
free(fe_now->value);
fe = fe_now;
}
fe->cb = NULL;
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
fe->time = tv->tv_sec;
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
fe->value = NULL;
}
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
/* Add a key and function. */
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
void
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
format_add_cb(struct format_tree *ft, const char *key, format_cb cb)
{
struct format_entry *fe;
struct format_entry *fe_now;
fe = xmalloc(sizeof *fe);
fe->key = xstrdup(key);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
fe_now = RB_INSERT(format_entry_tree, &ft->tree, fe);
Don't leak formats if they are added multiple times.
2013-08-01 22:40:44 +00:00
if (fe_now != NULL) {
free(fe->key);
free(fe);
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
free(fe_now->value);
fe = fe_now;
Don't leak formats if they are added multiple times.
2013-08-01 22:40:44 +00:00
}
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
fe->cb = cb;
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
fe->time = 0;
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
fe->value = NULL;
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
}
Add q: format prefix to escape sh(1) special characters. Suggested by someone ages ago and then more recently in GitHub issue 1449.
2018-08-26 09:28:42 +00:00
/* Quote special characters in string. */
static char *
format_quote(const char *s)
{
const char *cp;
char *out, *at;
at = out = xmalloc(strlen(s) * 2 + 1);
for (cp = s; *cp != '\0'; cp++) {
if (strchr("|&;<>()$`\\\"'*?[# =%", *cp) != NULL)
*at++ = '\\';
*at++ = *cp;
}
*at = '\0';
return (out);
}
Tweak the default choose modes formats: - Only show pane title if it is not default and not empty. - Add a prettier time format and use that instead of long ctime(). - Remove clutter and change the order.
2020-04-23 05:30:15 +00:00
/* Make a prettier time. */
static char *
format_pretty_time(time_t t)
{
struct tm now_tm, tm;
Fix pretty time function to actually work and allow time format to be applied to any string that is suitable.
2020-05-07 08:55:06 +00:00
time_t now, age;
Tweak the default choose modes formats: - Only show pane title if it is not default and not empty. - Add a prettier time format and use that instead of long ctime(). - Remove clutter and change the order.
2020-04-23 05:30:15 +00:00
char s[6];
time(&now);
if (now < t)
now = t;
Fix pretty time function to actually work and allow time format to be applied to any string that is suitable.
2020-05-07 08:55:06 +00:00
age = now - t;
Tweak the default choose modes formats: - Only show pane title if it is not default and not empty. - Add a prettier time format and use that instead of long ctime(). - Remove clutter and change the order.
2020-04-23 05:30:15 +00:00
localtime_r(&now, &now_tm);
localtime_r(&t, &tm);
Fix pretty time function to actually work and allow time format to be applied to any string that is suitable.
2020-05-07 08:55:06 +00:00
/* Last 24 hours. */
if (age < 24 * 3600) {
strftime(s, sizeof s, "%H:%M", &tm);
return (xstrdup(s));
}
/* This month or last 28 days. */
if ((tm.tm_year == now_tm.tm_year && tm.tm_mon == now_tm.tm_mon) ||
age < 28 * 24 * 3600) {
strftime(s, sizeof s, "%a%d", &tm);
Tweak the default choose modes formats: - Only show pane title if it is not default and not empty. - Add a prettier time format and use that instead of long ctime(). - Remove clutter and change the order.
2020-04-23 05:30:15 +00:00
return (xstrdup(s));
}
Fix pretty time function to actually work and allow time format to be applied to any string that is suitable.
2020-05-07 08:55:06 +00:00
/* Last 12 months. */
if ((tm.tm_year == now_tm.tm_year && tm.tm_mon < now_tm.tm_mon) ||
(tm.tm_year == now_tm.tm_year - 1 && tm.tm_mon > now_tm.tm_mon)) {
Tweak the default choose modes formats: - Only show pane title if it is not default and not empty. - Add a prettier time format and use that instead of long ctime(). - Remove clutter and change the order.
2020-04-23 05:30:15 +00:00
strftime(s, sizeof s, "%d%b", &tm);
return (xstrdup(s));
}
Fix pretty time function to actually work and allow time format to be applied to any string that is suitable.
2020-05-07 08:55:06 +00:00
/* Older than that. */
strftime(s, sizeof s, "%h%y", &tm);
Tweak the default choose modes formats: - Only show pane title if it is not default and not empty. - Add a prettier time format and use that instead of long ctime(). - Remove clutter and change the order.
2020-04-23 05:30:15 +00:00
return (xstrdup(s));
}
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
/* Find a format entry. */
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static char *
Allow a custom time format to be given to the t format modifier.
2020-05-07 10:04:43 +00:00
format_find(struct format_tree *ft, const char *key, int modifiers,
const char *time_format)
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
{
struct format_entry *fe, fe_find;
Allow environment variables in #{}.
2015-08-28 10:06:52 +00:00
struct environ_entry *envent;
getopt() has a struct option so just return to using options_entry.
2017-01-16 14:49:14 +00:00
struct options_entry *o;
Major tidy up and rework of options tree and set-option/show-options commands this pushes more of the code into options.c and ties it more closely to the options table rather than having an unnecessary split. Also add support for array options (will be used later). Only (intentional) user visible change is that show-options output is now passed through vis(3) with VIS_DQ so quotes are escaped.
2017-01-15 20:48:41 +00:00
int idx;
Allow a custom time format to be given to the t format modifier.
2020-05-07 10:04:43 +00:00
char *found = NULL, *saved, s[512];
Fix pretty time function to actually work and allow time format to be applied to any string that is suitable.
2020-05-07 08:55:06 +00:00
const char *errstr;
time_t t = 0;
Allow a custom time format to be given to the t format modifier.
2020-05-07 10:04:43 +00:00
struct tm tm;
Fix pretty time function to actually work and allow time format to be applied to any string that is suitable.
2020-05-07 08:55:06 +00:00
o = options_parse_get(global_options, key, &idx, 0);
if (o == NULL && ft->wp != NULL)
o = options_parse_get(ft->wp->options, key, &idx, 0);
if (o == NULL && ft->w != NULL)
o = options_parse_get(ft->w->options, key, &idx, 0);
if (o == NULL)
o = options_parse_get(global_w_options, key, &idx, 0);
if (o == NULL && ft->s != NULL)
o = options_parse_get(ft->s->options, key, &idx, 0);
if (o == NULL)
o = options_parse_get(global_s_options, key, &idx, 0);
if (o != NULL) {
Add a customize mode where options may be browsed and changed, includes adding a brief description of each option. Bound to "C" by default.
2020-05-08 18:10:09 +00:00
found = options_to_string(o, idx, 1);
Fix pretty time function to actually work and allow time format to be applied to any string that is suitable.
2020-05-07 08:55:06 +00:00
goto found;
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
}
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Fix pretty time function to actually work and allow time format to be applied to any string that is suitable.
2020-05-07 08:55:06 +00:00
fe_find.key = (char *)key;
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
fe = RB_FIND(format_entry_tree, &ft->tree, &fe_find);
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
if (fe != NULL) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
if (fe->time != 0) {
t = fe->time;
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
goto found;
}
Change format callback to return value rather than storing it in the entry.
2020-06-01 19:39:25 +00:00
if (fe->value == NULL && fe->cb != NULL) {
fe->value = fe->cb(ft);
if (fe->value == NULL)
fe->value = xstrdup("");
}
Make options_tostring allocate its result instead of using a stack buffer (needed for something in the future).
2019-04-25 18:18:55 +00:00
found = xstrdup(fe->value);
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
goto found;
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
}
Allow environment variables in #{}.
2015-08-28 10:06:52 +00:00
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
if (~modifiers & FORMAT_TIMESTRING) {
envent = NULL;
if (ft->s != NULL)
Like options, move the environ struct into environ.c.
2015-10-28 09:51:55 +00:00
envent = environ_find(ft->s->environ, key);
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
if (envent == NULL)
Like options, move the environ struct into environ.c.
2015-10-28 09:51:55 +00:00
envent = environ_find(global_environ, key);
Do not crash if the environment variable is present but empty.
2019-06-13 21:24:09 +00:00
if (envent != NULL && envent->value != NULL) {
Make options_tostring allocate its result instead of using a stack buffer (needed for something in the future).
2019-04-25 18:18:55 +00:00
found = xstrdup(envent->value);
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
goto found;
}
}
Allow environment variables in #{}.
2015-08-28 10:06:52 +00:00
return (NULL);
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
found:
Fix pretty time function to actually work and allow time format to be applied to any string that is suitable.
2020-05-07 08:55:06 +00:00
if (modifiers & FORMAT_TIMESTRING) {
if (t == 0 && found != NULL) {
t = strtonum(found, 0, INT64_MAX, &errstr);
if (errstr != NULL)
t = 0;
free(found);
}
if (t == 0)
return (NULL);
if (modifiers & FORMAT_PRETTY)
found = format_pretty_time(t);
else {
Allow a custom time format to be given to the t format modifier.
2020-05-07 10:04:43 +00:00
if (time_format != NULL) {
localtime_r(&t, &tm);
strftime(s, sizeof s, time_format, &tm);
} else {
ctime_r(&t, s);
s[strcspn(s, "\n")] = '\0';
}
Fix pretty time function to actually work and allow time format to be applied to any string that is suitable.
2020-05-07 08:55:06 +00:00
found = xstrdup(s);
}
return (found);
}
if (t != 0)
xasprintf(&found, "%lld", (long long)t);
else if (found == NULL)
The format callback may not always succeed, so we need to check for NULL. From Patrick Palka.
2015-10-27 09:18:06 +00:00
return (NULL);
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
if (modifiers & FORMAT_BASENAME) {
Make options_tostring allocate its result instead of using a stack buffer (needed for something in the future).
2019-04-25 18:18:55 +00:00
saved = found;
found = xstrdup(basename(saved));
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
free(saved);
}
if (modifiers & FORMAT_DIRNAME) {
Make options_tostring allocate its result instead of using a stack buffer (needed for something in the future).
2019-04-25 18:18:55 +00:00
saved = found;
found = xstrdup(dirname(saved));
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
free(saved);
}
Add q: format prefix to escape sh(1) special characters. Suggested by someone ages ago and then more recently in GitHub issue 1449.
2018-08-26 09:28:42 +00:00
if (modifiers & FORMAT_QUOTE) {
Make options_tostring allocate its result instead of using a stack buffer (needed for something in the future).
2019-04-25 18:18:55 +00:00
saved = found;
found = xstrdup(format_quote(saved));
Add q: format prefix to escape sh(1) special characters. Suggested by someone ages ago and then more recently in GitHub issue 1449.
2018-08-26 09:28:42 +00:00
free(saved);
}
Make options_tostring allocate its result instead of using a stack buffer (needed for something in the future).
2019-04-25 18:18:55 +00:00
return (found);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
}
Allow a custom time format to be given to the t format modifier.
2020-05-07 10:04:43 +00:00
/* Remove escaped characters from string. */
static char *
format_strip(const char *s)
{
char *out, *cp;
int brackets = 0;
cp = out = xmalloc(strlen(s) + 1);
for (; *s != '\0'; s++) {
if (*s == '#' && s[1] == '{')
brackets++;
if (*s == '#' && strchr(",#{}:", s[1]) != NULL) {
if (brackets != 0)
*cp++ = *s;
continue;
}
if (*s == '}')
brackets--;
*cp++ = *s;
}
*cp = '\0';
return (out);
}
Allow escaping , and } with # in #{}; GitHub issue 1332.
2018-05-22 08:49:12 +00:00
/* Skip until end. */
Extend the #[] style syntax and use that together with previous format changes to allow the status line to be entirely configured with a single option. Now that it is possible to configure their content, enable the existing code that lets the status line be multiple lines in height. The status option can now take a value of 2, 3, 4 or 5 (as well as the previous on or off) to configure more than one line. The new status-format array option configures the format of each line, the default just references the existing status-* options, although some of the more obscure status options may be eliminated in time. Additions to the #[] syntax are: "align" to specify alignment (left, centre, right), "list" for the window list and "range" to configure ranges of text for the mouse bindings. The "align" keyword can also be used to specify alignment of entries in tree mode and the pane status lines.
2019-03-18 20:53:33 +00:00
const char *
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
format_skip(const char *s, const char *end)
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
{
int brackets = 0;
for (; *s != '\0'; s++) {
Allow escaping , and } with # in #{}; GitHub issue 1332.
2018-05-22 08:49:12 +00:00
if (*s == '#' && s[1] == '{')
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
brackets++;
Allow a custom time format to be given to the t format modifier.
2020-05-07 10:04:43 +00:00
if (*s == '#' && strchr(",#{}:", s[1]) != NULL) {
Allow escaping , and } with # in #{}; GitHub issue 1332.
2018-05-22 08:49:12 +00:00
s++;
continue;
}
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
if (*s == '}')
brackets--;
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
if (strchr(end, *s) != NULL && brackets == 0)
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
break;
}
if (*s == '\0')
return (NULL);
return (s);
}
/* Return left and right alternatives separated by commas. */
static int
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_choose(struct format_expand_state *es, const char *s, char **left,
char **right, int expand)
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
{
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
const char *cp;
char *left0, *right0;
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
cp = format_skip(s, ",");
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
if (cp == NULL)
return (-1);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
left0 = xstrndup(s, cp - s);
right0 = xstrdup(cp + 1);
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
if (expand) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
*left = format_expand1(es, left0);
Free old strings after they have been expanded in format_choose.
2019-03-29 09:33:24 +00:00
free(left0);
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
*right = format_expand1(es, right0);
Free old strings after they have been expanded in format_choose.
2019-03-29 09:33:24 +00:00
free(right0);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
} else {
*left = left0;
*right = right0;
}
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
return (0);
}
/* Is this true? */
Rewrite of choose mode, both to simplify and tidy the code and to add some modern features. Now the common code is in mode-tree.c, which provides an API used by the three modes now separated into window-{buffer,client,tree}.c. Buffer mode shows buffers, client mode clients and tree mode a tree of sessions, windows and panes. Each mode has a common set of key bindings plus a few that are specific to the mode. Other changes are: - each mode has a preview pane: for buffers this is the buffer content (very useful), for others it is a preview of the pane; - items may be sorted in different ways ('O' key); - multiple items may be tagged and an operation applied to all of them (for example, to delete multiple buffers at once); - in tree mode a command may be run on the selected item (session, window, pane) or on tagged items (key ':'); - displayed items may be filtered in tree mode by using a format (this is used to implement find-window) (key 'f'); - the custom format (-F) for the display is no longer available; - shortcut keys change from 0-9, a-z, A-Z which was always a bit weird with keys used for other uses to 0-9, M-a to M-z. Now that the code is simpler, other improvements will come later. Primary key bindings for each mode are documented under the commands in the man page (choose-buffer, choose-client, choose-tree). Parts written by Thomas Adam.
2017-05-30 21:44:59 +00:00
int
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
format_true(const char *s)
{
if (s != NULL && *s != '\0' && (s[0] != '0' || s[1] != '\0'))
return (1);
return (0);
}
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
/* Check if modifier end. */
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static int
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
format_is_end(char c)
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
{
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
return (c == ';' || c == ':');
}
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
/* Add to modifier list. */
static void
format_add_modifier(struct format_modifier **list, u_int *count,
const char *c, size_t n, char **argv, int argc)
{
struct format_modifier *fm;
*list = xreallocarray(*list, (*count) + 1, sizeof **list);
fm = &(*list)[(*count)++];
memcpy(fm->modifier, c, n);
fm->modifier[n] = '\0';
fm->size = n;
fm->argv = argv;
fm->argc = argc;
}
/* Free modifier list. */
static void
format_free_modifiers(struct format_modifier *list, u_int count)
{
u_int i;
for (i = 0; i < count; i++)
cmd_free_argv(list[i].argc, list[i].argv);
free(list);
}
/* Build modifier list. */
static struct format_modifier *
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_build_modifiers(struct format_expand_state *es, const char **s,
u_int *count)
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
{
const char *cp = *s, *end;
struct format_modifier *list = NULL;
char c, last[] = "X;:", **argv, *value;
int argc;
/*
* Modifiers are a ; separated list of the forms:
Add n: modifier to get length of a format, also automatically expand variable name arguments again if they contain a #{.
2020-08-20 16:57:40 +00:00
* l,m,C,b,d,n,t,q,E,T,S,W,P,<,>
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
* =a
* =/a
* =/a/
* s/a/b/
* s/a/b
Add <, >, <=, >= for formats, GitHub issue 1747.
2019-05-25 16:51:10 +00:00
* ||,&&,!=,==,<=,>=
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
*/
*count = 0;
while (*cp != '\0' && *cp != ':') {
Allow a custom time format to be given to the t format modifier.
2020-05-07 10:04:43 +00:00
/* Skip any separator character. */
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
if (*cp == ';')
cp++;
/* Check single character modifiers with no arguments. */
Add n: modifier to get length of a format, also automatically expand variable name arguments again if they contain a #{.
2020-08-20 16:57:40 +00:00
if (strchr("lbdnqETSWP<>", cp[0]) != NULL &&
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
format_is_end(cp[1])) {
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
format_add_modifier(&list, count, cp, 1, NULL, 0);
cp++;
continue;
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
}
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
/* Then try double character with no arguments. */
if ((memcmp("||", cp, 2) == 0 ||
memcmp("&&", cp, 2) == 0 ||
memcmp("!=", cp, 2) == 0 ||
Add <, >, <=, >= for formats, GitHub issue 1747.
2019-05-25 16:51:10 +00:00
memcmp("==", cp, 2) == 0 ||
memcmp("<=", cp, 2) == 0 ||
memcmp(">=", cp, 2) == 0) &&
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
format_is_end(cp[2])) {
format_add_modifier(&list, count, cp, 2, NULL, 0);
cp += 2;
continue;
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
}
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
/* Now try single character with arguments. */
Tweak the default choose modes formats: - Only show pane title if it is not default and not empty. - Add a prettier time format and use that instead of long ctime(). - Remove clutter and change the order.
2020-04-23 05:30:15 +00:00
if (strchr("mCst=pe", cp[0]) == NULL)
Add s/foo/bar/: prefix for formats to substitute bar for foo.
2015-11-18 14:13:55 +00:00
break;
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
c = cp[0];
/* No arguments provided. */
if (format_is_end(cp[1])) {
format_add_modifier(&list, count, cp, 1, NULL, 0);
cp++;
continue;
Add s/foo/bar/: prefix for formats to substitute bar for foo.
2015-11-18 14:13:55 +00:00
}
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
argv = NULL;
argc = 0;
/* Single argument with no wrapper character. */
if (!ispunct(cp[1]) || cp[1] == '-') {
end = format_skip(cp + 1, ":;");
if (end == NULL)
break;
argv = xcalloc(1, sizeof *argv);
value = xstrndup(cp + 1, end - (cp + 1));
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
argv[0] = format_expand1(es, value);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
free(value);
argc = 1;
format_add_modifier(&list, count, &c, 1, argv, argc);
cp = end;
continue;
Add s/foo/bar/: prefix for formats to substitute bar for foo.
2015-11-18 14:13:55 +00:00
}
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
/* Multiple arguments with a wrapper character. */
last[0] = cp[1];
cp++;
do {
if (cp[0] == last[0] && format_is_end(cp[1])) {
cp++;
break;
}
end = format_skip(cp + 1, last);
if (end == NULL)
break;
cp++;
argv = xreallocarray (argv, argc + 1, sizeof *argv);
value = xstrndup(cp, end - cp);
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
argv[argc++] = format_expand1(es, value);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
free(value);
cp = end;
} while (!format_is_end(cp[0]));
format_add_modifier(&list, count, &c, 1, argv, argc);
}
if (*cp != ':') {
format_free_modifiers(list, *count);
*count = 0;
return (NULL);
}
*s = cp + 1;
More style nits.
2020-04-09 15:35:27 +00:00
return (list);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
}
Add regular expression support for the format search, match and substitute modifiers.
2019-06-13 19:46:00 +00:00
/* Match against an fnmatch(3) pattern or regular expression. */
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
static char *
Add regular expression support for the format search, match and substitute modifiers.
2019-06-13 19:46:00 +00:00
format_match(struct format_modifier *fm, const char *pattern, const char *text)
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
{
Add regular expression support for the format search, match and substitute modifiers.
2019-06-13 19:46:00 +00:00
const char *s = "";
regex_t r;
int flags = 0;
if (fm->argc >= 1)
s = fm->argv[0];
if (strchr(s, 'r') == NULL) {
if (strchr(s, 'i') != NULL)
flags |= FNM_CASEFOLD;
if (fnmatch(pattern, text, flags) != 0)
return (xstrdup("0"));
} else {
flags = REG_EXTENDED|REG_NOSUB;
if (strchr(s, 'i') != NULL)
flags |= REG_ICASE;
if (regcomp(&r, pattern, flags) != 0)
return (xstrdup("0"));
if (regexec(&r, text, 0, NULL, 0) != 0) {
regfree(&r);
return (xstrdup("0"));
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
}
Add regular expression support for the format search, match and substitute modifiers.
2019-06-13 19:46:00 +00:00
regfree(&r);
}
return (xstrdup("1"));
}
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
Add regular expression support for the format search, match and substitute modifiers.
2019-06-13 19:46:00 +00:00
/* Perform substitution in string. */
static char *
format_sub(struct format_modifier *fm, const char *text, const char *pattern,
const char *with)
{
char *value;
int flags = REG_EXTENDED;
if (fm->argc >= 3 && strchr(fm->argv[2], 'i') != NULL)
flags |= REG_ICASE;
value = regsub(pattern, with, text, flags);
if (value == NULL)
return (xstrdup(text));
return (value);
}
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
Add regular expression support for the format search, match and substitute modifiers.
2019-06-13 19:46:00 +00:00
/* Search inside pane. */
static char *
format_search(struct format_modifier *fm, struct window_pane *wp, const char *s)
{
int ignore = 0, regex = 0;
char *value;
if (fm->argc >= 1) {
if (strchr(fm->argv[0], 'i') != NULL)
ignore = 1;
if (strchr(fm->argv[0], 'r') != NULL)
regex = 1;
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
}
Add regular expression support for the format search, match and substitute modifiers.
2019-06-13 19:46:00 +00:00
xasprintf(&value, "%u", window_pane_search(wp, s, regex, ignore));
return (value);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
}
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
/* Loop over sessions. */
static char *
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_loop_sessions(struct format_expand_state *es, const char *fmt)
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
{
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
struct format_tree *ft = es->ft;
struct client *c = ft->client;
struct cmdq_item *item = ft->item;
struct format_tree *nft;
struct format_expand_state next;
char *expanded, *value;
size_t valuelen;
struct session *s;
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
value = xcalloc(1, 1);
valuelen = 1;
RB_FOREACH(s, sessions, &sessions) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "session loop: $%u", s->id);
The pane and window loops need to pass the window and pane tags when they build their format.
2019-03-15 10:07:24 +00:00
nft = format_create(c, item, FORMAT_NONE, ft->flags);
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_defaults(next.ft, ft->c, s, NULL, NULL);
format_copy_state(&next, es, 0);
next.ft = nft;
expanded = format_expand1(&next, fmt);
format_free(next.ft);
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
valuelen += strlen(expanded);
value = xrealloc(value, valuelen);
strlcat(value, expanded, valuelen);
free(expanded);
}
return (value);
}
/* Loop over windows. */
static char *
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_loop_windows(struct format_expand_state *es, const char *fmt)
{
struct format_tree *ft = es->ft;
struct client *c = ft->client;
struct cmdq_item *item = ft->item;
struct format_tree *nft;
struct format_expand_state next;
char *all, *active, *use, *expanded, *value;
size_t valuelen;
struct winlink *wl;
struct window *w;
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
if (ft->s == NULL) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "window loop but no session");
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
return (NULL);
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
}
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
if (format_choose(es, fmt, &all, &active, 0) != 0) {
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
all = xstrdup(fmt);
active = NULL;
}
value = xcalloc(1, 1);
valuelen = 1;
RB_FOREACH(wl, winlinks, &ft->s->windows) {
The pane and window loops need to pass the window and pane tags when they build their format.
2019-03-15 10:07:24 +00:00
w = wl->window;
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "window loop: %u @%u", wl->idx, w->id);
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
if (active != NULL && wl == ft->s->curw)
use = active;
else
use = all;
The pane and window loops need to pass the window and pane tags when they build their format.
2019-03-15 10:07:24 +00:00
nft = format_create(c, item, FORMAT_WINDOW|w->id, ft->flags);
format_defaults(nft, ft->c, ft->s, wl, NULL);
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_copy_state(&next, es, 0);
next.ft = nft;
expanded = format_expand1(&next, use);
The pane and window loops need to pass the window and pane tags when they build their format.
2019-03-15 10:07:24 +00:00
format_free(nft);
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
valuelen += strlen(expanded);
value = xrealloc(value, valuelen);
strlcat(value, expanded, valuelen);
free(expanded);
}
free(active);
free(all);
return (value);
}
/* Loop over panes. */
static char *
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_loop_panes(struct format_expand_state *es, const char *fmt)
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
{
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
struct format_tree *ft = es->ft;
struct client *c = ft->client;
struct cmdq_item *item = ft->item;
struct format_tree *nft;
struct format_expand_state next;
char *all, *active, *use, *expanded, *value;
size_t valuelen;
struct window_pane *wp;
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
if (ft->w == NULL) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "pane loop but no window");
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
return (NULL);
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
}
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
if (format_choose(es, fmt, &all, &active, 0) != 0) {
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
all = xstrdup(fmt);
active = NULL;
}
value = xcalloc(1, 1);
valuelen = 1;
TAILQ_FOREACH(wp, &ft->w->panes, entry) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "pane loop: %%%u", wp->id);
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
if (active != NULL && wp == ft->w->active)
use = active;
else
use = all;
The pane and window loops need to pass the window and pane tags when they build their format.
2019-03-15 10:07:24 +00:00
nft = format_create(c, item, FORMAT_PANE|wp->id, ft->flags);
format_defaults(nft, ft->c, ft->s, ft->wl, wp);
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_copy_state(&next, es, 0);
next.ft = nft;
expanded = format_expand1(&next, use);
The pane and window loops need to pass the window and pane tags when they build their format.
2019-03-15 10:07:24 +00:00
format_free(nft);
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
valuelen += strlen(expanded);
value = xrealloc(value, valuelen);
strlcat(value, expanded, valuelen);
free(expanded);
Add length limit operator for formats.
2013-08-03 20:06:38 +00:00
}
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
free(active);
free(all);
return (value);
}
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
static char *
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_replace_expression(struct format_modifier *mexp,
struct format_expand_state *es, const char *copy)
{
int argc = mexp->argc;
const char *errstr;
char *endch, *value, *left = NULL, *right = NULL;
int use_fp = 0;
u_int prec = 0;
double mleft, mright, result;
Add numeric comparisons for formats, from teo_paul1 at yahoo dot com in GitHub issue 2442.
2020-11-02 08:21:30 +00:00
enum { ADD,
SUBTRACT,
MULTIPLY,
DIVIDE,
MODULUS,
EQUAL,
NOT_EQUAL,
GREATER_THAN,
GREATER_THAN_EQUAL,
LESS_THAN,
LESS_THAN_EQUAL } operator;
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
if (strcmp(mexp->argv[0], "+") == 0)
operator = ADD;
else if (strcmp(mexp->argv[0], "-") == 0)
operator = SUBTRACT;
else if (strcmp(mexp->argv[0], "*") == 0)
operator = MULTIPLY;
else if (strcmp(mexp->argv[0], "/") == 0)
operator = DIVIDE;
else if (strcmp(mexp->argv[0], "%") == 0 ||
strcmp(mexp->argv[0], "m") == 0)
operator = MODULUS;
Add numeric comparisons for formats, from teo_paul1 at yahoo dot com in GitHub issue 2442.
2020-11-02 08:21:30 +00:00
else if (strcmp(mexp->argv[0], "==") == 0)
operator = EQUAL;
else if (strcmp(mexp->argv[0], "!=") == 0)
operator = NOT_EQUAL;
else if (strcmp(mexp->argv[0], ">") == 0)
operator = GREATER_THAN;
else if (strcmp(mexp->argv[0], "<") == 0)
operator = LESS_THAN;
else if (strcmp(mexp->argv[0], ">=") == 0)
operator = GREATER_THAN_EQUAL;
else if (strcmp(mexp->argv[0], "<=") == 0)
operator = LESS_THAN_EQUAL;
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
else {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "expression has no valid operator: '%s'",
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
mexp->argv[0]);
goto fail;
}
/* The second argument may be flags. */
if (argc >= 2 && strchr(mexp->argv[1], 'f') != NULL) {
use_fp = 1;
prec = 2;
}
/* The third argument may be precision. */
if (argc >= 3) {
prec = strtonum(mexp->argv[2], INT_MIN, INT_MAX, &errstr);
if (errstr != NULL) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "expression precision %s: %s", errstr,
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
mexp->argv[2]);
goto fail;
}
}
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
if (format_choose(es, copy, &left, &right, 1) != 0) {
format_log(es, "expression syntax error");
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
goto fail;
}
mleft = strtod(left, &endch);
if (*endch != '\0') {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "expression left side is invalid: %s", left);
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
goto fail;
}
mright = strtod(right, &endch);
if (*endch != '\0') {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "expression right side is invalid: %s", right);
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
goto fail;
}
if (!use_fp) {
mleft = (long long)mleft;
mright = (long long)mright;
}
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "expression left side is: %.*f", prec, mleft);
format_log(es, "expression right side is: %.*f", prec, mright);
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
switch (operator) {
case ADD:
result = mleft + mright;
break;
case SUBTRACT:
result = mleft - mright;
break;
case MULTIPLY:
result = mleft * mright;
break;
case DIVIDE:
result = mleft / mright;
break;
case MODULUS:
result = fmod(mleft, mright);
break;
Add numeric comparisons for formats, from teo_paul1 at yahoo dot com in GitHub issue 2442.
2020-11-02 08:21:30 +00:00
case EQUAL:
result = fabs(mleft - mright) < 1e-9;
break;
case NOT_EQUAL:
result = fabs(mleft - mright) > 1e-9;
break;
case GREATER_THAN:
result = (mleft > mright);
break;
case GREATER_THAN_EQUAL:
result = (mleft >= mright);
break;
case LESS_THAN:
result = (mleft < mright);
break;
case LESS_THAN_EQUAL:
result = (mleft > mright);
break;
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
}
if (use_fp)
xasprintf(&value, "%.*f", prec, result);
else
xasprintf(&value, "%.*f", prec, (double)(long long)result);
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "expression result is %s", value);
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
free(right);
free(left);
More style nits.
2020-04-09 15:35:27 +00:00
return (value);
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
fail:
free(right);
free(left);
return (NULL);
}
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
/* Replace a key. */
static int
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_replace(struct format_expand_state *es, const char *key, size_t keylen,
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
char **buf, size_t *len, size_t *off)
{
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
struct format_tree *ft = es->ft;
struct window_pane *wp = ft->wp;
const char *errptr, *copy, *cp, *marker = NULL;
const char *time_format = NULL;
char *copy0, *condition, *found, *new;
char *value, *left, *right;
size_t valuelen;
int modifiers = 0, limit = 0, width = 0;
int j;
struct format_modifier *list, *cmp = NULL, *search = NULL;
struct format_modifier **sub = NULL, *mexp = NULL, *fm;
u_int i, count, nsub = 0;
struct format_expand_state next;
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
/* Make a copy of the key. */
copy = copy0 = xstrndup(key, keylen);
/* Process modifier list. */
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
list = format_build_modifiers(es, &copy, &count);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
for (i = 0; i < count; i++) {
fm = &list[i];
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
if (format_logging(ft)) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "modifier %u is %s", i, fm->modifier);
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
for (j = 0; j < fm->argc; j++) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "modifier %u argument %d: %s", i,
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
j, fm->argv[j]);
}
}
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
if (fm->size == 1) {
switch (fm->modifier[0]) {
case 'm':
Add <, >, <=, >= for formats, GitHub issue 1747.
2019-05-25 16:51:10 +00:00
case '<':
case '>':
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
cmp = fm;
break;
case 'C':
search = fm;
break;
case 's':
Add regular expression support for the format search, match and substitute modifiers.
2019-06-13 19:46:00 +00:00
if (fm->argc < 2)
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
break;
Allow multiple substitutions in a single format.
2019-11-25 15:02:48 +00:00
sub = xreallocarray (sub, nsub + 1,
sizeof *sub);
sub[nsub++] = fm;
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
break;
case '=':
Add regular expression support for the format search, match and substitute modifiers.
2019-06-13 19:46:00 +00:00
if (fm->argc < 1)
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
break;
limit = strtonum(fm->argv[0], INT_MIN, INT_MAX,
&errptr);
if (errptr != NULL)
limit = 0;
Add regular expression support for the format search, match and substitute modifiers.
2019-06-13 19:46:00 +00:00
if (fm->argc >= 2 && fm->argv[1] != NULL)
Add a way to append or prepend to a format if the length has been limited.
2019-05-26 12:02:42 +00:00
marker = fm->argv[1];
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
break;
Add p format modifier for padding to width.
2019-11-25 15:04:15 +00:00
case 'p':
if (fm->argc < 1)
break;
width = strtonum(fm->argv[0], INT_MIN, INT_MAX,
&errptr);
if (errptr != NULL)
width = 0;
break;
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
case 'e':
if (fm->argc < 1 || fm->argc > 3)
break;
Tweak the default choose modes formats: - Only show pane title if it is not default and not empty. - Add a prettier time format and use that instead of long ctime(). - Remove clutter and change the order.
2020-04-23 05:30:15 +00:00
mexp = fm;
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
break;
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
case 'l':
modifiers |= FORMAT_LITERAL;
break;
case 'b':
modifiers |= FORMAT_BASENAME;
break;
case 'd':
modifiers |= FORMAT_DIRNAME;
break;
Add n: modifier to get length of a format, also automatically expand variable name arguments again if they contain a #{.
2020-08-20 16:57:40 +00:00
case 'n':
modifiers |= FORMAT_LENGTH;
break;
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
case 't':
modifiers |= FORMAT_TIMESTRING;
Tweak the default choose modes formats: - Only show pane title if it is not default and not empty. - Add a prettier time format and use that instead of long ctime(). - Remove clutter and change the order.
2020-04-23 05:30:15 +00:00
if (fm->argc < 1)
break;
if (strchr(fm->argv[0], 'p') != NULL)
modifiers |= FORMAT_PRETTY;
Allow a custom time format to be given to the t format modifier.
2020-05-07 10:04:43 +00:00
else if (fm->argc >= 2 &&
strchr(fm->argv[0], 'f') != NULL)
time_format = format_strip(fm->argv[1]);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
break;
case 'q':
modifiers |= FORMAT_QUOTE;
break;
Add E: format to expand a format twice (useful to expand the value of an option).
2019-03-13 14:19:54 +00:00
case 'E':
modifiers |= FORMAT_EXPAND;
break;
Add T format modifier like E but also do strftime(3).
2019-03-14 21:31:43 +00:00
case 'T':
modifiers |= FORMAT_EXPANDTIME;
break;
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
case 'S':
modifiers |= FORMAT_SESSIONS;
break;
case 'W':
modifiers |= FORMAT_WINDOWS;
break;
case 'P':
modifiers |= FORMAT_PANES;
break;
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
}
} else if (fm->size == 2) {
if (strcmp(fm->modifier, "||") == 0 ||
strcmp(fm->modifier, "&&") == 0 ||
strcmp(fm->modifier, "==") == 0 ||
Add <, >, <=, >= for formats, GitHub issue 1747.
2019-05-25 16:51:10 +00:00
strcmp(fm->modifier, "!=") == 0 ||
strcmp(fm->modifier, ">=") == 0 ||
strcmp(fm->modifier, "<=") == 0)
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
cmp = fm;
}
Add length limit operator for formats.
2013-10-10 11:50:20 +00:00
}
Allow escaping , and } with # in #{}; GitHub issue 1332.
2018-05-22 08:49:12 +00:00
/* Is this a literal string? */
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
if (modifiers & FORMAT_LITERAL) {
Allow escaping , and } with # in #{}; GitHub issue 1332.
2018-05-22 08:49:12 +00:00
value = xstrdup(copy);
goto done;
}
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
/* Is this a loop, comparison or condition? */
if (modifiers & FORMAT_SESSIONS) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
value = format_loop_sessions(es, copy);
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
if (value == NULL)
goto fail;
} else if (modifiers & FORMAT_WINDOWS) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
value = format_loop_windows(es, copy);
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
if (value == NULL)
goto fail;
} else if (modifiers & FORMAT_PANES) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
value = format_loop_panes(es, copy);
Add formats to list sessions, windows or panes.
2019-03-13 15:37:28 +00:00
if (value == NULL)
goto fail;
} else if (search != NULL) {
Add ||, && format operators and C: to search pane content.
2017-05-29 18:06:34 +00:00
/* Search in pane. */
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
new = format_expand1(es, copy);
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
if (wp == NULL) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "search '%s' but no pane", new);
Add ||, && format operators and C: to search pane content.
2017-05-29 18:06:34 +00:00
value = xstrdup("0");
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
} else {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "search '%s' pane %%%u", new, wp->id);
Expand arguments to C and s format modifiers (matches m which already expands).
2019-06-24 10:04:29 +00:00
value = format_search(fm, wp, new);
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
}
Expand arguments to C and s format modifiers (matches m which already expands).
2019-06-24 10:04:29 +00:00
free(new);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
} else if (cmp != NULL) {
/* Comparison of left and right. */
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
if (format_choose(es, copy, &left, &right, 1) != 0) {
format_log(es, "compare %s syntax error: %s",
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
cmp->modifier, copy);
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
goto fail;
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
}
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "compare %s left is: %s", cmp->modifier, left);
format_log(es, "compare %s right is: %s", cmp->modifier, right);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
if (strcmp(cmp->modifier, "||") == 0) {
if (format_true(left) || format_true(right))
value = xstrdup("1");
else
value = xstrdup("0");
} else if (strcmp(cmp->modifier, "&&") == 0) {
if (format_true(left) && format_true(right))
value = xstrdup("1");
else
value = xstrdup("0");
} else if (strcmp(cmp->modifier, "==") == 0) {
if (strcmp(left, right) == 0)
value = xstrdup("1");
else
value = xstrdup("0");
} else if (strcmp(cmp->modifier, "!=") == 0) {
if (strcmp(left, right) != 0)
value = xstrdup("1");
else
value = xstrdup("0");
Add <, >, <=, >= for formats, GitHub issue 1747.
2019-05-25 16:51:10 +00:00
} else if (strcmp(cmp->modifier, "<") == 0) {
if (strcmp(left, right) < 0)
value = xstrdup("1");
else
value = xstrdup("0");
} else if (strcmp(cmp->modifier, ">") == 0) {
if (strcmp(left, right) > 0)
value = xstrdup("1");
else
value = xstrdup("0");
} else if (strcmp(cmp->modifier, "<=") == 0) {
if (strcmp(left, right) <= 0)
value = xstrdup("1");
else
value = xstrdup("0");
} else if (strcmp(cmp->modifier, ">=") == 0) {
if (strcmp(left, right) >= 0)
value = xstrdup("1");
else
value = xstrdup("0");
Add regular expression support for the format search, match and substitute modifiers.
2019-06-13 19:46:00 +00:00
} else if (strcmp(cmp->modifier, "m") == 0)
Use the right format modifier when comparing, and remove a couple of unused variables.
2019-06-15 06:33:48 +00:00
value = format_match(cmp, left, right);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
free(right);
free(left);
} else if (*copy == '?') {
/* Conditional: check first and choose second or third. */
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
cp = format_skip(copy + 1, ",");
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
if (cp == NULL) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "condition syntax error: %s", copy + 1);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
goto fail;
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
}
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
condition = xstrndup(copy + 1, cp - (copy + 1));
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "condition is: %s", condition);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Allow a custom time format to be given to the t format modifier.
2020-05-07 10:04:43 +00:00
found = format_find(ft, condition, modifiers, time_format);
If foo doesn't exist and can't be expanded in #{?foo,a,b} then assume it is false.
2018-05-29 09:10:30 +00:00
if (found == NULL) {
/*
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
* If the condition not found, try to expand it. If
If foo doesn't exist and can't be expanded in #{?foo,a,b} then assume it is false.
2018-05-29 09:10:30 +00:00
* the expansion doesn't have any effect, then assume
* false.
*/
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
found = format_expand1(es, condition);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
if (strcmp(found, condition) == 0) {
If foo doesn't exist and can't be expanded in #{?foo,a,b} then assume it is false.
2018-05-29 09:10:30 +00:00
free(found);
found = xstrdup("");
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "condition '%s' found: %s",
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
condition, found);
} else {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es,
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
"condition '%s' not found; assuming false",
condition);
If foo doesn't exist and can't be expanded in #{?foo,a,b} then assume it is false.
2018-05-29 09:10:30 +00:00
}
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
} else
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "condition '%s' found", condition);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
if (format_choose(es, cp + 1, &left, &right, 0) != 0) {
format_log(es, "condition '%s' syntax error: %s",
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
condition, cp + 1);
Memory leaks, from Gang Fan in GitHub issue 1453.
2018-08-27 11:03:34 +00:00
free(found);
Count brackets in #{?...} so that nested conditional formats work, from Daniel De Graaf.
2015-10-27 09:28:31 +00:00
goto fail;
Memory leaks, from Gang Fan in GitHub issue 1453.
2018-08-27 11:03:34 +00:00
}
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
if (format_true(found)) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "condition '%s' is true", condition);
value = format_expand1(es, left);
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
} else {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "condition '%s' is false", condition);
value = format_expand1(es, right);
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
}
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
free(right);
free(left);
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
free(condition);
Add s/foo/bar/: prefix for formats to substitute bar for foo.
2015-11-18 14:13:55 +00:00
free(found);
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
} else if (mexp != NULL) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
value = format_replace_expression(mexp, es, copy);
Add some number operators for formats, from Tyler Culp.
2020-03-11 14:17:55 +00:00
if (value == NULL)
value = xstrdup("");
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
} else {
Add n: modifier to get length of a format, also automatically expand variable name arguments again if they contain a #{.
2020-08-20 16:57:40 +00:00
if (strstr(copy, "#{") != 0) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "expanding inner format '%s'", copy);
value = format_expand1(es, copy);
Add n: modifier to get length of a format, also automatically expand variable name arguments again if they contain a #{.
2020-08-20 16:57:40 +00:00
} else {
value = format_find(ft, copy, modifiers, time_format);
if (value == NULL) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "format '%s' not found", copy);
Add n: modifier to get length of a format, also automatically expand variable name arguments again if they contain a #{.
2020-08-20 16:57:40 +00:00
value = xstrdup("");
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
} else {
format_log(es, "format '%s' found: %s", copy,
value);
}
Add n: modifier to get length of a format, also automatically expand variable name arguments again if they contain a #{.
2020-08-20 16:57:40 +00:00
}
Add s/foo/bar/: prefix for formats to substitute bar for foo.
2015-11-18 14:13:55 +00:00
}
Apply length limits and substitution even to literal formats.
2019-03-13 14:27:17 +00:00
done:
Add E: format to expand a format twice (useful to expand the value of an option).
2019-03-13 14:19:54 +00:00
/* Expand again if required. */
if (modifiers & FORMAT_EXPAND) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
new = format_expand1(es, value);
Add E: format to expand a format twice (useful to expand the value of an option).
2019-03-13 14:19:54 +00:00
free(value);
value = new;
Add n: modifier to get length of a format, also automatically expand variable name arguments again if they contain a #{.
2020-08-20 16:57:40 +00:00
} else if (modifiers & FORMAT_EXPANDTIME) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_copy_state(&next, es, FORMAT_EXPAND_TIME);
new = format_expand1(&next, value);
Add T format modifier like E but also do strftime(3).
2019-03-14 21:31:43 +00:00
free(value);
value = new;
}
Add s/foo/bar/: prefix for formats to substitute bar for foo.
2015-11-18 14:13:55 +00:00
/* Perform substitution if any. */
Allow multiple substitutions in a single format.
2019-11-25 15:02:48 +00:00
for (i = 0; i < nsub; i++) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
left = format_expand1(es, sub[i]->argv[0]);
right = format_expand1(es, sub[i]->argv[1]);
Allow multiple substitutions in a single format.
2019-11-25 15:02:48 +00:00
new = format_sub(sub[i], value, left, right);
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "substitute '%s' to '%s': %s", left, right, new);
Add s/foo/bar/: prefix for formats to substitute bar for foo.
2015-11-18 14:13:55 +00:00
free(value);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
value = new;
Expand arguments to C and s format modifiers (matches m which already expands).
2019-06-24 10:04:29 +00:00
free(right);
free(left);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
}
Add length limit operator for formats.
2013-08-03 20:06:38 +00:00
/* Truncate the value if needed. */
Support negative trim values (#{=-10:pane_title}) to trim from the end, suggested by Kevin Brubeck Unhammer.
2016-01-31 09:54:46 +00:00
if (limit > 0) {
Extend the #[] style syntax and use that together with previous format changes to allow the status line to be entirely configured with a single option. Now that it is possible to configure their content, enable the existing code that lets the status line be multiple lines in height. The status option can now take a value of 2, 3, 4 or 5 (as well as the previous on or off) to configure more than one line. The new status-format array option configures the format of each line, the default just references the existing status-* options, although some of the more obscure status options may be eliminated in time. Additions to the #[] syntax are: "align" to specify alignment (left, centre, right), "list" for the window list and "range" to configure ranges of text for the mouse bindings. The "align" keyword can also be used to specify alignment of entries in tree mode and the pane status lines.
2019-03-18 20:53:33 +00:00
new = format_trim_left(value, limit);
Add a way to append or prepend to a format if the length has been limited.
2019-05-26 12:02:42 +00:00
if (marker != NULL && strcmp(new, value) != 0) {
free(value);
xasprintf(&value, "%s%s", new, marker);
} else {
free(value);
value = new;
}
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "applied length limit %d: %s", limit, value);
Support negative trim values (#{=-10:pane_title}) to trim from the end, suggested by Kevin Brubeck Unhammer.
2016-01-31 09:54:46 +00:00
} else if (limit < 0) {
Extend the #[] style syntax and use that together with previous format changes to allow the status line to be entirely configured with a single option. Now that it is possible to configure their content, enable the existing code that lets the status line be multiple lines in height. The status option can now take a value of 2, 3, 4 or 5 (as well as the previous on or off) to configure more than one line. The new status-format array option configures the format of each line, the default just references the existing status-* options, although some of the more obscure status options may be eliminated in time. Additions to the #[] syntax are: "align" to specify alignment (left, centre, right), "list" for the window list and "range" to configure ranges of text for the mouse bindings. The "align" keyword can also be used to specify alignment of entries in tree mode and the pane status lines.
2019-03-18 20:53:33 +00:00
new = format_trim_right(value, -limit);
Add a way to append or prepend to a format if the length has been limited.
2019-05-26 12:02:42 +00:00
if (marker != NULL && strcmp(new, value) != 0) {
free(value);
xasprintf(&value, "%s%s", marker, new);
} else {
free(value);
value = new;
}
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "applied length limit %d: %s", limit, value);
Add some UTF-8 utility functions and use them to prevent the width limit on formats from splitting UTF-8 characters improperly.
2014-04-17 15:37:55 +00:00
}
Add length limit operator for formats.
2013-08-03 20:06:38 +00:00
Add p format modifier for padding to width.
2019-11-25 15:04:15 +00:00
/* Pad the value if needed. */
if (width > 0) {
new = utf8_padcstr(value, width);
free(value);
value = new;
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "applied padding width %d: %s", width, value);
Add p format modifier for padding to width.
2019-11-25 15:04:15 +00:00
} else if (width < 0) {
new = utf8_rpadcstr(value, -width);
free(value);
value = new;
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "applied padding width %d: %s", width, value);
Add p format modifier for padding to width.
2019-11-25 15:04:15 +00:00
}
Add n: modifier to get length of a format, also automatically expand variable name arguments again if they contain a #{.
2020-08-20 16:57:40 +00:00
/* Replace with the length if needed. */
if (modifiers & FORMAT_LENGTH) {
xasprintf(&new, "%zu", strlen(value));
free(value);
value = new;
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "replacing with length: %s", new);
Add n: modifier to get length of a format, also automatically expand variable name arguments again if they contain a #{.
2020-08-20 16:57:40 +00:00
}
If foo doesn't exist and can't be expanded in #{?foo,a,b} then assume it is false.
2018-05-29 09:10:30 +00:00
/* Expand the buffer and copy in the value. */
Add s/foo/bar/: prefix for formats to substitute bar for foo.
2015-11-18 14:13:55 +00:00
valuelen = strlen(value);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
while (*len - *off < valuelen + 1) {
Add xreallocarray and remove nmemb argument from xrealloc.
2014-10-08 17:35:58 +00:00
*buf = xreallocarray(*buf, 2, *len);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
*len *= 2;
}
memcpy(*buf + *off, value, valuelen);
*off += valuelen;
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "replaced '%s' with '%s'", copy0, value);
Add s/foo/bar/: prefix for formats to substitute bar for foo.
2015-11-18 14:13:55 +00:00
free(value);
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
Allow multiple substitutions in a single format.
2019-11-25 15:02:48 +00:00
free(sub);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
format_free_modifiers(list, count);
Add length limit operator for formats.
2013-08-03 20:06:38 +00:00
free(copy0);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
return (0);
fail:
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "failed %s", copy0);
Allow multiple substitutions in a single format.
2019-11-25 15:02:48 +00:00
free(sub);
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
format_free_modifiers(list, count);
Add length limit operator for formats.
2013-08-03 20:06:38 +00:00
free(copy0);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
return (-1);
}
Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-08-26 10:53:16 +00:00
/* Expand keys in a template. */
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
static char *
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_expand1(struct format_expand_state *es, const char *fmt)
Add format_expand_time and use it instead of status_replace where command execution is not needed.
2015-02-06 17:11:39 +00:00
{
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
struct format_tree *ft = es->ft;
char *buf, *out, *name;
const char *ptr, *s;
size_t off, len, n, outlen;
int ch, brackets;
struct tm *tm;
char expanded[8192];
Add format_expand_time and use it instead of status_replace where command execution is not needed.
2015-02-06 17:11:39 +00:00
Return empty string if format is empty rather than attempting to allocate zero bytes.
2015-05-20 06:39:02 +00:00
if (fmt == NULL || *fmt == '\0')
Add format_expand_time and use it instead of status_replace where command execution is not needed.
2015-02-06 17:11:39 +00:00
return (xstrdup(""));
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
if (es->loop == FORMAT_LOOP_LIMIT)
Use a fixed buffer for strftime() because there is no portable way to tell if the buffer is too small, and an expanding buffer is overkill anyway.
2016-05-23 20:39:26 +00:00
return (xstrdup(""));
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
es->loop++;
Add format_expand_time and use it instead of status_replace where command execution is not needed.
2015-02-06 17:11:39 +00:00
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "expanding format: %s", fmt);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
if (es->flags & FORMAT_EXPAND_TIME) {
if (es->time == 0)
es->time = time(NULL);
tm = localtime(&es->time);
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
if (strftime(expanded, sizeof expanded, fmt, tm) == 0) {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "format is too long");
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
return (xstrdup(""));
}
if (format_logging(ft) && strcmp(expanded, fmt) != 0)
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "after time expanded: %s", expanded);
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
fmt = expanded;
}
Add format_expand_time and use it instead of status_replace where command execution is not needed.
2015-02-06 17:11:39 +00:00
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
len = 64;
buf = xmalloc(len);
off = 0;
while (*fmt != '\0') {
if (*fmt != '#') {
while (len - off < 2) {
Add xreallocarray and remove nmemb argument from xrealloc.
2014-10-08 17:35:58 +00:00
buf = xreallocarray(buf, 2, len);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
len *= 2;
}
buf[off++] = *fmt++;
continue;
}
fmt++;
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
ch = (u_char)*fmt++;
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
switch (ch) {
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
case '(':
brackets = 1;
for (ptr = fmt; *ptr != '\0'; ptr++) {
if (*ptr == '(')
brackets++;
if (*ptr == ')' && --brackets == 0)
break;
}
if (*ptr != ')' || brackets != 0)
break;
n = ptr - fmt;
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
name = xstrndup(fmt, n);
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "found #(): %s", name);
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
if ((ft->flags & FORMAT_NOJOBS) ||
(es->flags & FORMAT_EXPAND_NOJOBS)) {
Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b" are expanded so can compare formats). And expand the condition to #{?a,b,c} (the "a" part) if it doesn't work as a simple lookup. Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
out = xstrdup("");
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "#() is disabled");
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
} else {
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
out = format_job_get(es, name);
format_log(es, "#() result: %s", out);
Do not leak memory when working out job name in formats.
2018-02-20 10:43:46 +00:00
}
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
free(name);
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
outlen = strlen(out);
Pass output from jobs through format_expand() so they are expanded again (this was the previous behaviour).
2015-10-25 08:59:26 +00:00
while (len - off < outlen + 1) {
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
buf = xreallocarray(buf, 2, len);
len *= 2;
}
Pass output from jobs through format_expand() so they are expanded again (this was the previous behaviour).
2015-10-25 08:59:26 +00:00
memcpy(buf + off, out, outlen);
off += outlen;
free(out);
Move the jobs output cache into the formats code so that #() work more generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
fmt += n + 1;
continue;
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
case '{':
Make format parsing build the modifiers into a list, standardize how arguments are given and allow multiple modifiers on a format (separated by ;).
2019-03-13 14:10:34 +00:00
ptr = format_skip((char *)fmt - 2, "}");
Allow escaping , and } with # in #{}; GitHub issue 1332.
2018-05-22 08:49:12 +00:00
if (ptr == NULL)
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
break;
n = ptr - fmt;
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "found #{}: %.*s", (int)n, fmt);
if (format_replace(es, fmt, n, &buf, &len, &off) != 0)
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
break;
fmt += n + 1;
continue;
Allow escaping , and } with # in #{}; GitHub issue 1332.
2018-05-22 08:49:12 +00:00
case '}':
Replace ## by # in format.
2013-11-24 11:29:09 +00:00
case '#':
Allow escaping , and } with # in #{}; GitHub issue 1332.
2018-05-22 08:49:12 +00:00
case ',':
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "found #%c", ch);
Replace ## by # in format.
2013-11-24 11:29:09 +00:00
while (len - off < 2) {
Add xreallocarray and remove nmemb argument from xrealloc.
2014-10-08 17:35:58 +00:00
buf = xreallocarray(buf, 2, len);
Replace ## by # in format.
2013-11-24 11:29:09 +00:00
len *= 2;
}
Allow escaping , and } with # in #{}; GitHub issue 1332.
2018-05-22 08:49:12 +00:00
buf[off++] = ch;
Replace ## by # in format.
2013-11-24 11:29:09 +00:00
continue;
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
default:
Add host_short format, from Tiago Cunha.
2013-05-31 19:46:42 +00:00
s = NULL;
if (ch >= 'A' && ch <= 'Z')
s = format_upper[ch - 'A'];
else if (ch >= 'a' && ch <= 'z')
s = format_lower[ch - 'a'];
if (s == NULL) {
while (len - off < 3) {
Add xreallocarray and remove nmemb argument from xrealloc.
2014-10-08 17:35:58 +00:00
buf = xreallocarray(buf, 2, len);
Add host_short format, from Tiago Cunha.
2013-05-31 19:46:42 +00:00
len *= 2;
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
}
Add host_short format, from Tiago Cunha.
2013-05-31 19:46:42 +00:00
buf[off++] = '#';
buf[off++] = ch;
continue;
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
}
Add host_short format, from Tiago Cunha.
2013-05-31 19:46:42 +00:00
n = strlen(s);
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "found #%c: %s", ch, s);
if (format_replace(es, s, n, &buf, &len, &off) != 0)
Add host_short format, from Tiago Cunha.
2013-05-31 19:46:42 +00:00
break;
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
continue;
}
break;
}
buf[off] = '\0';
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
format_log(es, "result is: %s", buf);
es->loop--;
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
return (buf);
}
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
/* Expand keys in a template, passing through strftime first. */
char *
format_expand_time(struct format_tree *ft, const char *fmt)
{
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
struct format_expand_state es;
memset(&es, 0, sizeof es);
es.ft = ft;
es.flags = FORMAT_EXPAND_TIME;
return (format_expand1(&es, fmt));
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
}
/* Expand keys in a template. */
char *
format_expand(struct format_tree *ft, const char *fmt)
{
Add a state struct to store working state during format expansion instead of modiyfing the format tree. Use this to disable nested job expansion so that the result of #() is not expanded again. Reported by Chas J Owens IV, GitHub issue 2390.
2020-10-06 07:36:05 +00:00
struct format_expand_state es;
memset(&es, 0, sizeof es);
es.ft = ft;
es.flags = 0;
return (format_expand1(&es, fmt));
Add a -v flag to display-message to show verbose messages as the format is parsed, this gives the user a way to debug problems with formats rather than just being confronted with (for example) a blank status line.
2019-03-15 10:04:13 +00:00
}
Add a helper function for the most common format_create/defaults/expand pattern.
2017-03-08 13:36:12 +00:00
/* Expand a single string. */
char *
format_single(struct cmdq_item *item, const char *fmt, struct client *c,
struct session *s, struct winlink *wl, struct window_pane *wp)
{
struct format_tree *ft;
char *expanded;
Add some additional format helper functions.
2020-04-27 13:33:17 +00:00
ft = format_create_defaults(item, c, s, wl, wp);
Add a helper function for the most common format_create/defaults/expand pattern.
2017-03-08 13:36:12 +00:00
expanded = format_expand(ft, fmt);
format_free(ft);
return (expanded);
}
Add some additional format helper functions.
2020-04-27 13:33:17 +00:00
/* Expand a single string using state. */
char *
format_single_from_state(struct cmdq_item *item, const char *fmt,
struct client *c, struct cmd_find_state *fs)
{
return (format_single(item, fmt, c, fs->s, fs->wl, fs->wp));
}
Also move cmdq_item and cmdq_list into cmd-queue.c (this is to make its use more clearly defined and preparation for some future work).
2020-04-13 10:59:58 +00:00
/* Expand a single string using target. */
char *
Make client -c and -t handling common in cmd-queue.c and try to be clearer about whether the client is the target client (must have a session) or not.
2020-04-13 20:51:57 +00:00
format_single_from_target(struct cmdq_item *item, const char *fmt)
Also move cmdq_item and cmdq_list into cmd-queue.c (this is to make its use more clearly defined and preparation for some future work).
2020-04-13 10:59:58 +00:00
{
Add some additional format helper functions.
2020-04-27 13:33:17 +00:00
struct client *tc = cmdq_get_target_client(item);
return (format_single_from_state(item, fmt, tc, cmdq_get_target(item)));
}
/* Create and add defaults. */
struct format_tree *
format_create_defaults(struct cmdq_item *item, struct client *c,
struct session *s, struct winlink *wl, struct window_pane *wp)
{
struct format_tree *ft;
if (item != NULL)
ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, 0);
else
ft = format_create(NULL, item, FORMAT_NONE, 0);
format_defaults(ft, c, s, wl, wp);
return (ft);
}
/* Create and add defaults using state. */
struct format_tree *
format_create_from_state(struct cmdq_item *item, struct client *c,
struct cmd_find_state *fs)
{
return (format_create_defaults(item, c, fs->s, fs->wl, fs->wp));
}
/* Create and add defaults using target. */
struct format_tree *
format_create_from_target(struct cmdq_item *item)
{
struct client *tc = cmdq_get_target_client(item);
Also move cmdq_item and cmdq_list into cmd-queue.c (this is to make its use more clearly defined and preparation for some future work).
2020-04-13 10:59:58 +00:00
Add some additional format helper functions.
2020-04-27 13:33:17 +00:00
return (format_create_from_state(item, tc, cmdq_get_target(item)));
Also move cmdq_item and cmdq_list into cmd-queue.c (this is to make its use more clearly defined and preparation for some future work).
2020-04-13 10:59:58 +00:00
}
Wrap all the individual format_* calls in a single format_defaults functions.
2015-02-05 10:29:43 +00:00
/* Set defaults for any of arguments that are not NULL. */
void
format_defaults(struct format_tree *ft, struct client *c, struct session *s,
struct winlink *wl, struct window_pane *wp)
{
Add formats for top paste buffer by default. Also a tmux.1 fix from jmc.
2020-03-28 09:39:27 +00:00
struct paste_buffer *pb;
Expand command formats in %if and move the config file loading later (to when the first client has identified) so all the client formats are available, fixes problems reported by Thomas Sattler.
2019-06-20 06:51:36 +00:00
if (c != NULL && c->name != NULL)
Expand session and window formats for buffer filters.
2019-03-28 21:05:15 +00:00
log_debug("%s: c=%s", __func__, c->name);
else
Expand command formats in %if and move the config file loading later (to when the first client has identified) so all the client formats are available, fixes problems reported by Thomas Sattler.
2019-06-20 06:51:36 +00:00
log_debug("%s: c=none", __func__);
Expand session and window formats for buffer filters.
2019-03-28 21:05:15 +00:00
if (s != NULL)
log_debug("%s: s=$%u", __func__, s->id);
else
log_debug("%s: s=none", __func__);
if (wl != NULL)
Call format_defaults_window for panes as well.
2020-04-28 09:53:35 +00:00
log_debug("%s: wl=%u", __func__, wl->idx);
Expand session and window formats for buffer filters.
2019-03-28 21:05:15 +00:00
else
log_debug("%s: wl=none", __func__);
if (wp != NULL)
log_debug("%s: wp=%%%u", __func__, wp->id);
else
log_debug("%s: wp=none", __func__);
Change how display-message uses the client. Originally it was only intended as the target client where the message should be displayed but at some point (perhaps when -p was added), it was used for format expansion too. This means it can get a bit weird where you have client formats expanding for a client with a different current session than the target session. However, it is nice that display-message can be used to show information about a specific client. So change so that the -c client will be used if the session matches the target session (-t or default), otherwise the best client will be chosen.
2018-04-18 14:35:37 +00:00
if (c != NULL && s != NULL && c->session != s)
log_debug("%s: session does not match", __func__);
Add -F to choose-tree, choose-client, choose-buffer to specify the format of each line, as well as adding a couple of formats needed for the default display.
2017-08-09 11:43:45 +00:00
format_add(ft, "session_format", "%d", s != NULL);
format_add(ft, "window_format", "%d", wl != NULL);
format_add(ft, "pane_format", "%d", wp != NULL);
Wrap all the individual format_* calls in a single format_defaults functions.
2015-02-05 10:29:43 +00:00
if (s == NULL && c != NULL)
s = c->session;
if (wl == NULL && s != NULL)
wl = s->curw;
if (wp == NULL && wl != NULL)
wp = wl->window->active;
if (c != NULL)
format_defaults_client(ft, c);
if (s != NULL)
format_defaults_session(ft, s);
Now that struct winlink has a session pointer, can remove some arguments.
2017-04-20 09:43:45 +00:00
if (wl != NULL)
More of revert.
2018-09-26 15:49:03 +00:00
format_defaults_winlink(ft, wl);
Wrap all the individual format_* calls in a single format_defaults functions.
2015-02-05 10:29:43 +00:00
if (wp != NULL)
format_defaults_pane(ft, wp);
Add formats for top paste buffer by default. Also a tmux.1 fix from jmc.
2020-03-28 09:39:27 +00:00
pb = paste_get_top (NULL);
if (pb != NULL)
format_defaults_paste_buffer(ft, pb);
Wrap all the individual format_* calls in a single format_defaults functions.
2015-02-05 10:29:43 +00:00
}
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
/* Set default format keys for a session. */
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static void
Wrap all the individual format_* calls in a single format_defaults functions.
2015-02-05 10:29:43 +00:00
format_defaults_session(struct format_tree *ft, struct session *s)
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
{
struct session_group *sg;
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
ft->s = s;
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
format_add(ft, "session_name", "%s", s->name);
Add session_path from Chris Ruegge in GitHub issue 2142.
2020-03-31 11:58:05 +00:00
format_add(ft, "session_path", "%s", s->cwd);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
format_add(ft, "session_windows", "%u", winlink_count(&s->windows));
Include prefix on ids, from George Nachman.
2013-03-13 07:28:12 +00:00
format_add(ft, "session_id", "$%u", s->id);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Instead of numbering session groups, give them a name which may be given to -t instead of a target session. Also allow them to contain only one session.
2017-02-09 15:04:53 +00:00
sg = session_group_contains(s);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
format_add(ft, "session_grouped", "%d", sg != NULL);
Only show the first member of session groups in tree mode (-G flag disables).
2017-11-02 18:27:35 +00:00
if (sg != NULL) {
Instead of numbering session groups, give them a name which may be given to -t instead of a target session. Also allow them to contain only one session.
2017-02-09 15:04:53 +00:00
format_add(ft, "session_group", "%s", sg->name);
Only show the first member of session groups in tree mode (-G flag disables).
2017-11-02 18:27:35 +00:00
format_add(ft, "session_group_size", "%u",
session_group_count (sg));
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
format_add(ft, "session_group_attached", "%u",
session_group_attached_count (sg));
format_add(ft, "session_group_many_attached", "%u",
session_group_attached_count (sg) > 1);
Format for group list of "other sessions" is a bit weird, just list all the sessions in the group.
2017-11-02 18:52:05 +00:00
format_add_cb(ft, "session_group_list",
format_cb_session_group_list);
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
format_add_cb(ft, "session_group_attached_list",
format_cb_session_group_attached_list);
Only show the first member of session groups in tree mode (-G flag disables).
2017-11-02 18:27:35 +00:00
}
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
format_add_tv(ft, "session_created", &s->creation_time);
format_add_tv(ft, "session_last_attached", &s->last_attached_time);
format_add_tv(ft, "session_activity", &s->activity_time);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Make session_attached a count and add session_many_attached flag.
2014-03-06 11:25:27 +00:00
format_add(ft, "session_attached", "%u", s->attached);
Fix some format specifier nits, from Ben Boeckel.
2015-03-31 17:45:10 +00:00
format_add(ft, "session_many_attached", "%d", s->attached > 1);
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
format_add_cb(ft, "session_attached_list",
format_cb_session_attached_list);
Add a session_alerts format which is a list of all the alerts in the current session in symbolic form (something like "0!,4~,5!"). Use this in the default set-titles-string. Prompted by a request from Jan ONDREJ.
2015-05-12 15:29:29 +00:00
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
format_add_cb(ft, "session_alerts", format_cb_session_alerts);
Add some formats to look at the session window stack, suggested by Scott ROCHFORD.
2017-05-05 11:59:47 +00:00
format_add_cb(ft, "session_stack", format_cb_session_stack);
Add a session_marked format like window_marked.
2020-04-22 20:47:00 +00:00
if (server_check_marked() && marked_pane.s == s)
format_add(ft, "session_marked", "1");
else
format_add(ft, "session_marked", "0");
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
}
Sync OpenBSD patchset 965: Add client formats, from Ben Boeckel.
2011-10-23 15:03:50 +00:00
/* Set default format keys for a client. */
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static void
Wrap all the individual format_* calls in a single format_defaults functions.
2015-02-05 10:29:43 +00:00
format_defaults_client(struct format_tree *ft, struct client *c)
Sync OpenBSD patchset 965: Add client formats, from Ben Boeckel.
2011-10-23 15:03:50 +00:00
{
Add client_session and client_last_session formats.
2013-02-18 14:23:40 +00:00
struct session *s;
Add key-table option to set the default key table for a session, allows different key bindings for different sessions and a few other things.
2015-12-12 18:32:24 +00:00
const char *name;
Add a format for terminal type.
2017-01-11 16:09:57 +00:00
struct tty *tty = &c->tty;
Sync OpenBSD patchset 965: Add client formats, from Ben Boeckel.
2011-10-23 15:03:50 +00:00
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
if (ft->s == NULL)
ft->s = c->session;
Add formats for when window is larger than client, and show offset in status-right by default when larger.
2018-09-26 17:41:18 +00:00
ft->c = c;
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
Give each client a name. This defaults to the tty name as before but falls back to an alternative if the tty name is not available. This is clearer than overloading the client ttyname member and allows us to remove the path stored in the tty struct, it should always be the same as the client.
2017-04-05 10:49:46 +00:00
format_add(ft, "client_name", "%s", c->name);
Add a format for client PID (client_pid) and server PID (pid). Diff for client_pid from Thomas Adam.
2015-06-14 10:07:44 +00:00
format_add(ft, "client_pid", "%ld", (long) c->pid);
Add a format for terminal type.
2017-01-11 16:09:57 +00:00
format_add(ft, "client_height", "%u", tty->sy);
format_add(ft, "client_width", "%u", tty->sx);
Store xpixel/ypixel from TIOCGWINSZ and add formats.
2019-11-28 09:05:34 +00:00
format_add(ft, "client_cell_width", "%u", tty->xpixel);
format_add(ft, "client_cell_height", "%u", tty->ypixel);
Give each client a name. This defaults to the tty name as before but falls back to an alternative if the tty name is not available. This is clearer than overloading the client ttyname member and allows us to remove the path stored in the tty struct, it should always be the same as the client.
2017-04-05 10:49:46 +00:00
format_add(ft, "client_tty", "%s", c->ttyname);
Add a format to show if client is a control client. From Bruno Sutic.
2015-07-13 15:37:26 +00:00
format_add(ft, "client_control_mode", "%d",
!!(c->flags & CLIENT_CONTROL));
Sync OpenBSD patchset 965: Add client formats, from Ben Boeckel.
2011-10-23 15:03:50 +00:00
Tidy up the terminal detection and feature code and add named sets of terminal features, each of which are defined in one place and map to a builtin set of terminfo(5) capabilities. Features can be specified based on TERM with a new terminal-features option or with the -T flag when running tmux. tmux will also detect a few common terminals from the DA and DSR responses. This is intended to make it easier to configure tmux's use of terminfo(5) even in the presence of outdated ncurses(3) or terminfo(5) databases or for features which do not yet have a terminfo(5) entry. Instead of having to grok terminfo(5) capability names and what they should be set to in the terminal-overrides option, the user can hopefully just give tmux a feature name and let it do the right thing. The terminal-overrides option remains both for backwards compatibility and to allow tweaks of individual capabilities. tmux already did much of this already, this makes it tidier and simpler to configure.
2020-04-20 13:25:36 +00:00
format_add(ft, "client_termname", "%s", c->term_name);
format_add(ft, "client_termfeatures", "%s",
tty_get_features(c->term_features));
Move terminal features into a single file.
2020-04-24 05:40:30 +00:00
if (c->term_type != NULL)
format_add(ft, "client_termtype", "%s", c->term_type);
Add a format for terminal type.
2017-01-11 16:09:57 +00:00
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
format_add_tv(ft, "client_created", &c->creation_time);
format_add_tv(ft, "client_activity", &c->activity_time);
When the data we have buffered to write to a terminal grows beyond a reasonable amount (currently width * height * 8 bytes), discard all output to the terminal and start trying to redraw periodically instead. Continue with this until the amount of data we are trying to write falls to a low level again. This helps to prevent tmux sitting on a huge buffer of data when there are processes with fast output running inside tmux but the outside terminal is slow. A new client_discarded format holds the amount of data that has been discarded due to this mechanism. The three variables (when to start this, when to stop, and how often to redraw) are basically "works for me" at the moment, this is going in to see how it goes and if it causes problems for anyone else.
2017-04-19 06:52:27 +00:00
format_add(ft, "client_written", "%zu", c->written);
format_add(ft, "client_discarded", "%zu", c->discarded);
Sync OpenBSD patchset 965: Add client formats, from Ben Boeckel.
2011-10-23 15:03:50 +00:00
Add key-table option to set the default key table for a session, allows different key bindings for different sessions and a few other things.
2015-12-12 18:32:24 +00:00
name = server_client_get_key_table(c);
if (strcmp(c->keytable->name, name) == 0)
Support for multiple key tables to commands to be bound to sequences of keys. The default key bindings become the "prefix" table and -n the "root" table. Keys may be bound in new tables with bind -T and switch-client -T used to specify the table in which the next key should be looked up. Based on a diff from Keith Amling.
2015-04-20 15:34:56 +00:00
format_add(ft, "client_prefix", "%d", 0);
else
format_add(ft, "client_prefix", "%d", 1);
format_add(ft, "client_key_table", "%s", c->keytable->name);
Add a format client_prefix which is 1 if prefix key has been pressed, used for example #{?client_prefix,X,Y}. Also a few extra server_client_status needed.
2013-02-10 18:58:05 +00:00
Tidy up the terminal detection and feature code and add named sets of terminal features, each of which are defined in one place and map to a builtin set of terminfo(5) capabilities. Features can be specified based on TERM with a new terminal-features option or with the -T flag when running tmux. tmux will also detect a few common terminals from the DA and DSR responses. This is intended to make it easier to configure tmux's use of terminfo(5) even in the presence of outdated ncurses(3) or terminfo(5) databases or for features which do not yet have a terminfo(5) entry. Instead of having to grok terminfo(5) capability names and what they should be set to in the terminal-overrides option, the user can hopefully just give tmux a feature name and let it do the right thing. The terminal-overrides option remains both for backwards compatibility and to allow tweaks of individual capabilities. tmux already did much of this already, this makes it tidier and simpler to configure.
2020-04-20 13:25:36 +00:00
if (c->flags & CLIENT_UTF8)
Sync OpenBSD patchset 965: Add client formats, from Ben Boeckel.
2011-10-23 15:03:50 +00:00
format_add(ft, "client_utf8", "%d", 1);
else
format_add(ft, "client_utf8", "%d", 0);
if (c->flags & CLIENT_READONLY)
format_add(ft, "client_readonly", "%d", 1);
else
format_add(ft, "client_readonly", "%d", 0);
Change the existing client flags for control mode to apply for any client, use the same mechanism for the read-only flag and add an ignore-size flag. refresh-client -F has become -f (-F stays for backwards compatibility) and attach-session and switch-client now have -f flags also. A new format "client_flags" lists the flags and is shown by list-clients by default. This separates the read-only flag from "ignore size" behaviour (new ignore-size) flag - both behaviours are useful in different circumstances. attach -r and switchc -r remain and set or toggle both flags together.
2020-05-05 14:42:20 +00:00
format_add(ft, "client_flags", "%s", server_client_get_flags(c));
Add client_session and client_last_session formats.
2013-02-18 14:23:40 +00:00
s = c->session;
if (s != NULL)
format_add(ft, "client_session", "%s", s->name);
s = c->last_session;
if (s != NULL && session_alive(s))
format_add(ft, "client_last_session", "%s", s->name);
Sync OpenBSD patchset 965: Add client formats, from Ben Boeckel.
2011-10-23 15:03:50 +00:00
}
Add automatic-rename-format option allowing automatic rename to use something other than pane_current_command.
2013-08-19 21:16:11 +00:00
/* Set default format keys for a window. */
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
void
Wrap all the individual format_* calls in a single format_defaults functions.
2015-02-05 10:29:43 +00:00
format_defaults_window(struct format_tree *ft, struct window *w)
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
{
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
ft->w = w;
Extend the modifiers allowed before formats: as well as the existing #{=10:...} length limit, add #{t:...} to convert a time_t format to a string, #{b:...} for basename and #{d:...} for dirname. Remove all the foo_string time formats as they can now be replaced by "t:", for example #{window_activity_string} becomes #{t:window_activity}.
2015-10-25 22:29:17 +00:00
format_add_tv(ft, "window_activity", &w->activity_time);
Sync OpenBSD patchset 1017: Give each window a unique id, like panes but prefixed with @. Based on work from George Nachman.
2012-01-31 12:01:43 +00:00
format_add(ft, "window_id", "@%u", w->id);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
format_add(ft, "window_name", "%s", w->name);
format_add(ft, "window_width", "%u", w->sx);
format_add(ft, "window_height", "%u", w->sy);
Make a best effort to set xpixel and ypixel for each pane and add formats for them.
2019-11-28 09:45:15 +00:00
format_add(ft, "window_cell_width", "%u", w->xpixel);
format_add(ft, "window_cell_height", "%u", w->ypixel);
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
format_add_cb(ft, "window_layout", format_cb_window_layout);
Add window_visible_layout which ignores zoomed panes and use it for control mode (which needs to know all panes), from George Nachman.
2015-11-13 10:00:26 +00:00
format_add_cb(ft, "window_visible_layout",
format_cb_window_visible_layout);
Sync OpenBSD patchset 1119: Switch all of the various choose- and list- commands over to the format infrastructure, from Thomas Adam.
2012-05-22 21:03:25 +00:00
format_add(ft, "window_panes", "%u", window_count_panes(w));
Fix some format specifier nits, from Ben Boeckel.
2015-03-31 17:45:10 +00:00
format_add(ft, "window_zoomed_flag", "%d",
Check ZOOMED flag on window.
2014-12-01 14:30:18 +00:00
!!(w->flags & WINDOW_ZOOMED));
Add automatic-rename-format option allowing automatic rename to use something other than pane_current_command.
2013-08-19 21:16:11 +00:00
}
/* Set default format keys for a winlink. */
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
static void
More of revert.
2018-09-26 15:49:03 +00:00
format_defaults_winlink(struct format_tree *ft, struct winlink *wl)
Add automatic-rename-format option allowing automatic rename to use something other than pane_current_command.
2013-08-19 21:16:11 +00:00
{
Add formats for when window is larger than client, and show offset in status-right by default when larger.
2018-09-26 17:41:18 +00:00
struct client *c = ft->c;
Now that struct winlink has a session pointer, can remove some arguments.
2017-04-20 09:43:45 +00:00
struct session *s = wl->session;
Add automatic-rename-format option allowing automatic rename to use something other than pane_current_command.
2013-08-19 21:16:11 +00:00
struct window *w = wl->window;
Add formats for when window is larger than client, and show offset in status-right by default when larger.
2018-09-26 17:41:18 +00:00
int flag;
u_int ox, oy, sx, sy;
Add automatic-rename-format option allowing automatic rename to use something other than pane_current_command.
2013-08-19 21:16:11 +00:00
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
if (ft->w == NULL)
Call format_defaults_window for panes as well.
2020-04-28 09:53:35 +00:00
format_defaults_window(ft, w);
Add some formats to look at the session window stack, suggested by Scott ROCHFORD.
2017-05-05 11:59:47 +00:00
ft->wl = wl;
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
Add formats for when window is larger than client, and show offset in status-right by default when larger.
2018-09-26 17:41:18 +00:00
if (c != NULL) {
flag = tty_window_offset(&c->tty, &ox, &oy, &sx, &sy);
format_add(ft, "window_bigger", "%d", flag);
if (flag) {
format_add(ft, "window_offset_x", "%u", ox);
format_add(ft, "window_offset_y", "%u", oy);
}
}
Add automatic-rename-format option allowing automatic rename to use something other than pane_current_command.
2013-08-19 21:16:11 +00:00
format_add(ft, "window_index", "%d", wl->idx);
Add some formats to look at the session window stack, suggested by Scott ROCHFORD.
2017-05-05 11:59:47 +00:00
format_add_cb(ft, "window_stack_index", format_cb_window_stack_index);
More of revert.
2018-09-26 15:49:03 +00:00
format_add(ft, "window_flags", "%s", window_printable_flags(wl));
Add automatic-rename-format option allowing automatic rename to use something other than pane_current_command.
2013-08-19 21:16:11 +00:00
format_add(ft, "window_active", "%d", wl == s->curw);
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
format_add_cb(ft, "window_active_sessions",
format_cb_window_active_sessions);
format_add_cb(ft, "window_active_sessions_list",
format_cb_window_active_sessions_list);
format_add_cb(ft, "window_active_clients",
format_cb_window_active_clients);
format_add_cb(ft, "window_active_clients_list",
format_cb_window_active_clients_list);
Add automatic-rename-format option allowing automatic rename to use something other than pane_current_command.
2013-08-19 21:16:11 +00:00
Add format flags for start and end window.
2019-03-14 21:41:30 +00:00
format_add(ft, "window_start_flag", "%d",
!!(wl == RB_MIN(winlinks, &s->windows)));
format_add(ft, "window_end_flag", "%d",
!!(wl == RB_MAX(winlinks, &s->windows)));
Add window_marked_flag, GitHub issue 1887.
2019-09-11 06:43:17 +00:00
if (server_check_marked() && marked_pane.wl == wl)
format_add(ft, "window_marked_flag", "1");
else
format_add(ft, "window_marked_flag", "0");
Fix some format specifier nits, from Ben Boeckel.
2015-03-31 17:45:10 +00:00
format_add(ft, "window_bell_flag", "%d",
Add formats for window flags.
2013-08-01 22:41:39 +00:00
!!(wl->flags & WINLINK_BELL));
Fix some format specifier nits, from Ben Boeckel.
2015-03-31 17:45:10 +00:00
format_add(ft, "window_activity_flag", "%d",
Add formats for window flags.
2013-08-01 22:41:39 +00:00
!!(wl->flags & WINLINK_ACTIVITY));
Fix some format specifier nits, from Ben Boeckel.
2015-03-31 17:45:10 +00:00
format_add(ft, "window_silence_flag", "%d",
Add formats for window flags.
2013-08-01 22:41:39 +00:00
!!(wl->flags & WINLINK_SILENCE));
Fix some format specifier nits, from Ben Boeckel.
2015-03-31 17:45:10 +00:00
format_add(ft, "window_last_flag", "%d",
Add window_last_flag and window_zoomed_flag. From John Morrissey.
2014-09-08 14:29:05 +00:00
!!(wl == TAILQ_FIRST(&s->lastw)));
Add a format window_linked which is 1 if a window has been linked multiple times, also remove the default space in window_flags and use a conditional to add it in window-status-format (this means additional flags can be added in the option without extra spaces). From Thomas Adam with tweaks by me.
2015-05-06 08:35:39 +00:00
format_add(ft, "window_linked", "%d", session_is_linked(s, wl->window));
Add a number of new formats to inspect what sessions and clients a window is present or active in. From Tyler Culp in GitHub issue 2034.
2019-12-26 11:04:58 +00:00
format_add_cb(ft, "window_linked_sessions_list",
format_cb_window_linked_sessions_list);
format_add(ft, "window_linked_sessions", "%u",
wl->window->references);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
}
/* Set default format keys for a window pane. */
void
Wrap all the individual format_* calls in a single format_defaults functions.
2015-02-05 10:29:43 +00:00
format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
{
Allow multiple modes to be open in a pane. A stack of open modes is kept and the previous restored when the top is exited. If a mode that is already on the stack is entered, the existing instance is moved to the top as the active mode rather than being opened new.
2019-03-12 11:16:49 +00:00
struct window *w = wp->window;
struct grid *gd = wp->base.grid;
int status = wp->status;
u_int idx;
struct window_mode_entry *wme;
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
if (ft->w == NULL)
Call format_defaults_window for panes as well.
2020-04-28 09:53:35 +00:00
format_defaults_window(ft, w);
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
ft->wp = wp;
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
Add a load of miscellaneous pane formats, from George Nachman.
2013-02-21 19:44:27 +00:00
format_add(ft, "history_size", "%u", gd->hsize);
format_add(ft, "history_limit", "%u", gd->hlimit);
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
format_add_cb(ft, "history_bytes", format_cb_history_bytes);
Make some data types consistent.
2020-05-25 15:02:25 +00:00
format_add_cb(ft, "history_all_bytes", format_cb_history_all_bytes);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
Add formats for pane written/skipped bytes for debugging.
2020-04-18 07:19:28 +00:00
format_add(ft, "pane_written", "%zu", wp->written);
format_add(ft, "pane_skipped", "%zu", wp->skipped);
Sync OpenBSD patchset 980: Add a pane_index format string and use it, from Ben Boeckel.
2011-11-25 13:31:56 +00:00
if (window_pane_index(wp, &idx) != 0)
fatalx("index not found");
Add a load of miscellaneous pane formats, from George Nachman.
2013-02-21 19:44:27 +00:00
format_add(ft, "pane_index", "%u", idx);
Sync OpenBSD patchset 980: Add a pane_index format string and use it, from Ben Boeckel.
2011-11-25 13:31:56 +00:00
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
format_add(ft, "pane_width", "%u", wp->sx);
format_add(ft, "pane_height", "%u", wp->sy);
format_add(ft, "pane_title", "%s", wp->base.title);
Do not add path if it is NULL, duh.
2019-11-15 11:21:32 +00:00
if (wp->base.path != NULL)
format_add(ft, "pane_path", "%s", wp->base.path);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
format_add(ft, "pane_id", "%%%u", wp->id);
Some tidying and helper functions.
2018-08-18 16:14:03 +00:00
format_add(ft, "pane_active", "%d", wp == w->active);
Add pane_input_off format, from Anish R Athalye.
2014-10-25 08:47:04 +00:00
format_add(ft, "pane_input_off", "%d", !!(wp->flags & PANE_INPUTOFF));
Add a pane_pipe format to show if pipe-pane is active, GitHub issue 990.
2017-07-07 14:39:45 +00:00
format_add(ft, "pane_pipe", "%d", wp->pipe_fd != -1);
Add a load of miscellaneous pane formats, from George Nachman.
2013-02-21 19:44:27 +00:00
Show exit status and time in the remain-on-exit pane text, mostly from Timo Boettcher in GitHub issue 1103.
2017-10-12 11:32:27 +00:00
if ((wp->flags & PANE_STATUSREADY) && WIFEXITED(status))
Add pane_dead_status for exit status of dead panes.
2014-12-09 19:23:35 +00:00
format_add(ft, "pane_dead_status", "%d", WEXITSTATUS(status));
Allow panes to be empty (no command), output can be piped to them with split-window or display-message -I.
2019-05-03 20:44:24 +00:00
if (~wp->flags & PANE_EMPTY)
format_add(ft, "pane_dead", "%d", wp->fd == -1);
else
format_add(ft, "pane_dead", "0");
Add pane_last format, GitHub issue 2353.
2020-08-27 06:55:54 +00:00
format_add(ft, "pane_last", "%d", wp == w->last);
Add pane_dead_status for exit status of dead panes.
2014-12-09 19:23:35 +00:00
Add formats to show if pane is the marked pane and if any marked pane is set.
2019-05-09 08:38:13 +00:00
if (server_check_marked() && marked_pane.wp == wp)
format_add(ft, "pane_marked", "1");
else
format_add(ft, "pane_marked", "0");
format_add(ft, "pane_marked_set", "%d", server_check_marked());
Support for windows larger than the client. This adds two new options, window-size and default-size, and a new command, resize-window. The force-width and force-height options, and the session_width and session_height formats have been removed. The new window-size option tells tmux how to work out the size of windows: largest means it picks the size of the largest session, smallest the smallest session (similar to the old behaviour) and manual means that it does not automatically resize windows. aggressive-resize modifies the choice of session for largest and smallest as it did before. If a window is in a session attached to a client that is too small, only part of the window is shown. tmux attempts to keep the cursor visible, so the part of the window displayed is changed as the cursor moves (with a small delay, to try and avoid excess redrawing when applications redraw status lines or similar that are not currently visible). Drawing windows which are larger than the client is not as efficient as those which fit, particularly when the cursor moves, so it is recommended to avoid using this on slow machines or networks (set window-size to smallest or manual). The resize-window command can be used to resize a window manually. If it is used, the window-size option is automatically set to manual for the window (undo this with "setw -u window-size"). resize-window works in a similar way to resize-pane (-U -D -L -R -x -y flags) but also has -a and -A flags. -a sets the window to the size of the smallest client (what it would be if window-size was smallest) and -A the largest. For the same behaviour as force-width or force-height, use resize-width -x or -y. If the global window-size option is set to manual, the default-size option is used for new windows. If -x or -y is used with new-session, that sets the default-size option for the new session. The maximum size of a window is 10000x10000. But expect applications to complain and higher memory use if you make a window that big. The minimum size is the size required for the current layout including borders. This change allows some code improvements, most notably that since windows can now never be cropped, that code can be removed from the layout code, and since panes can now never be outside the size of the window, window_pane_visible can be removed.
2018-08-20 14:22:14 +00:00
format_add(ft, "pane_left", "%u", wp->xoff);
format_add(ft, "pane_top", "%u", wp->yoff);
format_add(ft, "pane_right", "%u", wp->xoff + wp->sx - 1);
format_add(ft, "pane_bottom", "%u", wp->yoff + wp->sy - 1);
format_add(ft, "pane_at_left", "%d", wp->xoff == 0);
Fix top/bottom pane calculation with pane border status enabled, reported by Stanislav Spassov.
2020-02-14 13:57:58 +00:00
format_add_cb(ft, "pane_at_top", format_cb_pane_at_top);
Support for windows larger than the client. This adds two new options, window-size and default-size, and a new command, resize-window. The force-width and force-height options, and the session_width and session_height formats have been removed. The new window-size option tells tmux how to work out the size of windows: largest means it picks the size of the largest session, smallest the smallest session (similar to the old behaviour) and manual means that it does not automatically resize windows. aggressive-resize modifies the choice of session for largest and smallest as it did before. If a window is in a session attached to a client that is too small, only part of the window is shown. tmux attempts to keep the cursor visible, so the part of the window displayed is changed as the cursor moves (with a small delay, to try and avoid excess redrawing when applications redraw status lines or similar that are not currently visible). Drawing windows which are larger than the client is not as efficient as those which fit, particularly when the cursor moves, so it is recommended to avoid using this on slow machines or networks (set window-size to smallest or manual). The resize-window command can be used to resize a window manually. If it is used, the window-size option is automatically set to manual for the window (undo this with "setw -u window-size"). resize-window works in a similar way to resize-pane (-U -D -L -R -x -y flags) but also has -a and -A flags. -a sets the window to the size of the smallest client (what it would be if window-size was smallest) and -A the largest. For the same behaviour as force-width or force-height, use resize-width -x or -y. If the global window-size option is set to manual, the default-size option is used for new windows. If -x or -y is used with new-session, that sets the default-size option for the new session. The maximum size of a window is 10000x10000. But expect applications to complain and higher memory use if you make a window that big. The minimum size is the size required for the current layout including borders. This change allows some code improvements, most notably that since windows can now never be cropped, that code can be removed from the layout code, and since panes can now never be outside the size of the window, window_pane_visible can be removed.
2018-08-20 14:22:14 +00:00
format_add(ft, "pane_at_right", "%d", wp->xoff + wp->sx == w->sx);
Fix top/bottom pane calculation with pane border status enabled, reported by Stanislav Spassov.
2020-02-14 13:57:58 +00:00
format_add_cb(ft, "pane_at_bottom", format_cb_pane_at_bottom);
Add some formats for pane bounds.
2014-05-27 12:49:36 +00:00
Allow multiple modes to be open in a pane. A stack of open modes is kept and the previous restored when the top is exited. If a mode that is already on the stack is entered, the existing instance is moved to the top as the active mode rather than being opened new.
2019-03-12 11:16:49 +00:00
wme = TAILQ_FIRST(&wp->modes);
if (wme != NULL) {
format_add(ft, "pane_mode", "%s", wme->mode->name);
if (wme->mode->formats != NULL)
wme->mode->formats(wme, ft);
}
format_add_cb(ft, "pane_in_mode", format_cb_pane_in_mode);
Add a format for the name of the pane's mode, lets it be used as a conditional for key bindings.
2017-05-07 22:27:57 +00:00
Add pane_synchronized format, from Romain Francoise.
2013-07-05 15:27:14 +00:00
format_add(ft, "pane_synchronized", "%d",
Some tidying and helper functions.
2018-08-18 16:14:03 +00:00
!!options_get_number(w->options, "synchronize-panes"));
Store copy mode search string in pane so search-again command works even if you exit and reenter copy mode (it doesn't remember the position, just the search string), suggested by espie@.
2017-05-12 10:45:38 +00:00
if (wp->searchstr != NULL)
format_add(ft, "pane_search_string", "%s", wp->searchstr);
Add a load of miscellaneous pane formats, from George Nachman.
2013-02-21 19:44:27 +00:00
wp->tty is a char [] not a char * so it can't be NULL. From Thomas Adam.
2015-06-10 12:56:04 +00:00
format_add(ft, "pane_tty", "%s", wp->tty);
Add a load of miscellaneous pane formats, from George Nachman.
2013-02-21 19:44:27 +00:00
format_add(ft, "pane_pid", "%ld", (long) wp->pid);
Allow formats to be specified as functions (in the code) so they are only evaluated on demand rather than each time a format tree is constructed. Use this for expensive formats like pane_current_command.
2015-08-28 16:46:40 +00:00
format_add_cb(ft, "pane_start_command", format_cb_start_command);
format_add_cb(ft, "pane_current_command", format_cb_current_command);
Bring back pane_current_path.
2015-08-31 18:57:37 +00:00
format_add_cb(ft, "pane_current_path", format_cb_current_path);
Add a load of miscellaneous pane formats, from George Nachman.
2013-02-21 19:44:27 +00:00
Fix some format specifier nits, from Ben Boeckel.
2015-03-31 17:45:10 +00:00
format_add(ft, "cursor_x", "%u", wp->base.cx);
format_add(ft, "cursor_y", "%u", wp->base.cy);
Add a cursor_character format.
2019-03-19 19:01:50 +00:00
format_add_cb(ft, "cursor_character", format_cb_cursor_character);
Fix some format specifier nits, from Ben Boeckel.
2015-03-31 17:45:10 +00:00
format_add(ft, "scroll_region_upper", "%u", wp->base.rupper);
format_add(ft, "scroll_region_lower", "%u", wp->base.rlower);
Add a load of miscellaneous pane formats, from George Nachman.
2013-02-21 19:44:27 +00:00
Move alternate screen into the screen rather than the pane.
2020-03-31 07:00:34 +00:00
format_add(ft, "alternate_on", "%d", wp->base.saved_grid != NULL);
if (wp->base.saved_cx != UINT_MAX)
format_add(ft, "alternate_saved_x", "%u", wp->base.saved_cx);
if (wp->base.saved_cy != UINT_MAX)
format_add(ft, "alternate_saved_y", "%u", wp->base.saved_cy);
Add a load of miscellaneous pane formats, from George Nachman.
2013-02-21 19:44:27 +00:00
format_add(ft, "cursor_flag", "%d",
!!(wp->base.mode & MODE_CURSOR));
format_add(ft, "insert_flag", "%d",
!!(wp->base.mode & MODE_INSERT));
format_add(ft, "keypad_cursor_flag", "%d",
!!(wp->base.mode & MODE_KCURSOR));
format_add(ft, "keypad_flag", "%d",
!!(wp->base.mode & MODE_KKEYPAD));
format_add(ft, "wrap_flag", "%d",
!!(wp->base.mode & MODE_WRAP));
Add a -H flag to send-keys to send literal keys given as hex numbers (needed for control clients to send mouse sequences). Also add some format flags for UTF-8 and SGR mouse mode. Requested by Bradley Smith in GitHub issues 1832 and 1833.
2019-07-09 14:03:12 +00:00
format_add(ft, "origin_flag", "%d",
!!(wp->base.mode & MODE_ORIGIN));
Add a load of miscellaneous pane formats, from George Nachman.
2013-02-21 19:44:27 +00:00
Put mouse_any_flag back, don't know where it went to (still in man page).
2015-04-21 15:18:38 +00:00
format_add(ft, "mouse_any_flag", "%d",
Implement "all event" (1003) mouse mode but in a way that works. The main issue is that if we have two panes, A with 1002 and B with 1003, we need to set 1003 outside tmux in order to get all the mouse events, but then we need to suppress the ones that pane A doesn't want. This is easy in SGR mouse mode, because buttons == 3 is only used for movement events (for other events the trailing m/M marks a release instead), but in normal mouse mode we can't tell so easily. So for that, look at the previous event instead - if it is drag+release as well, then the current event is a movement event.
2017-02-01 09:55:07 +00:00
!!(wp->base.mode & ALL_MOUSE_MODES));
Add a load of miscellaneous pane formats, from George Nachman.
2013-02-21 19:44:27 +00:00
format_add(ft, "mouse_standard_flag", "%d",
!!(wp->base.mode & MODE_MOUSE_STANDARD));
format_add(ft, "mouse_button_flag", "%d",
!!(wp->base.mode & MODE_MOUSE_BUTTON));
Implement "all event" (1003) mouse mode but in a way that works. The main issue is that if we have two panes, A with 1002 and B with 1003, we need to set 1003 outside tmux in order to get all the mouse events, but then we need to suppress the ones that pane A doesn't want. This is easy in SGR mouse mode, because buttons == 3 is only used for movement events (for other events the trailing m/M marks a release instead), but in normal mouse mode we can't tell so easily. So for that, look at the previous event instead - if it is drag+release as well, then the current event is a movement event.
2017-02-01 09:55:07 +00:00
format_add(ft, "mouse_all_flag", "%d",
!!(wp->base.mode & MODE_MOUSE_ALL));
Add a -H flag to send-keys to send literal keys given as hex numbers (needed for control clients to send mouse sequences). Also add some format flags for UTF-8 and SGR mouse mode. Requested by Bradley Smith in GitHub issues 1832 and 1833.
2019-07-09 14:03:12 +00:00
format_add(ft, "mouse_utf8_flag", "%d",
!!(wp->base.mode & MODE_MOUSE_UTF8));
format_add(ft, "mouse_sgr_flag", "%d",
!!(wp->base.mode & MODE_MOUSE_SGR));
Add pane_tags format to format_window_pane based on code from George Nachman.
2013-02-23 13:02:52 +00:00
Make a few more expensive (ish) formats functions instead of inline.
2015-08-28 17:01:42 +00:00
format_add_cb(ft, "pane_tabs", format_cb_pane_tabs);
Sync OpenBSD patchset 953: Add initial framework for more powerful formatting of command output and use it for list-{panes,windows,sessions}. This allows more descriptive replacements (such as #{session_name}) and conditionals. Later this will be used for status_replace and list-keys and other places.
2011-09-21 16:31:15 +00:00
}
Sync OpenBSD patchset 1119: Switch all of the various choose- and list- commands over to the format infrastructure, from Thomas Adam.
2012-05-22 21:03:25 +00:00
Add pane_tags format to format_window_pane based on code from George Nachman.
2013-02-23 13:02:52 +00:00
/* Set default format keys for paste buffer. */
Sync OpenBSD patchset 1119: Switch all of the various choose- and list- commands over to the format infrastructure, from Thomas Adam.
2012-05-22 21:03:25 +00:00
void
Nuke the utf8 and status-utf8 options and make tmux only a UTF-8 terminal. We still support non-UTF-8 terminals outside tmux, but inside it is always UTF-8 (as when the utf8 and status-utf8 options were on).
2015-11-12 11:09:11 +00:00
format_defaults_paste_buffer(struct format_tree *ft, struct paste_buffer *pb)
Sync OpenBSD patchset 1119: Switch all of the various choose- and list- commands over to the format infrastructure, from Thomas Adam.
2012-05-22 21:03:25 +00:00
{
Add -F to choose-tree, choose-client, choose-buffer to specify the format of each line, as well as adding a couple of formats needed for the default display.
2017-08-09 11:43:45 +00:00
struct timeval tv;
size_t size;
char *s;
timerclear(&tv);
tv.tv_sec = paste_buffer_created(pb);
paste_buffer_data(pb, &size);
Sync OpenBSD patchset 1119: Switch all of the various choose- and list- commands over to the format infrastructure, from Thomas Adam.
2012-05-22 21:03:25 +00:00
Add -F to choose-tree, choose-client, choose-buffer to specify the format of each line, as well as adding a couple of formats needed for the default display.
2017-08-09 11:43:45 +00:00
format_add(ft, "buffer_size", "%zu", size);
Move struct paste_buffer out of tmux.h.
2015-08-29 09:25:00 +00:00
format_add(ft, "buffer_name", "%s", paste_buffer_name(pb));
Add -F to choose-tree, choose-client, choose-buffer to specify the format of each line, as well as adding a couple of formats needed for the default display.
2017-08-09 11:43:45 +00:00
format_add_tv(ft, "buffer_created", &tv);
Sync OpenBSD patchset 1119: Switch all of the various choose- and list- commands over to the format infrastructure, from Thomas Adam.
2012-05-22 21:03:25 +00:00
Nuke the utf8 and status-utf8 options and make tmux only a UTF-8 terminal. We still support non-UTF-8 terminals outside tmux, but inside it is always UTF-8 (as when the utf8 and status-utf8 options were on).
2015-11-12 11:09:11 +00:00
s = paste_make_sample(pb);
Support UTF-8 with choose-buffer, from Kosuke ASAMI. Also make buffer_sample bigger to let it trim at window right edge.
2014-04-02 18:12:18 +00:00
format_add(ft, "buffer_sample", "%s", s);
free(s);
Sync OpenBSD patchset 1119: Switch all of the various choose- and list- commands over to the format infrastructure, from Thomas Adam.
2012-05-22 21:03:25 +00:00
}
Reference in New Issue Copy Permalink