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

Address PR feedback

pull/3666/head
Alexis Hildebrandt 2023-08-17 19:18:15 +02:00
parent b721ca7e99
commit 3ba7bbcc85
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd-display-menu.c
View File

@ -299,7 +299,7 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
u_int px, py, i, count = args_count(args);
struct options *o = target->s->curw->window->options;
struct options_entry *oe;
u_short bw;
u_int bw;
if (tc->overlay_draw != NULL)
return (CMD_RETURN_NORMAL);
@ -368,7 +368,7 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
}
}
bw = ((lines != BOX_LINES_NONE) ? 2 : 2);
bw = ((lines != BOX_LINES_NONE) ? 2 : 0);
if (!cmd_display_menu_get_position(tc, item, args, &px, &py,
menu->width + 2 + bw, menu->count + bw)) {
menu_free(menu);

12
menu.c
View File

@ -187,7 +187,7 @@ menu_check_cb(__unused struct client *c, void *data, u_int px, u_int py,
{
struct menu_data *md = data;
struct menu *menu = md->menu;
u_short bw;
u_int bw;
bw = (md->border_lines != BOX_LINES_NONE) ? 2 : 0;
server_client_overlay_range(md->px, md->py, menu->width + 2 + bw,
@ -204,7 +204,7 @@ menu_draw_cb(struct client *c, void *data,
struct menu *menu = md->menu;
struct screen_write_ctx ctx;
u_int i, bx, px = md->px, py = md->py;
u_short bw;
u_int bw;
if (md->border_lines != BOX_LINES_NONE) {
bw = 2;
@ -259,7 +259,7 @@ menu_key_cb(struct client *c, void *data, struct key_event *event)
struct cmdq_state *state;
enum cmd_parse_status status;
char *error;
u_short bw;
u_int bw;
if (KEYC_IS_MOUSE(event->key)) {
if (md->flags & MENU_NOMOUSE) {
@ -478,9 +478,8 @@ menu_prepare(struct menu *menu, int flags, int starting_choice,
int choice;
const char *name;
struct options *o = c->session->curw->window->options;
u_short bw;
u_int bw;
u_short two = 2;
bw = (lines != BOX_LINES_NONE) ? 2 : 0;
if (c->tty.sx < menu->width + 2 + bw || c->tty.sy < menu->count + bw)
return (NULL);
@ -504,7 +503,8 @@ menu_prepare(struct menu *menu, int flags, int starting_choice,
if (fs != NULL)
cmd_find_copy_state(&md->fs, fs);
screen_init(&md->s, menu->width + 2 + bw, menu->count + two, 0);
// TODO: Should menu->count really be + 2 for border-line none?
screen_init(&md->s, menu->width + 2 + bw, menu->count + 2, 0);
if (~md->flags & MENU_NOMOUSE)
md->s.mode |= (MODE_MOUSE_ALL|MODE_MOUSE_BUTTON);
md->s.mode &= ~MODE_CURSOR;

2
screen-write.c
View File

@ -702,7 +702,7 @@ screen_write_menu(struct screen_write_ctx *ctx, struct menu *menu, int choice,
const struct grid_cell *gc = &default_gc;
u_int cx, cy, co, i, j, width = menu->width;
const char *name;
u_short bw;
u_int bw;
cx = s->cx;
cy = s->cy;