Fixed event processing for menus and dialogs

4 files changed, 52 insertions, 16 deletions

diff --git a/src/app.c b/src/app.c
index e0037f0c..6bf62dc7 100644
--- a/src/app.c
+++ b/src/app.c
@@ -241,10 +241,11 @@ const iString *execPath_App(void) {
     return executablePath_CommandLine(&app_.args);
 }
 
-void processEvents_App(void) {
+void processEvents_App(enum iAppEventMode eventMode) {
     iApp *d = &app_;
     SDL_Event ev;
-    while (SDL_WaitEvent(&ev)) {
+    while ((eventMode == waitForNewEvents_AppEventMode && SDL_WaitEvent(&ev)) ||
+           (eventMode == postedEventsOnly_AppEventMode && SDL_PollEvent(&ev))) {
         switch (ev.type) {
             case SDL_QUIT:
                 // if (isModified_Song(d->song)) {
@@ -303,7 +304,7 @@ static int run_App_(iApp *d) {
     SDL_EventState(SDL_DROPFILE, SDL_ENABLE); /* open files via drag'n'drop */
     while (d->running) {
         runTickers_App_(d);
-        processEvents_App(); /* may wait here for a while */
+        processEvents_App(waitForNewEvents_AppEventMode);
         refresh_App();
     }
     return 0;
@@ -429,14 +430,17 @@ iBool handleCommand_App(const char *cmd) {
                     d->historyPos = 0;
                 }
                 /* Insert new item. */
-                iHistoryItem item;
-                init_HistoryItem(&item);
-                set_String(&item.url, url);
-                pushBack_Array(&d->history, &item);
-                /* Don't make it too long. */
-                if (size_Array(&d->history) > historyMax_App_) {
-                    deinit_HistoryItem(front_Array(&d->history));
-                    remove_Array(&d->history, 0);
+                const iHistoryItem *lastItem = historyItem_App_(d, 0);
+                if (!lastItem || cmpString_String(&lastItem->url, url) != 0) {
+                    iHistoryItem item;
+                    init_HistoryItem(&item);
+                    set_String(&item.url, url);
+                    pushBack_Array(&d->history, &item);
+                    /* Don't make it too long. */
+                    if (size_Array(&d->history) > historyMax_App_) {
+                        deinit_HistoryItem(front_Array(&d->history));
+                        remove_Array(&d->history, 0);
+                    }
                 }
             }
         }
diff --git a/src/app.h b/src/app.h
index f4a2e18d..af0b6134 100644
--- a/src/app.h
+++ b/src/app.h
@@ -6,6 +6,11 @@
 
 iDeclareType(Window)
 
+enum iAppEventMode {
+    waitForNewEvents_AppEventMode,
+    postedEventsOnly_AppEventMode,
+};
+
 enum iUserEventCode {
     command_UserEventCode = 1,
     refresh_UserEventCode  = 2,
@@ -14,7 +19,7 @@ enum iUserEventCode {
 const iString *execPath_App     (void);
 
 int         run_App             (int argc, char **argv);
-void        processEvents_App   (void);
+void        processEvents_App   (enum iAppEventMode mode);
 void        refresh_App         (void);
 
 iAny *      findWidget_App      (const char *id);
diff --git a/src/ui/util.c b/src/ui/util.c
index 9487e004..8fc7f9e3 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -165,6 +165,7 @@ static iBool menuHandler_(iWidget *menu, const char *cmd) {
 
 iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) {
     iWidget *menu = new_Widget();
+    setFrameColor_Widget(menu, black_ColorId);
     setBackgroundColor_Widget(menu, gray25_ColorId);
     setFlags_Widget(menu,
                     keepOnTop_WidgetFlag | hidden_WidgetFlag | arrangeVertical_WidgetFlag |
@@ -194,7 +195,7 @@ iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) {
 
 void openMenu_Widget(iWidget *d, iInt2 coord) {
     /* Menu closes when commands are emitted, so handle any pending ones beforehand. */
-    processEvents_App();
+    processEvents_App(postedEventsOnly_AppEventMode);
     setFlags_Widget(d, hidden_WidgetFlag, iFalse);
     arrange_Widget(d);
     d->rect.pos = coord;
@@ -213,10 +214,27 @@ void openMenu_Widget(iWidget *d, iInt2 coord) {
     if (left_Rect(d->rect) < 0) {
         d->rect.pos.x = 0;
     }
+    refresh_App();
 }
 
 void closeMenu_Widget(iWidget *d) {
     setFlags_Widget(d, hidden_WidgetFlag, iTrue);
+    refresh_App();
+}
+
+int checkContextMenu_Widget(iWidget *menu, const SDL_Event *ev) {
+    if (ev->type == SDL_MOUSEBUTTONDOWN && ev->button.button == SDL_BUTTON_RIGHT) {
+        if (isVisible_Widget(menu)) {
+            closeMenu_Widget(menu);
+            return 0x1;
+        }
+        const iInt2 mousePos = init_I2(ev->button.x, ev->button.y);
+        if (contains_Widget(menu->parent, mousePos)) {
+            openMenu_Widget(menu, localCoord_Widget(menu->parent, mousePos));
+        }
+        return 0x2;
+    }
+    return 0;
 }
 
 iLabelWidget *makeMenuButton_LabelWidget(const char *label, const iMenuItem *items, size_t n) {
@@ -406,6 +424,7 @@ iBool filePathHandler_(iWidget *dlg, const char *cmd) {
 iWidget *makeSheet_Widget(const char *id) {
     iWidget *sheet = new_Widget();
     setId_Widget(sheet, id);
+    setFrameColor_Widget(sheet, black_ColorId);
     setBackgroundColor_Widget(sheet, gray25_ColorId);
     setFlags_Widget(sheet,
                     keepOnTop_WidgetFlag | arrangeVertical_WidgetFlag |
@@ -429,7 +448,7 @@ void makeFilePath_Widget(iWidget *      parent,
                          const char *   acceptLabel,
                          const char *   command) {
     setFocus_Widget(NULL);
-    processEvents_App();
+    processEvents_App(postedEventsOnly_AppEventMode);
     iWidget *dlg = makeSheet_Widget(command);
     setCommandHandler_Widget(dlg, filePathHandler_);
     addChild_Widget(parent, iClob(dlg));
@@ -487,7 +506,7 @@ iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
 iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, const char *title,
                                const char *prompt, const char *command) {
     setFocus_Widget(NULL);
-    processEvents_App();
+    processEvents_App(postedEventsOnly_AppEventMode);
     iWidget *dlg = makeSheet_Widget(command);
     setCommandHandler_Widget(dlg, valueInputHandler_);
     addChild_Widget(parent, iClob(dlg));
@@ -530,7 +549,7 @@ iWidget *makeQuestion_Widget(const char *title,
                              const char *labels[],
                              const char *commands[],
                              size_t      count) {
-    processEvents_App();
+    processEvents_App(postedEventsOnly_AppEventMode);
     iWidget *dlg = makeSheet_Widget("");
     setCommandHandler_Widget(dlg, messageHandler_);
     addChild_Widget(dlg, iClob(new_LabelWidget(title, 0, 0, NULL)));
diff --git a/src/ui/util.h b/src/ui/util.h
index 04683a2f..3181ea3f 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -82,6 +82,14 @@ iWidget *   makeMenu_Widget     (iWidget *parent, const iMenuItem *items, size_t
 void        openMenu_Widget     (iWidget *, iInt2 coord);
 void        closeMenu_Widget    (iWidget *);
 
+int         checkContextMenu_Widget   (iWidget *, const SDL_Event *ev); /* see macro below */
+
+#define processContextMenuEvent_Widget(menu, sdlEvent) \
+    for (const int result = checkContextMenu_Widget((menu), (sdlEvent));;) { \
+        if (result) return result >> 1; \
+        break; \
+    }
+
 iLabelWidget *  makeMenuButton_LabelWidget  (const char *label, const iMenuItem *items, size_t n);
 
 /*-----------------------------------------------------------------------------------------------*/