ncurses 6.2 - patch 20200314

[ncurses.git] / menu / m_driver.c

diff --git a/menu/m_driver.c b/menu/m_driver.c
index dcc1c55d83a237d7c37716e6a0ff03f674bb0dd9..e592bab4e368a88c68c9997e7fdd73422cf51fdb 100644 (file)
--- a/menu/m_driver.c
+++ b/menu/m_driver.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -37,7 +38,7 @@
 
 #include "menu.priv.h"
 
-MODULE_ID("$Id: m_driver.c,v 1.30 2011/05/21 18:56:41 tom Exp $")
+MODULE_ID("$Id: m_driver.c,v 1.34 2020/02/02 23:34:34 tom Exp $")
 
 /* Macros */
 
@@ -47,7 +48,7 @@ MODULE_ID("$Id: m_driver.c,v 1.30 2011/05/21 18:56:41 tom Exp $")
 
 /* Add a new character to the match pattern buffer */
 #define Add_Character_To_Pattern(menu,ch) \
-  { (menu)->pattern[((menu)->pindex)++] = (ch);\
+  { (menu)->pattern[((menu)->pindex)++] = (char) (ch);\
     (menu)->pattern[(menu)->pindex] = '\0'; }
 
 /*---------------------------------------------------------------------------
@@ -138,7 +139,7 @@ _nc_Match_Next_Character_In_Item_Name
       /* we artificially position one item back, because in the do...while
          loop we start with the next item. This means, that with a new
          pattern search we always start the scan with the actual item. If
-         we do a NEXT_PATTERN oder PREV_PATTERN search, we start with the
+         we do a NEXT_PATTERN or PREV_PATTERN search, we start with the
          one after or before the actual item. */
       if (--idx < 0)
        idx = menu->nitems - 1;
@@ -530,7 +531,11 @@ menu_driver(MENU * menu, int c)
                }
            }
          else
-           result = E_REQUEST_DENIED;
+           {
+             if (menu->opt & O_MOUSE_MENU)
+               ungetmouse(&event);     /* let someone else handle this */
+             result = E_REQUEST_DENIED;
+           }
        }
 #endif /* NCURSES_MOUSE_VERSION */
       else