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

Expand command formats in %if and move the config file loading later (to

Browse Source 
when the first client has identified) so all the client formats are
available, fixes problems reported by Thomas Sattler.
This commit is contained in:
nicm
2019-06-20 06:51:36 +00:00
parent 250fdd08be
commit ae541287d3
4 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cfg.c
View File

@ -91,14 +91,14 @@ start_cfg(void)
} }
if (cfg_file == NULL) if (cfg_file == NULL)
load_cfg(TMUX_CONF, NULL, NULL, CMD_PARSE_QUIET, NULL); load_cfg(TMUX_CONF, c, NULL, CMD_PARSE_QUIET, NULL);
if (cfg_file == NULL && (home = find_home()) != NULL) { if (cfg_file == NULL && (home = find_home()) != NULL) {
xasprintf(&cfg_file, "%s/.tmux.conf", home); xasprintf(&cfg_file, "%s/.tmux.conf", home);
flags = CMD_PARSE_QUIET; flags = CMD_PARSE_QUIET;
} }
if (cfg_file != NULL) if (cfg_file != NULL)
load_cfg(cfg_file, NULL, NULL, flags, NULL); load_cfg(cfg_file, c, NULL, flags, NULL);
cmdq_append(NULL, cmdq_get_callback(cfg_done, NULL)); cmdq_append(NULL, cmdq_get_callback(cfg_done, NULL));
} }
@ -128,6 +128,7 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int flags,
pi.file = path; pi.file = path;
pi.line = 1; pi.line = 1;
pi.item = item; pi.item = item;
pi.c = c;
pr = cmd_parse_from_file(f, &pi); pr = cmd_parse_from_file(f, &pi);
fclose(f); fclose(f);
@ -147,7 +148,7 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int flags,
if (item != NULL) if (item != NULL)
cmdq_insert_after(item, new_item0); cmdq_insert_after(item, new_item0);
else else
cmdq_append(c, new_item0); cmdq_append(NULL, new_item0);
cmd_list_free(pr->cmdlist); cmd_list_free(pr->cmdlist);
if (new_item != NULL) if (new_item != NULL)

4
format.c
View File

@ -2006,10 +2006,10 @@ void
format_defaults(struct format_tree *ft, struct client *c, struct session *s, format_defaults(struct format_tree *ft, struct client *c, struct session *s,
struct winlink *wl, struct window_pane *wp) struct winlink *wl, struct window_pane *wp)
{ {
if (c != NULL) if (c != NULL && c->name != NULL)
log_debug("%s: c=%s", __func__, c->name); log_debug("%s: c=%s", __func__, c->name);
else else
log_debug("%s: s=none", __func__); log_debug("%s: c=none", __func__);
if (s != NULL) if (s != NULL)
log_debug("%s: s=$%u", __func__, s->id); log_debug("%s: s=$%u", __func__, s->id);
else else

39
server-client.c
View File

@ -1934,26 +1934,29 @@ server_client_dispatch_identify(struct client *c, struct imsg *imsg)
close(c->fd); close(c->fd);
c->fd = -1; c->fd = -1;
} else if (c->fd != -1) {
return; if (tty_init(&c->tty, c, c->fd, c->term) != 0) {
close(c->fd);
c->fd = -1;
} else {
if (c->flags & CLIENT_UTF8)
c->tty.flags |= TTY_UTF8;
if (c->flags & CLIENT_256COLOURS)
c->tty.term_flags |= TERM_256COLOURS;
tty_resize(&c->tty);
c->flags |= CLIENT_TERMINAL;
}
} }
if (c->fd == -1) /*
return; * If this is the first client that has finished identifying, load
if (tty_init(&c->tty, c, c->fd, c->term) != 0) { * configuration files.
close(c->fd); */
c->fd = -1; if ((~c->flags & CLIENT_EXIT) &&
return; !cfg_finished &&
} c == TAILQ_FIRST(&clients) &&
if (c->flags & CLIENT_UTF8) TAILQ_NEXT(c, entry) == NULL)
c->tty.flags |= TTY_UTF8; start_cfg();
if (c->flags & CLIENT_256COLOURS)
c->tty.term_flags |= TERM_256COLOURS;
tty_resize(&c->tty);
if (!(c->flags & CLIENT_CONTROL))
c->flags |= CLIENT_TERMINAL;
} }
/* Handle shell message. */ /* Handle shell message. */

3
server.c
View File

@ -208,8 +208,7 @@ server_start(struct tmuxproc *client, struct event_base *base, int lockfd,
cmdq_append(c, cmdq_get_error(cause)); cmdq_append(c, cmdq_get_error(cause));
free(cause); free(cause);
c->flags |= CLIENT_EXIT; c->flags |= CLIENT_EXIT;
} else }
start_cfg();
server_add_accept(0); server_add_accept(0);
proc_loop(server_proc, server_loop); proc_loop(server_proc, server_loop);