diff --git a/cfg.c b/cfg.c index 5109c8c9..adac60e1 100644 --- a/cfg.c +++ b/cfg.c @@ -66,6 +66,7 @@ start_cfg(void) { struct client *c; u_int i; + int flags = 0; /* * Configuration files are loaded without a client, so commands are run @@ -83,19 +84,17 @@ start_cfg(void) cmdq_append(c, cfg_item); } - for (i = 0; i < cfg_nfiles; i++) { - if (cfg_quiet) - load_cfg(cfg_files[i], c, NULL, CMD_PARSE_QUIET, NULL); - else - load_cfg(cfg_files[i], c, NULL, 0, NULL); - } + if (cfg_quiet) + flags = CMD_PARSE_QUIET; + for (i = 0; i < cfg_nfiles; i++) + load_cfg(cfg_files[i], c, NULL, NULL, flags, NULL); cmdq_append(NULL, cmdq_get_callback(cfg_done, NULL)); } int -load_cfg(const char *path, struct client *c, struct cmdq_item *item, int flags, - struct cmdq_item **new_item) +load_cfg(const char *path, struct client *c, struct cmdq_item *item, + struct cmd_find_state *current, int flags, struct cmdq_item **new_item) { FILE *f; struct cmd_parse_input pi; @@ -134,7 +133,7 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int flags, } if (item != NULL) - state = cmdq_copy_state(cmdq_get_state(item)); + state = cmdq_copy_state(cmdq_get_state(item), current); else state = cmdq_new_state(NULL, NULL, 0); cmdq_add_format(state, "current_file", "%s", pi.file); @@ -154,8 +153,8 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int flags, int load_cfg_from_buffer(const void *buf, size_t len, const char *path, - struct client *c, struct cmdq_item *item, int flags, - struct cmdq_item **new_item) + struct client *c, struct cmdq_item *item, struct cmd_find_state *current, + int flags, struct cmdq_item **new_item) { struct cmd_parse_input pi; struct cmd_parse_result *pr; @@ -186,7 +185,7 @@ load_cfg_from_buffer(const void *buf, size_t len, const char *path, } if (item != NULL) - state = cmdq_copy_state(cmdq_get_state(item)); + state = cmdq_copy_state(cmdq_get_state(item), current); else state = cmdq_new_state(NULL, NULL, 0); cmdq_add_format(state, "current_file", "%s", pi.file); diff --git a/cmd-queue.c b/cmd-queue.c index e5188c54..e188afcd 100644 --- a/cmd-queue.c +++ b/cmd-queue.c @@ -236,8 +236,10 @@ cmdq_link_state(struct cmdq_state *state) /* Make a copy of a state. */ struct cmdq_state * -cmdq_copy_state(struct cmdq_state *state) +cmdq_copy_state(struct cmdq_state *state, struct cmd_find_state *current) { + if (current != NULL) + return (cmdq_new_state(current, &state->event, state->flags)); return (cmdq_new_state(&state->current, &state->event, state->flags)); } diff --git a/cmd-source-file.c b/cmd-source-file.c index 255d443e..b390ed63 100644 --- a/cmd-source-file.c +++ b/cmd-source-file.c @@ -35,8 +35,10 @@ const struct cmd_entry cmd_source_file_entry = { .name = "source-file", .alias = "source", - .args = { "Fnqv", 1, -1, NULL }, - .usage = "[-Fnqv] path ...", + .args = { "t:Fnqv", 1, -1, NULL }, + .usage = "[-Fnqv] " CMD_TARGET_PANE_USAGE " path ...", + + .target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL }, .flags = 0, .exec = cmd_source_file_exec @@ -92,6 +94,7 @@ cmd_source_file_done(struct client *c, const char *path, int error, size_t bsize = EVBUFFER_LENGTH(buffer); u_int n; struct cmdq_item *new_item; + struct cmd_find_state *target = cmdq_get_target(item); if (!closed) return; @@ -100,7 +103,7 @@ cmd_source_file_done(struct client *c, const char *path, int error, cmdq_error(item, "%s: %s", path, strerror(error)); else if (bsize != 0) { if (load_cfg_from_buffer(bdata, bsize, path, c, cdata->after, - cdata->flags, &new_item) < 0) + target, cdata->flags, &new_item) < 0) cdata->retval = CMD_RETURN_ERROR; else if (new_item != NULL) cdata->after = new_item; diff --git a/input.c b/input.c index b83e64b4..821f029a 100644 --- a/input.c +++ b/input.c @@ -169,6 +169,7 @@ static void input_csi_dispatch_rm(struct input_ctx *); static void input_csi_dispatch_rm_private(struct input_ctx *); static void input_csi_dispatch_sm(struct input_ctx *); static void input_csi_dispatch_sm_private(struct input_ctx *); +static void input_csi_dispatch_sm_graphics(struct input_ctx *); static void input_csi_dispatch_winops(struct input_ctx *); static void input_csi_dispatch_sgr_256(struct input_ctx *, int, u_int *); static void input_csi_dispatch_sgr_rgb(struct input_ctx *, int, u_int *); @@ -203,7 +204,7 @@ enum input_esc_type { INPUT_ESC_SCSG0_ON, INPUT_ESC_SCSG1_OFF, INPUT_ESC_SCSG1_ON, - INPUT_ESC_ST, + INPUT_ESC_ST }; /* Escape command table. */ @@ -259,11 +260,12 @@ enum input_csi_type { INPUT_CSI_SGR, INPUT_CSI_SM, INPUT_CSI_SM_PRIVATE, + INPUT_CSI_SM_GRAPHICS, INPUT_CSI_SU, INPUT_CSI_TBC, INPUT_CSI_VPA, INPUT_CSI_WINOPS, - INPUT_CSI_XDA, + INPUT_CSI_XDA }; /* Control (CSI) command table. */ @@ -283,6 +285,7 @@ static const struct input_table_entry input_csi_table[] = { { 'M', "", INPUT_CSI_DL }, { 'P', "", INPUT_CSI_DCH }, { 'S', "", INPUT_CSI_SU }, + { 'S', "?", INPUT_CSI_SM_GRAPHICS }, { 'T', "", INPUT_CSI_SD }, { 'X', "", INPUT_CSI_ECH }, { 'Z', "", INPUT_CSI_CBT }, @@ -306,7 +309,7 @@ static const struct input_table_entry input_csi_table[] = { { 'r', "", INPUT_CSI_DECSTBM }, { 's', "", INPUT_CSI_SCP }, { 't', "", INPUT_CSI_WINOPS }, - { 'u', "", INPUT_CSI_RCP }, + { 'u', "", INPUT_CSI_RCP } }; /* Input transition. */ @@ -1599,6 +1602,9 @@ input_csi_dispatch(struct input_ctx *ictx) case INPUT_CSI_SM_PRIVATE: input_csi_dispatch_sm_private(ictx); break; + case INPUT_CSI_SM_GRAPHICS: + input_csi_dispatch_sm_graphics(ictx); + break; case INPUT_CSI_SU: n = input_get(ictx, 0, 1, 1); if (n != -1) @@ -1831,6 +1837,12 @@ input_csi_dispatch_sm_private(struct input_ctx *ictx) } } +/* Handle CSI graphics SM. */ +static void +input_csi_dispatch_sm_graphics(__unused struct input_ctx *ictx) +{ +} + /* Handle CSI window operations. */ static void input_csi_dispatch_winops(struct input_ctx *ictx) @@ -1838,6 +1850,7 @@ input_csi_dispatch_winops(struct input_ctx *ictx) struct screen_write_ctx *sctx = &ictx->ctx; struct screen *s = sctx->s; struct window_pane *wp = ictx->wp; + struct window *w = wp->window; u_int x = screen_size_x(s), y = screen_size_y(s); int n, m; @@ -1851,8 +1864,6 @@ input_csi_dispatch_winops(struct input_ctx *ictx) case 7: case 11: case 13: - case 14: - case 19: case 20: case 21: case 24: @@ -1870,6 +1881,21 @@ input_csi_dispatch_winops(struct input_ctx *ictx) if (input_get(ictx, m, 0, -1) == -1) return; break; + case 14: + input_reply(ictx, "\033[4;%u;%ut", y * w->ypixel, x * w->xpixel); + break; + case 15: + input_reply(ictx, "\033[5;%u;%ut", y * w->ypixel, x * w->xpixel); + break; + case 16: + input_reply(ictx, "\033[6;%u;%ut", w->ypixel, w->xpixel); + break; + case 18: + input_reply(ictx, "\033[8;%u;%ut", y, x); + break; + case 19: + input_reply(ictx, "\033[9;%u;%ut", y, x); + break; case 22: m++; switch (input_get(ictx, m, 0, -1)) { @@ -1897,9 +1923,6 @@ input_csi_dispatch_winops(struct input_ctx *ictx) break; } break; - case 18: - input_reply(ictx, "\033[8;%u;%ut", y, x); - break; default: log_debug("%s: unknown '%c'", __func__, ictx->ch); break; diff --git a/tmux.1 b/tmux.1 index 8c998f12..250b9e90 100644 --- a/tmux.1 +++ b/tmux.1 @@ -1549,6 +1549,7 @@ show debugging information about jobs and terminals. .Tg source .It Xo Ic source-file .Op Fl Fnqv +.Op Fl t Ar target-pane .Ar path ... .Xc .D1 Pq alias: Ic source diff --git a/tmux.h b/tmux.h index 16482337..f7f356e9 100644 --- a/tmux.h +++ b/tmux.h @@ -2136,10 +2136,11 @@ extern char **cfg_files; extern u_int cfg_nfiles; extern int cfg_quiet; void start_cfg(void); -int load_cfg(const char *, struct client *, struct cmdq_item *, int, - struct cmdq_item **); +int load_cfg(const char *, struct client *, struct cmdq_item *, + struct cmd_find_state *, int, struct cmdq_item **); int load_cfg_from_buffer(const void *, size_t, const char *, - struct client *, struct cmdq_item *, int, struct cmdq_item **); + struct client *, struct cmdq_item *, struct cmd_find_state *, + int, struct cmdq_item **); void printflike(1, 2) cfg_add_cause(const char *, ...); void cfg_print_causes(struct cmdq_item *); void cfg_show_causes(struct session *); @@ -2595,7 +2596,8 @@ struct cmd_parse_result *cmd_parse_from_arguments(struct args_value *, u_int, struct cmdq_state *cmdq_new_state(struct cmd_find_state *, struct key_event *, int); struct cmdq_state *cmdq_link_state(struct cmdq_state *); -struct cmdq_state *cmdq_copy_state(struct cmdq_state *); +struct cmdq_state *cmdq_copy_state(struct cmdq_state *, + struct cmd_find_state *); void cmdq_free_state(struct cmdq_state *); void printflike(3, 4) cmdq_add_format(struct cmdq_state *, const char *, const char *, ...);