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

Remove a TODO comment.

Browse Source
This commit is contained in:
nicm 2021-10-20 09:52:27 +00:00
parent 8a9bfd0cdd
commit acba07629e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
popup.c
View File

@ -32,6 +32,7 @@ struct popup_data {
struct cmdq_item *item; struct cmdq_item *item;
int flags; int flags;
enum box_lines lines; enum box_lines lines;
char *title;
struct screen s; struct screen s;
struct colour_palette palette; struct colour_palette palette;
@ -229,7 +230,8 @@ popup_draw_cb(struct client *c, void *data, struct screen_redraw_ctx *rctx)
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->lines, &bgc,
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);
@ -287,6 +289,7 @@ popup_free_cb(struct client *c, void *data)
screen_free(&pd->s); screen_free(&pd->s);
colour_palette_free(&pd->palette); colour_palette_free(&pd->palette);
free(pd->title);
free(pd); free(pd);
} }
@ -632,8 +635,8 @@ popup_job_complete_cb(struct job *job)
int 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, struct client *c, struct session *s, int argc, char **argv, const char *cwd, const char *title, struct client *c,
popup_close_cb cb, void *arg) struct session *s, popup_close_cb cb, void *arg)
{ {
struct popup_data *pd; struct popup_data *pd;
u_int jx, jy; u_int jx, jy;
@ -664,6 +667,7 @@ popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px,
pd->item = item; pd->item = item;
pd->flags = flags; pd->flags = flags;
pd->lines = lines; pd->lines = lines;
pd->title = xstrdup(title);
pd->c = c; pd->c = c;
pd->c->references++; pd->c->references++;
@ -776,7 +780,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, c, NULL, NULL, px, py, sx, sy, NULL, cmd, 0, NULL, _PATH_TMP, NULL, c, NULL,
popup_editor_close_cb, pe) != 0) { popup_editor_close_cb, pe) != 0) {
popup_editor_free(pe); popup_editor_free(pe);
free(cmd); free(cmd);