Merge branch 'obsd-master' into master

1 files changed, 4 insertions, 4 deletions

diff --git a/popup.c b/popup.c
index 1048af60..5522df3e 100644
--- a/popup.c
+++ b/popup.c
@@ -508,7 +508,7 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
 		    m->x > pd->px + pd->sx - 1 ||
 		    m->y < pd->py ||
 		    m->y > pd->py + pd->sy - 1) {
-			if (MOUSE_BUTTONS(m->b) == 2)
+			if (MOUSE_BUTTONS(m->b) == MOUSE_BUTTON_3)
 				goto menu;
 			return (0);
 		}
@@ -523,16 +523,16 @@ popup_key_cb(struct client *c, void *data, struct key_event *event)
 				border = BOTTOM;
 		}
 		if ((m->b & MOUSE_MASK_MODIFIERS) == 0 &&
-		    MOUSE_BUTTONS(m->b) == 2 &&
+		    MOUSE_BUTTONS(m->b) == MOUSE_BUTTON_3 &&
 		    (border == LEFT || border == TOP))
 		    goto menu;
 		if (((m->b & MOUSE_MASK_MODIFIERS) == MOUSE_MASK_META) ||
 		    border != NONE) {
 			if (!MOUSE_DRAG(m->b))
 				goto out;
-			if (MOUSE_BUTTONS(m->lb) == 0)
+			if (MOUSE_BUTTONS(m->lb) == MOUSE_BUTTON_1)
 				pd->dragging = MOVE;
-			else if (MOUSE_BUTTONS(m->lb) == 2)
+			else if (MOUSE_BUTTONS(m->lb) == MOUSE_BUTTON_3)
 				pd->dragging = SIZE;
 			pd->dx = m->lx - pd->px;
 			pd->dy = m->ly - pd->py;