Merge branch 'obsd-master' into master

2 files changed, 16 insertions, 12 deletions

diff --git a/popup.c b/popup.c
index 9565b012..3f64a852 100644
--- a/popup.c
+++ b/popup.c
@@ -441,6 +441,7 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
 	const char		*buf;
 	size_t			 len;
 	u_int			 px, py, x;
+	enum { NONE, LEFT, RIGHT, TOP, BOTTOM } border = NONE;
 
 	if (pd->md != NULL) {
 		if (menu_key_cb(c, pd->md, event) == 1) {
@@ -467,20 +468,22 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
 				goto menu;
 			return (0);
 		}
-		if ((~pd->flags & POPUP_NOBORDER) &&
-		    (~m->b & MOUSE_MASK_META) &&
+		if (~pd->flags & POPUP_NOBORDER) {
+			if (m->x == pd->px)
+				border = LEFT;
+			else if (m->x == pd->px + pd->sx - 1)
+				border = RIGHT;
+			else if (m->y == pd->py)
+				border = TOP;
+			else if (m->y == pd->py + pd->sy - 1)
+				border = BOTTOM;
+		}
+		if ((m->b & MOUSE_MASK_MODIFIERS) == 0 &&
 		    MOUSE_BUTTONS(m->b) == 2 &&
-		    (m->x == pd->px ||
-		    m->x == pd->px + pd->sx - 1 ||
-		    m->y == pd->py ||
-		    m->y == pd->py + pd->sy - 1))
+		    (border == LEFT || border == TOP))
 		    goto menu;
-		if ((m->b & MOUSE_MASK_META) ||
-		    ((~pd->flags & POPUP_NOBORDER) &&
-		    (m->x == pd->px ||
-		    m->x == pd->px + pd->sx - 1 ||
-		    m->y == pd->py ||
-		    m->y == pd->py + pd->sy - 1))) {
+		if (((m->b & MOUSE_MASK_MODIFIERS) == MOUSE_MASK_META) ||
+		    border != NONE) {
 			if (!MOUSE_DRAG(m->b))
 				goto out;
 			if (MOUSE_BUTTONS(m->lb) == 0)
diff --git a/tmux.h b/tmux.h
index 3c88107d..9c8a584c 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1159,6 +1159,7 @@ RB_HEAD(sessions, session);
 #define MOUSE_MASK_CTRL 16
 #define MOUSE_MASK_DRAG 32
 #define MOUSE_MASK_WHEEL 64
+#define MOUSE_MASK_MODIFIERS (MOUSE_MASK_SHIFT|MOUSE_MASK_META|MOUSE_MASK_CTRL)
 
 /* Mouse wheel states. */
 #define MOUSE_WHEEL_UP 0