3 files changed, 98 insertions, 5 deletions

diff --git a/src/macos.m b/src/macos.m
index cec53a7d..d9ee71e7 100644
--- a/src/macos.m
+++ b/src/macos.m
@@ -524,26 +524,53 @@ void removeMenu_MacOS(int atIndex) {
     [appMenu removeItemAtIndex:atIndex];
 }
 
+enum iColorId removeColorEscapes_String(iString *d) {
+    enum iColorId color = none_ColorId;
+    for (;;) {
+        const char *esc = strchr(cstr_String(d), '\v');
+        if (esc) {
+            const char *ptr = esc + 1;
+            color = 0;
+            if (*ptr == '\v') {
+                color += asciiExtended_ColorEscape;
+                ptr++;
+            }
+            color += *ptr - asciiBase_ColorEscape;
+            ptr++;
+            remove_Block(&d->chars, esc - cstr_String(d), ptr - esc);
+        }
+        else break;
+    }
+    return color;
+}
+
 static void makeMenuItems_(NSMenu *menu, MenuCommands *commands, const iMenuItem *items, size_t n) {
     for (size_t i = 0; i < n && items[i].label; ++i) {
         const char *label = translateCStr_Lang(items[i].label);
-        if (label[0] == '\v') {
-            /* Skip the formatting escape. */
-            label += 2;
-        }
         if (equal_CStr(label, "---")) {
             [menu addItem:[NSMenuItem separatorItem]];
         }
         else {
             const iBool hasCommand = (items[i].command && items[i].command[0]);
+            iBool isChecked = iFalse;
+            if (startsWith_CStr(label, "###")) {
+                isChecked = iTrue;
+                label += 3;
+            }
             iString itemTitle;
             initCStr_String(&itemTitle, label);
             removeIconPrefix_String(&itemTitle);
+            if (removeColorEscapes_String(&itemTitle) == uiTextCaution_ColorId) {
+//                prependCStr_String(&itemTitle, "\u26a0\ufe0f ");
+            }
             NSMenuItem *item = [menu addItemWithTitle:[NSString stringWithUTF8String:cstr_String(&itemTitle)]
                                                action:(hasCommand ? @selector(postMenuItemCommand:) : nil)
                                         keyEquivalent:@""];
             deinit_String(&itemTitle);
             [item setTarget:commands];
+            if (isChecked) {
+                [item setState:NSControlStateValueOn];
+            }
             int key   = items[i].key;
             int kmods = items[i].kmods;
             if (hasCommand) {
diff --git a/src/ui/util.c b/src/ui/util.c
index 0baf541d..a5b1cfb3 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -872,6 +872,36 @@ static void updateMenuItemFonts_Widget_(iWidget *d) {
     }
 }
 
+iMenuItem *findNativeMenuItem_Widget(iWidget *menu, const char *commandSuffix) {
+    iAssert(flags_Widget(menu) & nativeMenu_WidgetFlag);
+    iForEach(Array, i, userData_Object(menu)) {
+        iMenuItem *item = i.value;
+        if (item->command && endsWith_Rangecc(range_CStr(item->command), commandSuffix)) {
+            return item;
+        }
+    }
+    return NULL;
+}
+
+void setSelected_NativeMenuItem(iMenuItem *item, iBool isSelected) {
+    if (!item->label) {
+        return;
+    }
+    const iBool hasPrefix = startsWith_CStr(item->label, "###");
+    if (hasPrefix && !isSelected) {
+        char *label = strdup(item->label + 3);
+        free((char *) item->label);
+        item->label = label;
+    }
+    else if (!hasPrefix && isSelected) {
+        char *label = malloc(strlen(item->label) + 4);
+        memcpy(label, "###", 3);
+        strcpy(label + 3, item->label);
+        free((char *) item->label);
+        item->label = label;
+    }
+}
+
 void updateMenuItemLabel_Widget(iWidget *menu, const char *command, const char *newLabel) {
     if (~flags_Widget(menu) & nativeMenu_WidgetFlag) {
         iLabelWidget *menuItem = findMenuItem_Widget(menu, command);
@@ -894,6 +924,14 @@ void updateMenuItemLabel_Widget(iWidget *menu, const char *command, const char *
     }
 }
 
+void unselectAllNativeMenuItems_Widget(iWidget *menu) {
+    iArray *items = userData_Object(menu);
+    iAssert(items);
+    iForEach(Array, i, items) {
+        setSelected_NativeMenuItem(i.value, iFalse);
+    }
+}
+
 iLocalDef iBool isUsingMenuPopupWindows_(void) {
     return deviceType_App() == desktop_AppDeviceType;
 }
@@ -915,7 +953,7 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, iBool postCommands) {
     const iArray *items = userData_Object(d);
     iAssert(flags_Widget(d) & nativeMenu_WidgetFlag);
     iAssert(items);
-    showPopupMenu_MacOS(d, mouseCoord_Window(get_Window(), 0),
+    showPopupMenu_MacOS(d, windowCoord, //mouseCoord_Window(get_Window(), 0),
                         constData_Array(items), size_Array(items));
 #else
     const iRect rootRect        = rect_Root(d->root);
@@ -1075,8 +1113,34 @@ iLabelWidget *makeMenuButton_LabelWidget(const char *label, const iMenuItem *ite
     return button;
 }
 
+const iString *removeMenuItemLabelPrefixes_String(const iString *d) {
+    iString *str = copy_String(d);
+    for (;;) {
+        if (startsWith_String(str, "###")) {
+            remove_Block(&str->chars, 0, 3);
+            continue;
+        }
+        if (startsWith_String(str, "```")) {
+            remove_Block(&str->chars, 0, 3);
+            continue;
+        }
+        break;
+    }
+    return collect_String(str);
+}
+
 void updateDropdownSelection_LabelWidget(iLabelWidget *dropButton, const char *selectedCommand) {
     iWidget *menu = findChild_Widget(as_Widget(dropButton), "menu");
+    if (flags_Widget(menu) & nativeMenu_WidgetFlag) {
+        unselectAllNativeMenuItems_Widget(menu);
+        iMenuItem *item = findNativeMenuItem_Widget(menu, selectedCommand);
+        if (item) {
+            setSelected_NativeMenuItem(item, iTrue);
+            updateText_LabelWidget(dropButton,
+                                   removeMenuItemLabelPrefixes_String(collectNewCStr_String(item->label)));
+        }
+        return;
+    }
     iForEach(ObjectList, i, children_Widget(menu)) {
         if (isInstance_Object(i.object, &Class_LabelWidget)) {
             iLabelWidget *item = i.object;
diff --git a/src/ui/util.h b/src/ui/util.h
index d929143f..a1914e2a 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -234,10 +234,12 @@ void        closeMenu_Widget        (iWidget *);
 void        releaseNativeMenu_Widget(iWidget *);
 
 size_t      findWidestLabel_MenuItem        (const iMenuItem *items, size_t num);
+void        setSelected_NativeMenuItem      (iMenuItem *item, iBool isSelected);
 
 iChar       removeIconPrefix_String (iString *);
 
 iLabelWidget *  findMenuItem_Widget         (iWidget *menu, const char *command);
+iMenuItem *     findNativeMenuItem_Widget   (iWidget *menu, const char *commandSuffix);
 void            setMenuItemDisabled_Widget  (iWidget *menu, const char *command, iBool disable);
 void            updateMenuItemLabel_Widget  (iWidget *menu, const char *command, const char *newLabel);