diff options
| author |   nicm <nicm@openbsd.org> | 2020-04-13 14:04:25 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2020-04-13 14:04:25 +0000 |
| commit | 054f42ac3c11f9c74e2a6c1c031bfd2efb8c013c (patch) | |
| tree | bcde0dda957246e42692f39e6356fc8babbeb376 /usr.bin/tmux/cmd-display-menu.c | |
| parent | Store a key event not a mouse event in the shared data. (diff) | |
| download | wireguard-openbsd-054f42ac3c11f9c74e2a6c1c031bfd2efb8c013c.tar.xz wireguard-openbsd-054f42ac3c11f9c74e2a6c1c031bfd2efb8c013c.zip | |
Rename cmdq_shared to cmdq_state which will better reflect what it is
(going to be) used for.
Diffstat (limited to 'usr.bin/tmux/cmd-display-menu.c')
| -rw-r--r-- | usr.bin/tmux/cmd-display-menu.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/tmux/cmd-display-menu.c b/usr.bin/tmux/cmd-display-menu.c index f1f00592aa6..51b57bec412 100644 --- a/usr.bin/tmux/cmd-display-menu.c +++ b/usr.bin/tmux/cmd-display-menu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-display-menu.c,v 1.15 2020/04/13 13:42:35 nicm Exp $ */ +/* $OpenBSD: cmd-display-menu.c,v 1.16 2020/04/13 14:04:25 nicm Exp $ */ /* * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -65,7 +65,7 @@ static void cmd_display_menu_get_position(struct client *c, struct cmdq_item *item, struct args *args, u_int *px, u_int *py, u_int w, u_int h) { - struct cmdq_shared *shared = cmdq_get_shared(item); + struct cmdq_state *state = cmdq_get_state(item); struct cmd_find_state *target = cmdq_get_target(item); struct session *s = c->session; struct winlink *wl = target->wl; @@ -100,8 +100,8 @@ cmd_display_menu_get_position(struct client *c, struct cmdq_item *item, else *px = 0; } else if (strcmp(xp, "M") == 0) { - if (shared->event.m.valid && shared->event.m.x > w / 2) - *px = shared->event.m.x - w / 2; + if (state->event.m.valid && state->event.m.x > w / 2) + *px = state->event.m.x - w / 2; else *px = 0; } else if (strcmp(xp, "W") == 0) { @@ -134,8 +134,8 @@ cmd_display_menu_get_position(struct client *c, struct cmdq_item *item, else *py = 0; } else if (strcmp(yp, "M") == 0) { - if (shared->event.m.valid) - *py = shared->event.m.y + h; + if (state->event.m.valid) + *py = state->event.m.y + h; else *py = 0; } else if (strcmp(yp, "S") == 0) { @@ -176,7 +176,7 @@ static enum cmd_retval cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = cmd_get_args(self); - struct cmdq_shared *shared = cmdq_get_shared(item); + struct cmdq_state *state = cmdq_get_state(item); struct cmd_find_state *target = cmdq_get_target(item); struct client *c; struct menu *menu = NULL; @@ -230,7 +230,7 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item) cmd_display_menu_get_position(c, item, args, &px, &py, menu->width + 4, menu->count + 2); - if (!shared->event.m.valid) + if (!state->event.m.valid) flags |= MENU_NOMOUSE; if (menu_display(menu, flags, item, px, py, c, target, NULL, NULL) != 0) return (CMD_RETURN_NORMAL); |