From 77d5b0cc538138fd036dca0f9b2ba198a94c009d Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 13 Apr 2020 13:42:35 +0000
Subject: Store a key event not a mouse event in the shared data.

---
 cmd-display-menu.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'cmd-display-menu.c')

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);
-- 
cgit 


From 9a65102bfc2ed5d1e1f41e47451b8296c84f133d Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 13 Apr 2020 14:04:25 +0000
Subject: Rename cmdq_shared to cmdq_state which will better reflect what it is
 (going to be) used for.

---
 cmd-display-menu.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'cmd-display-menu.c')

diff --git a/cmd-display-menu.c b/cmd-display-menu.c
index ff9276d3..df8e0329 100644
--- a/cmd-display-menu.c
+++ b/cmd-display-menu.c
@@ -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);
-- 
cgit