* select.cc (peek_console): Don't report read_ready on mouse events unless we

are looking for mouse events.
* fhandler.h (fhandler_console::mouse_aware): New method.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4d3d2cffc2517af34cf68cac6fd223b967ed894d..d7c02ee8fcca49756d3e565b43d42b142b65a663 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar  1 20:48:11 2001  Christopher Faylor <cgf@cygnus.com>
+
+       * select.cc (peek_console): Don't report read_ready on mouse events
+       unless we are looking for mouse events.
+       * fhandler.h (fhandler_console::mouse_aware): New method.
+
 Wed Feb 28 15:10:00 2001  Corinna Vinschen <corinna@vinschen.de>
 
        * uinfo.cc: Eliminate `#include <wchar.h>'.

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 99321a10ef2c9792b65869713b762de7b051a35d..3607b3b285e6d90dfaac8b4042cd4a511ef4acc8 100644 (file)
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -680,6 +680,7 @@ public:
 
   int ioctl (unsigned int cmd, void *);
   void init (HANDLE, DWORD, mode_t);
+  bool mouse_aware () {return use_mouse;}
 
   select_record *select_read (select_record *s);
   select_record *select_write (select_record *s);

diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index b68161dc4fab4350cc2b77fb949d37656c11e9e7..fe08049799fd60ab65d61489d7a09acc493e1e4b 100644 (file)
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -638,7 +638,10 @@ peek_console (select_record *me, int ignra)
        else if (irec.EventType == MOUSE_EVENT &&
                 (irec.Event.MouseEvent.dwEventFlags == 0 ||
                  irec.Event.MouseEvent.dwEventFlags == DOUBLE_CLICK))
-         return me->read_ready = 1;
+         {
+           if (fh->mouse_aware ())
+             return me->read_ready = 1;
+         }
        else if (irec.EventType == KEY_EVENT && irec.Event.KeyEvent.bKeyDown == TRUE &&
                 (irec.Event.KeyEvent.uChar.AsciiChar || get_nonascii_key (irec, tmpbuf)))
          return me->read_ready = 1;