3 files changed, 49 insertions, 12 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 7c071f47..f8cc10b9 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -5275,6 +5275,11 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     "document.upload",
                     !equalCase_Rangecc(urlScheme_String(d->mod.url), "gemini") &&
                     !equalCase_Rangecc(urlScheme_String(d->mod.url), "titan"));
+                setMenuItemDisabled_Widget(
+                    d->menu,
+                    "document.upload copy:1",
+                    !equalCase_Rangecc(urlScheme_String(d->mod.url), "gemini") &&
+                        !equalCase_Rangecc(urlScheme_String(d->mod.url), "titan"));
             }
             processContextMenuEvent_Widget(d->menu, ev, {});
         }
diff --git a/src/ui/text.c b/src/ui/text.c
index 51531057..83e87d0c 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -295,6 +295,7 @@ static void setupFontVariants_Text_(iText *d, const iFontSpec *spec, int baseId)
         /* This is the highest priority override font. */
         d->overrideFontId = baseId;
     }
+    iAssert(activeText_ == d);
     pushBack_Array(&d->fontPriorityOrder, &(iPrioMapItem){ spec->priority, baseId });
     for (enum iFontStyle style = 0; style < max_FontStyle; style++) {
         for (enum iFontSize sizeId = 0; sizeId < max_FontSize; sizeId++) {            
@@ -499,10 +500,13 @@ static void resetCache_Text_(iText *d) {
 }
 
 void resetFonts_Text(iText *d) {
+    iText *oldActive = activeText_;
+    setCurrent_Text(d); /* some routines rely on the global `activeText_` pointer */
     deinitFonts_Text_(d);
     deinitCache_Text_(d);
     initCache_Text_(d);
     initFonts_Text_(d);
+    setCurrent_Text(oldActive);
 }
 
 static SDL_Palette *glyphPalette_(void) {
@@ -1476,14 +1480,14 @@ static void evenMonospaceAdvances_GlyphBuffer_(iGlyphBuffer *d, iFont *baseFont)
 }
 
 static iRect run_Font_(iFont *d, const iRunArgs *args) {
-    const int    mode       = args->mode;
-    const iInt2  orig       = args->pos;
-    iRect        bounds     = { orig, init_I2(0, d->height) };
-    float        xCursor    = 0.0f;
-    float        yCursor    = 0.0f;
-    float        xCursorMax = 0.0f;
-    const iBool  isMonospaced = isMonospaced_Font(d);
-    iWrapText *wrap = args->wrap;
+    const int   mode         = args->mode;
+    const iInt2 orig         = args->pos;
+    iRect       bounds       = { orig, init_I2(0, d->height) };
+    float       xCursor      = 0.0f;
+    float       yCursor      = 0.0f;
+    float       xCursorMax   = 0.0f;
+    const iBool isMonospaced = isMonospaced_Font(d);
+    iWrapText  *wrap         = args->wrap;
     iAssert(args->text.end >= args->text.start);
     /* Split the text into a number of attributed runs that specify exactly which
        font is used and other attributes such as color. (HarfBuzz shaping is done
diff --git a/src/ui/window.c b/src/ui/window.c
index bc32e479..0a97b97c 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -865,7 +865,7 @@ static iBool handleWindowEvent_MainWindow_(iMainWindow *d, const SDL_WindowEvent
             if (d->base.isMinimized) {
                 return iFalse;
             }
-            closePopups_App();
+            closePopups_App(iFalse);
             checkPixelRatioChange_Window_(as_Window(d));
             const iInt2 newPos = init_I2(ev->data1, ev->data2);
             if (isEqual_I2(newPos, init1_I2(-32000))) { /* magic! */
@@ -915,7 +915,7 @@ static iBool handleWindowEvent_MainWindow_(iMainWindow *d, const SDL_WindowEvent
                 // updateSize_Window_(d, iTrue);
                 return iTrue;
             }
-            closePopups_App();
+            closePopups_App(iFalse);
             if (unsnap_MainWindow_(d, NULL)) {
                 return iTrue;
             }
@@ -937,7 +937,7 @@ static iBool handleWindowEvent_MainWindow_(iMainWindow *d, const SDL_WindowEvent
             return iTrue;
         case SDL_WINDOWEVENT_MINIMIZED:
             d->base.isMinimized = iTrue;
-            closePopups_App();
+            closePopups_App(iTrue);
             return iTrue;
 #else /* if defined (!iPlatformDesktop) */
         case SDL_WINDOWEVENT_RESIZED:
@@ -973,7 +973,7 @@ static iBool handleWindowEvent_MainWindow_(iMainWindow *d, const SDL_WindowEvent
 #if !defined (iPlatformDesktop)
             setFreezeDraw_MainWindow(d, iTrue);
 #endif
-            closePopups_App();
+            closePopups_App(iTrue);
             return iFalse;
         case SDL_WINDOWEVENT_TAKE_FOCUS:
             SDL_SetWindowInputFocus(d->base.win);
@@ -1178,7 +1178,35 @@ iLocalDef iBool isEscapeKeypress_(const SDL_Event *ev) {
     return (ev->type == SDL_KEYDOWN || ev->type == SDL_KEYUP) && ev->key.keysym.sym == SDLK_ESCAPE;
 }
 
+static uint32_t windowId_SDLEvent_(const SDL_Event *ev) {
+    switch (ev->type) {
+        case SDL_MOUSEBUTTONDOWN:
+        case SDL_MOUSEBUTTONUP:
+            return ev->button.windowID;
+        case SDL_MOUSEMOTION:
+            return ev->motion.windowID;
+        case SDL_MOUSEWHEEL:
+            return ev->wheel.windowID;
+        case SDL_KEYDOWN:
+        case SDL_KEYUP:
+            return ev->key.windowID;
+        case SDL_TEXTINPUT:
+            return ev->text.windowID;
+        case SDL_USEREVENT:
+            return ev->user.windowID;
+        default:
+            return 0;
+    }
+}
+
 iBool dispatchEvent_Window(iWindow *d, const SDL_Event *ev) {
+#if 0
+    /* For the right window? */    
+    const uint32_t evWin = windowId_SDLEvent_(ev);
+    if (evWin && evWin != id_Window(d)) {
+        return iFalse; /* Meant for a different window. */
+    }
+#endif
     if (ev->type == SDL_MOUSEMOTION) {
         /* Hover widget may change. */
         setHover_Widget(NULL);