From 1641be924ac125a2f5f9d2c8cf5dfab89bd24fc3 Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Thu, 28 Dec 2006 09:39:55 +0000
Subject: [PATCH] Ignore move events from ncurses interface; extra filtering
 for ncurses interface (mainly, ignore modifiers if not set in SP->_trap_mbe).

---
 curses.h         | 35 ++++++++++++++++++-----------------
 pdcurses/mouse.c | 11 +++++++++--
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/curses.h b/curses.h
index 8844526e..30c473a2 100644
--- a/curses.h
+++ b/curses.h
@@ -11,7 +11,7 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-/* $Id: curses.h,v 1.264 2006/12/28 01:02:02 wmcbrine Exp $ */
+/* $Id: curses.h,v 1.265 2006/12/28 09:39:55 wmcbrine Exp $ */
 
 /*----------------------------------------------------------------------*
  *				PDCurses				*
@@ -404,24 +404,25 @@ typedef struct
    BUTTON5_PRESSED are returned for mouse scroll wheel up and down; 
    otherwise PDCurses doesn't support buttons 4 and 5 */
 
-#define BUTTON4_RELEASED	0x00100000L
-#define BUTTON4_PRESSED		0x00200000L
-#define BUTTON4_CLICKED		0x00400000L
-#define BUTTON4_DOUBLE_CLICKED	0x00800000L
-#define BUTTON4_TRIPLE_CLICKED	0x01000000L
+#define BUTTON4_RELEASED	0x00008000L
+#define BUTTON4_PRESSED		0x00010000L
+#define BUTTON4_CLICKED		0x00020000L
+#define BUTTON4_DOUBLE_CLICKED	0x00040000L
+#define BUTTON4_TRIPLE_CLICKED	0x00080000L
 
-#define BUTTON5_RELEASED	0x02000000L
-#define BUTTON5_PRESSED		0x04000000L
-#define BUTTON5_CLICKED		0x08000000L
-#define BUTTON5_DOUBLE_CLICKED	0x10000000L
-#define BUTTON5_TRIPLE_CLICKED	0x20000000L
+#define BUTTON5_RELEASED	0x00100000L
+#define BUTTON5_PRESSED		0x00200000L
+#define BUTTON5_CLICKED		0x00400000L
+#define BUTTON5_DOUBLE_CLICKED	0x00800000L
+#define BUTTON5_TRIPLE_CLICKED	0x01000000L
 
-#define MOUSE_WHEEL_SCROLL	0x00008000L /* PDCurses */
-#define BUTTON_MODIFIER_SHIFT	0x00010000L /* PDCurses */
-#define BUTTON_MODIFIER_CONTROL 0x00020000L /* PDCurses */
-#define BUTTON_MODIFIER_ALT	0x00040000L /* PDCurses */
-#define ALL_MOUSE_EVENTS	0x0007ffffL
-#define REPORT_MOUSE_POSITION	0x00080000L
+#define MOUSE_WHEEL_SCROLL	0x02000000L /* PDCurses */
+#define BUTTON_MODIFIER_SHIFT	0x04000000L /* PDCurses */
+#define BUTTON_MODIFIER_CONTROL 0x08000000L /* PDCurses */
+#define BUTTON_MODIFIER_ALT	0x10000000L /* PDCurses */
+
+#define ALL_MOUSE_EVENTS	0x1fffffffL
+#define REPORT_MOUSE_POSITION	0x20000000L
 
 /* NCurses mouse interface */
 
diff --git a/pdcurses/mouse.c b/pdcurses/mouse.c
index 756a74a5..a6407ee2 100644
--- a/pdcurses/mouse.c
+++ b/pdcurses/mouse.c
@@ -14,7 +14,7 @@
 #include <curspriv.h>
 #include <string.h>
 
-RCSID("$Id: mouse.c,v 1.37 2006/12/28 01:02:03 wmcbrine Exp $");
+RCSID("$Id: mouse.c,v 1.38 2006/12/28 09:39:55 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
@@ -274,6 +274,11 @@ mmask_t mousemask(mmask_t mask, mmask_t *oldmask)
 	if (oldmask)
 		*oldmask = SP->_trap_mbe;
 
+	/* The ncurses interface doesn't work with our move events, so 
+	   filter them here */
+
+	mask &= ~(BUTTON1_MOVED | BUTTON2_MOVED | BUTTON3_MOVED);
+
 	mouse_set(mask);
 
 	return SP->_trap_mbe;
@@ -333,7 +338,9 @@ int nc_getmouse(MEVENT *event)
 	else if (MOUSE_WHEEL_DOWN)
 		bstate |= BUTTON5_PRESSED;
 
-	event->bstate = bstate;
+	/* extra filter pass -- mainly for button modifiers */
+
+	event->bstate = bstate & SP->_trap_mbe;
 
 	return OK;
 }