X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=menu%2Fm_driver.c;h=8e72999b64c1d3a549cbd8cc1759ffeb26240f97;hp=dcc1c55d83a237d7c37716e6a0ff03f674bb0dd9;hb=c3b21f65a2687f3894a0d3217006c23f162c893a;hpb=c120fddebe9e9c1e2b29dbd744a6b1d03652bf8b diff --git a/menu/m_driver.c b/menu/m_driver.c index dcc1c55d..8e72999b 100644 --- a/menu/m_driver.c +++ b/menu/m_driver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 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 +37,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.32 2016/03/26 21:51:52 tom Exp $") /* Macros */ @@ -47,7 +47,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'; } /*--------------------------------------------------------------------------- @@ -530,7 +530,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