===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-display-menu.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/tmux/cmd-display-menu.c	2020/04/13 13:42:35	1.15
--- src/usr.bin/tmux/cmd-display-menu.c	2020/04/13 14:04:25	1.16
***************
*** 1,4 ****
! /* $OpenBSD: cmd-display-menu.c,v 1.15 2020/04/13 13:42:35 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $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,71 ****
  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 cmd_find_state	*target = cmdq_get_target(item);
  	struct session		*s = c->session;
  	struct winlink		*wl = target->wl;
--- 65,71 ----
  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_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,107 ****
  		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;
  		else
  			*px = 0;
  	} else if (strcmp(xp, "W") == 0) {
--- 100,107 ----
  		else
  			*px = 0;
  	} else if (strcmp(xp, "M") == 0) {
! 		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,141 ****
  		else
  			*py = 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) {
--- 134,141 ----
  		else
  			*py = 0;
  	} else if (strcmp(yp, "M") == 0) {
! 		if (state->event.m.valid)
! 			*py = state->event.m.y + h;
  		else
  			*py = 0;
  	} else if (strcmp(yp, "S") == 0) {
***************
*** 176,182 ****
  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 cmd_find_state	*target = cmdq_get_target(item);
  	struct client		*c;
  	struct menu		*menu = NULL;
--- 176,182 ----
  cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args		*args = cmd_get_args(self);
! 	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,236 ****
  	cmd_display_menu_get_position(c, item, args, &px, &py, menu->width + 4,
  	    menu->count + 2);
  
! 	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);
--- 230,236 ----
  	cmd_display_menu_get_position(c, item, args, &px, &py, menu->width + 4,
  	    menu->count + 2);
  
! 	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);