diff options
| author | nicm <nicm> | 2020-04-13 13:42:35 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2020-04-13 13:42:35 +0000 |
| commit | 77d5b0cc538138fd036dca0f9b2ba198a94c009d (patch) | |
| tree | d45462362e56f236d72f3dec9a470ce97b6f3c4a /cmd-display-menu.c | |
| parent | 53d6b94e8aef09c0494ed8a53191063b605b3127 (diff) | |
Store a key event not a mouse event in the shared data.
Diffstat (limited to 'cmd-display-menu.c')
| -rw-r--r-- | cmd-display-menu.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/cmd-display-menu.c b/cmd-display-menu.c index ada3ef23..ff9276d3 100644 --- a/cmd-display-menu.c +++ b/cmd-display-menu.c @@ -99,9 +99,9 @@ cmd_display_menu_get_position(struct client *c, struct cmdq_item *item, *px = wp->xoff - ox; else *px = 0; - } else if (strcmp(xp, "M") == 0 && shared->mouse.valid) { - if (shared->mouse.x > w / 2) - *px = shared->mouse.x - w / 2; + } else if (strcmp(xp, "M") == 0) { + if (shared->event.m.valid && shared->event.m.x > w / 2) + *px = shared->event.m.x - w / 2; else *px = 0; } else if (strcmp(xp, "W") == 0) { @@ -133,9 +133,12 @@ cmd_display_menu_get_position(struct client *c, struct cmdq_item *item, *py = wp->yoff + wp->sy - oy; else *py = 0; - } else if (strcmp(yp, "M") == 0 && shared->mouse.valid) - *py = shared->mouse.y + h; - else if (strcmp(yp, "S") == 0) { + } else if (strcmp(yp, "M") == 0) { + if (shared->event.m.valid) + *py = shared->event.m.y + h; + else + *py = 0; + } else if (strcmp(yp, "S") == 0) { if (options_get_number(s->options, "status-position") == 0) { if (lines != 0) *py = lines + h; @@ -147,8 +150,7 @@ cmd_display_menu_get_position(struct client *c, struct cmdq_item *item, else *py = c->tty.sy; } - } - else if (strcmp(yp, "W") == 0) { + } else if (strcmp(yp, "W") == 0) { if (options_get_number(s->options, "status-position") == 0) { if (lines != 0) *py = line + 1 + h; @@ -228,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->mouse.valid) + if (!shared->event.m.valid) flags |= MENU_NOMOUSE; if (menu_display(menu, flags, item, px, py, c, target, NULL, NULL) != 0) return (CMD_RETURN_NORMAL); |