ncurses 6.2 - patch 20200321

[ncurses.git] / menu / m_driver.c

diff --git a/menu/m_driver.c b/menu/m_driver.c
index 5b7a89e386a5170c8ac4ebb5095d059a99444621..e592bab4e368a88c68c9997e7fdd73422cf51fdb 100644 (file)
--- a/menu/m_driver.c
+++ b/menu/m_driver.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2008,2009 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            *
  *                                                                          *
  * 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"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_driver.c,v 1.28 2009/02/28 21:02:46 juergen Exp $")
+MODULE_ID("$Id: m_driver.c,v 1.34 2020/02/02 23:34:34 tom Exp $")

 
 /* Macros */
 
 
 /* Macros */
 


@@ -47,7 +48,7 @@ MODULE_ID("$Id: m_driver.c,v 1.28 2009/02/28 21:02:46 juergen Exp $")
 
 /* Add a new character to the match pattern buffer */
 #define Add_Character_To_Pattern(menu,ch) \
 
 /* 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'; }
 
 /*---------------------------------------------------------------------------
     (menu)->pattern[(menu)->pindex] = '\0'; }
 
 /*---------------------------------------------------------------------------


@@ -121,7 +122,8 @@ _nc_Match_Next_Character_In_Item_Name
   bool found = FALSE, passed = FALSE;
   int idx, last;
 
   bool found = FALSE, passed = FALSE;
   int idx, last;
 

-  T((T_CALLED("_nc_Match_Next_Character(%p,%d,%p)"), menu, ch, item));
+  T((T_CALLED("_nc_Match_Next_Character(%p,%d,%p)"),
+     (void *)menu, ch, (void *)item));

 
   assert(menu && item && *item);
   idx = (*item)->index;
 
   assert(menu && item && *item);
   idx = (*item)->index;


@@ -137,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 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;
          one after or before the actual item. */
       if (--idx < 0)
        idx = menu->nitems - 1;


@@ -220,7 +222,7 @@ menu_driver(MENU * menu, int c)
   ITEM *item;
   int my_top_row, rdiff;
 
   ITEM *item;
   int my_top_row, rdiff;
 

-  T((T_CALLED("menu_driver(%p,%d)"), menu, c));
+  T((T_CALLED("menu_driver(%p,%d)"), (void *)menu, c));

 
   if (!menu)
     RETURN(E_BAD_ARGUMENT);
 
   if (!menu)
     RETURN(E_BAD_ARGUMENT);


@@ -529,14 +531,22 @@ menu_driver(MENU * menu, int c)
                }
            }
          else
                }
            }
          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
        result = E_UNKNOWN_COMMAND;
     }
 
        }
 #endif /* NCURSES_MOUSE_VERSION */
       else
        result = E_UNKNOWN_COMMAND;
     }
 

-  if (E_OK == result)
+  if (item == 0)
+    {
+      result = E_BAD_STATE;
+    }
+  else if (E_OK == result)

     {
       /* Adjust the top row if it turns out that the current item unfortunately
          doesn't appear in the menu window */
     {
       /* Adjust the top row if it turns out that the current item unfortunately
          doesn't appear in the menu window */