3 files changed, 13 insertions, 1 deletions

diff --git a/src/ui/util.c b/src/ui/util.c
index 0af33138..e055244b 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -201,7 +201,8 @@ static iBool menuHandler_(iWidget *menu, const char *cmd) {
             /* Don't reopen self; instead, root will close the menu. */
             return iFalse;
         }
-        if (equal_Command(cmd, "mouse.clicked") && arg_Command(cmd)) {
+        if ((equal_Command(cmd, "mouse.clicked") || equal_Command(cmd, "mouse.missed")) &&
+            arg_Command(cmd)) {
             /* Dismiss open menus when clicking outside them. */
             closeMenu_Widget(menu);
             return iTrue;
@@ -252,6 +253,7 @@ void openMenu_Widget(iWidget *d, iInt2 coord) {
     postCommand_App("cancel"); /* dismiss any other menus */
     processEvents_App(postedEventsOnly_AppEventMode);
     setFlags_Widget(d, hidden_WidgetFlag, iFalse);
+    setFlags_Widget(d, commandOnMouseMiss_WidgetFlag, iTrue);
     setFlags_Widget(findChild_Widget(d, "menu.cancel"), disabled_WidgetFlag, iFalse);
     arrange_Widget(d);
     d->rect.pos = coord;
diff --git a/src/ui/widget.c b/src/ui/widget.c
index d3f28b08..05bb62cc 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -542,6 +542,15 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
             break;
         }
     }
+    if (d->flags & commandOnMouseMiss_WidgetFlag && ev->type == SDL_MOUSEBUTTONDOWN &&
+        !contains_Widget(d, init_I2(ev->button.x, ev->button.y))) {
+        postCommand_Widget(d,
+                           "mouse.missed arg:%d button:%d coord:%d %d",
+                           ev->type == SDL_MOUSEBUTTONDOWN ? 1 : 0,
+                           ev->button.button,
+                           ev->button.x,
+                           ev->button.y);
+    }
     if (d->flags & mouseModal_WidgetFlag && isMouseEvent_(ev)) {
         setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
         return iTrue;
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 25208c30..fa4fbe0f 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -58,6 +58,7 @@ enum iWidgetFlag {
     tight_WidgetFlag          = iBit(12), /* smaller padding */
     keepOnTop_WidgetFlag      = iBit(13), /* gets events first; drawn last */
     mouseModal_WidgetFlag     = iBit(14), /* eats all unprocessed mouse events */
+    commandOnMouseMiss_WidgetFlag = iBit(15),
     /* arrange behavior */
     fixedPosition_WidgetFlag               = iBit(16),
     arrangeHorizontal_WidgetFlag           = iBit(17), /* arrange children horizontally */