circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

pull/2954/head
Thomas Adam 2021-10-25 12:01:11 +01:00
parent 619d934d7b ef46eb91a5
commit 3934d9b24d
6 changed files with 87 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd-display-menu.c
View File

@ -52,11 +52,12 @@ const struct cmd_entry cmd_display_popup_entry = {
.name = "display-popup", .name = "display-popup",
.alias = "popup", .alias = "popup",
.args = { "Bb:Cc:d:e:Eh:t:T:w:x:y:", 0, -1, NULL }, .args = { "Bb:Cc:d:e:Eh:s:S:t:T:w:x:y:", 0, -1, NULL },
.usage = "[-BCE] [-b border-lines] [-c target-client] " .usage = "[-BCE] [-b border-lines] [-c target-client] "
"[-d start-directory] [-e environment] [-h height] " "[-d start-directory] [-e environment] [-h height] "
CMD_TARGET_PANE_USAGE " [-T title] " "[-s style] [-S border-style] " CMD_TARGET_PANE_USAGE
"[-w width] [-x position] [-y position] [shell-command]", "[-T title] [-w width] [-x position] [-y position] "
"[shell-command]",
.target = { 't', CMD_FIND_PANE, 0 }, .target = { 't', CMD_FIND_PANE, 0 },
@ -354,6 +355,8 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
struct client *tc = cmdq_get_target_client(item); struct client *tc = cmdq_get_target_client(item);
struct tty *tty = &tc->tty; struct tty *tty = &tc->tty;
const char *value, *shell, *shellcmd = NULL; const char *value, *shell, *shellcmd = NULL;
const char *style = args_get(args, 's');
const char *border_style = args_get(args, 'S');
char *cwd, *cause = NULL, **argv = NULL, *title; char *cwd, *cause = NULL, **argv = NULL, *title;
int flags = 0, argc = 0; int flags = 0, argc = 0;
enum box_lines lines = BOX_LINES_DEFAULT; enum box_lines lines = BOX_LINES_DEFAULT;
@ -447,7 +450,7 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
else if (args_has(args, 'E')) else if (args_has(args, 'E'))
flags |= POPUP_CLOSEEXIT; flags |= POPUP_CLOSEEXIT;
if (popup_display(flags, lines, item, px, py, w, h, env, shellcmd, argc, if (popup_display(flags, lines, item, px, py, w, h, env, shellcmd, argc,
argv, cwd, title, tc, s, NULL, NULL) != 0) { argv, cwd, title, tc, s, style, border_style, NULL, NULL) != 0) {
cmd_free_argv(argc, argv); cmd_free_argv(argc, argv);
if (env != NULL) if (env != NULL)
environ_free(env); environ_free(env);

94
popup.c
View File

@ -30,11 +30,15 @@ struct popup_data {
struct client *c; struct client *c;
struct cmdq_item *item; struct cmdq_item *item;
int flags; int flags;
enum box_lines lines;
char *title; char *title;
struct grid_cell border_cell;
enum box_lines border_lines;
struct screen s; struct screen s;
struct grid_cell defaults;
struct colour_palette palette; struct colour_palette palette;
struct job *job; struct job *job;
struct input_ctx *ictx; struct input_ctx *ictx;
int status; int status;
@ -118,7 +122,7 @@ popup_set_client_cb(struct tty_ctx *ttyctx, struct client *c)
ttyctx->wsx = c->tty.sx; ttyctx->wsx = c->tty.sx;
ttyctx->wsy = c->tty.sy; ttyctx->wsy = c->tty.sy;
if (pd->lines == BOX_LINES_NONE) { if (pd->border_lines == BOX_LINES_NONE) {
ttyctx->xoff = ttyctx->rxoff = pd->px; ttyctx->xoff = ttyctx->rxoff = pd->px;
ttyctx->yoff = ttyctx->ryoff = pd->py; ttyctx->yoff = ttyctx->ryoff = pd->py;
} else { } else {
@ -134,6 +138,7 @@ popup_init_ctx_cb(struct screen_write_ctx *ctx, struct tty_ctx *ttyctx)
{ {
struct popup_data *pd = ctx->arg; struct popup_data *pd = ctx->arg;
memcpy(&ttyctx->defaults, &pd->defaults, sizeof ttyctx->defaults);
ttyctx->palette = &pd->palette; ttyctx->palette = &pd->palette;
ttyctx->redraw_cb = popup_redraw_cb; ttyctx->redraw_cb = popup_redraw_cb;
ttyctx->set_client_cb = popup_set_client_cb; ttyctx->set_client_cb = popup_set_client_cb;
@ -148,7 +153,7 @@ popup_mode_cb(__unused struct client *c, void *data, u_int *cx, u_int *cy)
if (pd->md != NULL) if (pd->md != NULL)
return (menu_mode_cb(c, pd->md, cx, cy)); return (menu_mode_cb(c, pd->md, cx, cy));
if (pd->lines == BOX_LINES_NONE) { if (pd->border_lines == BOX_LINES_NONE) {
*cx = pd->px + pd->s.cx; *cx = pd->px + pd->s.cx;
*cy = pd->py + pd->s.cy; *cy = pd->py + pd->s.cy;
} else { } else {
@ -212,36 +217,29 @@ popup_draw_cb(struct client *c, void *data, struct screen_redraw_ctx *rctx)
struct screen_write_ctx ctx; struct screen_write_ctx ctx;
u_int i, px = pd->px, py = pd->py; u_int i, px = pd->px, py = pd->py;
struct colour_palette *palette = &pd->palette; struct colour_palette *palette = &pd->palette;
struct grid_cell gc; struct grid_cell defaults;
struct grid_cell bgc;
struct options *o = c->session->curw->window->options;
screen_init(&s, pd->sx, pd->sy, 0); screen_init(&s, pd->sx, pd->sy, 0);
screen_write_start(&ctx, &s); screen_write_start(&ctx, &s);
screen_write_clearscreen(&ctx, 8); screen_write_clearscreen(&ctx, 8);
memcpy(&bgc, &grid_default_cell, sizeof bgc); if (pd->border_lines == BOX_LINES_NONE) {
bgc.attr = 0;
style_apply(&bgc, o, "popup-border-style", NULL);
bgc.attr = 0;
if (pd->lines == BOX_LINES_NONE) {
screen_write_cursormove(&ctx, 0, 0, 0); screen_write_cursormove(&ctx, 0, 0, 0);
screen_write_fast_copy(&ctx, &pd->s, 0, 0, pd->sx, pd->sy); screen_write_fast_copy(&ctx, &pd->s, 0, 0, pd->sx, pd->sy);
} else if (pd->sx > 2 && pd->sy > 2) { } else if (pd->sx > 2 && pd->sy > 2) {
screen_write_box(&ctx, pd->sx, pd->sy, pd->lines, &bgc, screen_write_box(&ctx, pd->sx, pd->sy, pd->border_lines,
pd->title); &pd->border_cell, pd->title);
screen_write_cursormove(&ctx, 1, 1, 0); screen_write_cursormove(&ctx, 1, 1, 0);
screen_write_fast_copy(&ctx, &pd->s, 0, 0, pd->sx - 2, screen_write_fast_copy(&ctx, &pd->s, 0, 0, pd->sx - 2,
pd->sy - 2); pd->sy - 2);
} }
screen_write_stop(&ctx); screen_write_stop(&ctx);
memcpy(&gc, &grid_default_cell, sizeof gc); memcpy(&defaults, &pd->defaults, sizeof defaults);
style_apply(&gc, o, "popup-style", NULL); if (defaults.fg == 8)
gc.attr = 0; defaults.fg = palette->fg;
palette->fg = gc.fg; if (defaults.bg == 8)
palette->bg = gc.bg; defaults.bg = palette->bg;
if (pd->md != NULL) { if (pd->md != NULL) {
c->overlay_check = menu_check_cb; c->overlay_check = menu_check_cb;
@ -250,8 +248,10 @@ popup_draw_cb(struct client *c, void *data, struct screen_redraw_ctx *rctx)
c->overlay_check = NULL; c->overlay_check = NULL;
c->overlay_data = NULL; c->overlay_data = NULL;
} }
for (i = 0; i < pd->sy; i++) for (i = 0; i < pd->sy; i++) {
tty_draw_line(tty, &s, 0, i, pd->sx, px, py + i, &gc, palette); tty_draw_line(tty, &s, 0, i, pd->sx, px, py + i, &defaults,
palette);
}
if (pd->md != NULL) { if (pd->md != NULL) {
c->overlay_check = NULL; c->overlay_check = NULL;
c->overlay_data = NULL; c->overlay_data = NULL;
@ -322,7 +322,7 @@ popup_resize_cb(__unused struct client *c, void *data)
pd->px = pd->ppx; pd->px = pd->ppx;
/* Avoid zero size screens. */ /* Avoid zero size screens. */
if (pd->lines == BOX_LINES_NONE) { if (pd->border_lines == BOX_LINES_NONE) {
screen_resize(&pd->s, pd->sx, pd->sy, 0); screen_resize(&pd->s, pd->sx, pd->sy, 0);
if (pd->job != NULL) if (pd->job != NULL)
job_resize(pd->job, pd->sx, pd->sy ); job_resize(pd->job, pd->sx, pd->sy );
@ -448,7 +448,7 @@ popup_handle_drag(struct client *c, struct popup_data *pd,
pd->ppy = py; pd->ppy = py;
server_redraw_client(c); server_redraw_client(c);
} else if (pd->dragging == SIZE) { } else if (pd->dragging == SIZE) {
if (pd->lines == BOX_LINES_NONE) { if (pd->border_lines == BOX_LINES_NONE) {
if (m->x < pd->px + 1) if (m->x < pd->px + 1)
return; return;
if (m->y < pd->py + 1) if (m->y < pd->py + 1)
@ -464,7 +464,7 @@ popup_handle_drag(struct client *c, struct popup_data *pd,
pd->psx = pd->sx; pd->psx = pd->sx;
pd->psy = pd->sy; pd->psy = pd->sy;
if (pd->lines == BOX_LINES_NONE) { if (pd->border_lines == BOX_LINES_NONE) {
screen_resize(&pd->s, pd->sx, pd->sy, 0); screen_resize(&pd->s, pd->sx, pd->sy, 0);
if (pd->job != NULL) if (pd->job != NULL)
job_resize(pd->job, pd->sx, pd->sy); job_resize(pd->job, pd->sx, pd->sy);
@ -512,7 +512,7 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
goto menu; goto menu;
return (0); return (0);
} }
if (pd->lines != BOX_LINES_NONE) { if (pd->border_lines != BOX_LINES_NONE) {
if (m->x == pd->px) if (m->x == pd->px)
border = LEFT; border = LEFT;
else if (m->x == pd->px + pd->sx - 1) else if (m->x == pd->px + pd->sx - 1)
@ -546,7 +546,7 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
if (pd->job != NULL) { if (pd->job != NULL) {
if (KEYC_IS_MOUSE(event->key)) { if (KEYC_IS_MOUSE(event->key)) {
/* Must be inside, checked already. */ /* Must be inside, checked already. */
if (pd->lines == BOX_LINES_NONE) { if (pd->border_lines == BOX_LINES_NONE) {
px = m->x - pd->px; px = m->x - pd->px;
py = m->y - pd->py; py = m->y - pd->py;
} else { } else {
@ -635,19 +635,21 @@ int
popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px, popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px,
u_int py, u_int sx, u_int sy, struct environ *env, const char *shellcmd, u_int py, u_int sx, u_int sy, struct environ *env, const char *shellcmd,
int argc, char **argv, const char *cwd, const char *title, struct client *c, int argc, char **argv, const char *cwd, const char *title, struct client *c,
struct session *s, popup_close_cb cb, void *arg) struct session *s, const char* style, const char* border_style,
popup_close_cb cb, void *arg)
{ {
struct popup_data *pd; struct popup_data *pd;
u_int jx, jy; u_int jx, jy;
struct options *o; struct options *o;
struct style sytmp;
if (lines == BOX_LINES_DEFAULT) { if (s != NULL)
if (s != NULL) o = s->curw->window->options;
o = s->curw->window->options; else
else o = c->session->curw->window->options;
o = c->session->curw->window->options;
if (lines == BOX_LINES_DEFAULT)
lines = options_get_number(o, "popup-border-lines"); lines = options_get_number(o, "popup-border-lines");
}
if (lines == BOX_LINES_NONE) { if (lines == BOX_LINES_NONE) {
if (sx < 1 || sy < 1) if (sx < 1 || sy < 1)
return (-1); return (-1);
@ -665,7 +667,6 @@ popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px,
pd = xcalloc(1, sizeof *pd); pd = xcalloc(1, sizeof *pd);
pd->item = item; pd->item = item;
pd->flags = flags; pd->flags = flags;
pd->lines = lines;
pd->title = xstrdup(title); pd->title = xstrdup(title);
pd->c = c; pd->c = c;
@ -675,10 +676,33 @@ popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px,
pd->arg = arg; pd->arg = arg;
pd->status = 128 + SIGHUP; pd->status = 128 + SIGHUP;
pd->border_lines = lines;
memcpy(&pd->border_cell, &grid_default_cell, sizeof pd->border_cell);
style_apply(&pd->border_cell, o, "popup-border-style", NULL);
if (border_style != NULL) {
style_set(&sytmp, &grid_default_cell);
if (style_parse(&sytmp, &pd->border_cell, border_style) == 0) {
pd->border_cell.fg = sytmp.gc.fg;
pd->border_cell.bg = sytmp.gc.bg;
}
}
pd->border_cell.attr = 0;
screen_init(&pd->s, sx - 2, sy - 2, 0); screen_init(&pd->s, sx - 2, sy - 2, 0);
colour_palette_init(&pd->palette); colour_palette_init(&pd->palette);
colour_palette_from_option(&pd->palette, global_w_options); colour_palette_from_option(&pd->palette, global_w_options);
memcpy(&pd->defaults, &grid_default_cell, sizeof pd->defaults);
style_apply(&pd->defaults, o, "popup-style", NULL);
if (style != NULL) {
style_set(&sytmp, &grid_default_cell);
if (style_parse(&sytmp, &pd->defaults, style) == 0) {
pd->defaults.fg = sytmp.gc.fg;
pd->defaults.bg = sytmp.gc.bg;
}
}
pd->defaults.attr = 0;
pd->px = px; pd->px = px;
pd->py = py; pd->py = py;
pd->sx = sx; pd->sx = sx;
@ -780,7 +804,7 @@ popup_editor(struct client *c, const char *buf, size_t len,
xasprintf(&cmd, "%s %s", editor, path); xasprintf(&cmd, "%s %s", editor, path);
if (popup_display(POPUP_INTERNAL|POPUP_CLOSEEXIT, BOX_LINES_DEFAULT, if (popup_display(POPUP_INTERNAL|POPUP_CLOSEEXIT, BOX_LINES_DEFAULT,
NULL, px, py, sx, sy, NULL, cmd, 0, NULL, _PATH_TMP, NULL, c, NULL, NULL, px, py, sx, sy, NULL, cmd, 0, NULL, _PATH_TMP, NULL, c, NULL,
popup_editor_close_cb, pe) != 0) { NULL, NULL, popup_editor_close_cb, pe) != 0) {
popup_editor_free(pe); popup_editor_free(pe);
free(cmd); free(cmd);
return (-1); return (-1);

6
screen-write.c
View File

@ -184,8 +184,10 @@ screen_write_initctx(struct screen_write_ctx *ctx, struct tty_ctx *ttyctx,
if (ctx->init_ctx_cb != NULL) { if (ctx->init_ctx_cb != NULL) {
ctx->init_ctx_cb(ctx, ttyctx); ctx->init_ctx_cb(ctx, ttyctx);
if (ttyctx->palette != NULL) { if (ttyctx->palette != NULL) {
ttyctx->defaults.fg = ttyctx->palette->fg; if (ttyctx->defaults.fg == 8)
ttyctx->defaults.bg = ttyctx->palette->bg; ttyctx->defaults.fg = ttyctx->palette->fg;
if (ttyctx->defaults.bg == 8)
ttyctx->defaults.bg = ttyctx->palette->bg;
} }
} else { } else {
ttyctx->redraw_cb = screen_write_redraw_cb; ttyctx->redraw_cb = screen_write_redraw_cb;

12
tmux.1
View File

@ -5800,6 +5800,8 @@ forwards any input read from stdin to the empty pane given by
.Op Fl d Ar start-directory .Op Fl d Ar start-directory
.Op Fl e Ar environment .Op Fl e Ar environment
.Op Fl h Ar height .Op Fl h Ar height
.Op Fl s Ar style
.Op Fl S Ar border-style
.Op Fl t Ar target-pane .Op Fl t Ar target-pane
.Op Fl T Ar title .Op Fl T Ar title
.Op Fl w Ar width .Op Fl w Ar width
@ -5853,6 +5855,16 @@ See
for possible values for for possible values for
.Ar border-lines . .Ar border-lines .
.Pp .Pp
.Fl s
sets the style for the popup and
.Fl S
sets the style for the popup border.
For how to specify
.Ar style ,
see the
.Sx STYLES
section.
.Pp
.Fl e .Fl e
takes the form takes the form
.Ql VARIABLE=value .Ql VARIABLE=value

3
tmux.h
View File

@ -3157,7 +3157,8 @@ typedef void (*popup_finish_edit_cb)(char *, size_t, void *);
int popup_display(int, int, struct cmdq_item *, u_int, u_int, int popup_display(int, int, struct cmdq_item *, u_int, u_int,
u_int, u_int, struct environ *, const char *, int, char **, u_int, u_int, struct environ *, const char *, int, char **,
const char *, const char *, struct client *, const char *, const char *, struct client *,
struct session *, popup_close_cb, void *); struct session *, const char *, const char *,
popup_close_cb, void *);
int popup_editor(struct client *, const char *, size_t, int popup_editor(struct client *, const char *, size_t,
popup_finish_edit_cb, void *); popup_finish_edit_cb, void *);

7
tty.c
View File

@ -1972,10 +1972,9 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
for (i = 0; i < OVERLAY_MAX_RANGES; i++) for (i = 0; i < OVERLAY_MAX_RANGES; i++)
vis += r.nx[i]; vis += r.nx[i];
if (vis < gcp->data.width) { if (vis < gcp->data.width) {
tty_draw_line(tty, s, s->cx, s->cy, tty_draw_line(tty, s, s->cx, s->cy, gcp->data.width,
gcp->data.width, px, py, &ctx->defaults, px, py, &ctx->defaults, ctx->palette);
ctx->palette); return;
return;
} }
} }