4 files changed, 54 insertions, 39 deletions

diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index a40b77eb..a1635128 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -74,6 +74,7 @@ enum iInputWidgetFlag {
     eatEscape_InputWidgetFlag        = iBit(6),
     isMarking_InputWidgetFlag        = iBit(7),
     markWords_InputWidgetFlag        = iBit(8),
+    needUpdateBuffer_InputWidgetFlag = iBit(9),
 };
 
 struct Impl_InputWidget {
@@ -301,29 +302,29 @@ static iString *visText_InputWidget_(const iInputWidget *d) {
 }
 
 static void updateBuffered_InputWidget_(iInputWidget *d) {
-    if (isExposed_Window(get_Window())) {
-        invalidateBuffered_InputWidget_(d);
-        iString *bufText = NULL;
-        if (d->inFlags & isUrl_InputWidgetFlag) {
-            /* Highlight the host name. */
-            iUrl parts;
-            const iString *text = collect_String(utf32toUtf8_InputWidget_(d));
-            init_Url(&parts, text);
-            if (!isEmpty_Range(&parts.host)) {
-                bufText = new_String();
-                appendRange_String(bufText, (iRangecc){ constBegin_String(text), parts.host.start });
-                appendCStr_String(bufText, uiTextStrong_ColorEscape);
-                appendRange_String(bufText, parts.host);
-                appendCStr_String(bufText, restore_ColorEscape);
-                appendRange_String(bufText, (iRangecc){ parts.host.end, constEnd_String(text) });
-            }
-        }
-        if (!bufText) {
-            bufText = visText_InputWidget_(d);
+    iWindow *win = get_Window();
+    invalidateBuffered_InputWidget_(d);
+    iString *bufText = NULL;
+    if (d->inFlags & isUrl_InputWidgetFlag && as_Widget(d)->root == win->keyRoot) {
+        /* Highlight the host name. */
+        iUrl parts;
+        const iString *text = collect_String(utf32toUtf8_InputWidget_(d));
+        init_Url(&parts, text);
+        if (!isEmpty_Range(&parts.host)) {
+            bufText = new_String();
+            appendRange_String(bufText, (iRangecc){ constBegin_String(text), parts.host.start });
+            appendCStr_String(bufText, uiTextStrong_ColorEscape);
+            appendRange_String(bufText, parts.host);
+            appendCStr_String(bufText, restore_ColorEscape);
+            appendRange_String(bufText, (iRangecc){ parts.host.end, constEnd_String(text) });
         }
-        d->buffered = new_TextBuf(d->font, uiInputText_ColorId, cstr_String(bufText));
-        delete_String(bufText);
     }
+    if (!bufText) {
+        bufText = visText_InputWidget_(d);
+    }
+    d->buffered = new_TextBuf(d->font, uiInputText_ColorId, cstr_String(bufText));
+    delete_String(bufText);
+    d->inFlags &= ~needUpdateBuffer_InputWidgetFlag;
 }
 
 void setText_InputWidget(iInputWidget *d, const iString *text) {
@@ -356,7 +357,7 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
         iZap(d->mark);
     }
     if (!isFocused_Widget(d)) {
-        updateBuffered_InputWidget_(d);
+        d->inFlags |= needUpdateBuffer_InputWidgetFlag;
     }
     refresh_Widget(as_Widget(d));
 }
@@ -428,7 +429,7 @@ void end_InputWidget(iInputWidget *d, iBool accept) {
     if (!accept) {
         setCopy_Array(&d->text, &d->oldText);
     }
-    updateBuffered_InputWidget_(d);
+    d->inFlags |= needUpdateBuffer_InputWidgetFlag;
     SDL_RemoveTimer(d->timer);
     d->timer = 0;
     SDL_StopTextInput();
@@ -705,6 +706,9 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         begin_InputWidget(d);
         return iFalse;
     }
+    else if (isCommand_UserEvent(ev, "keyroot.changed")) {
+        d->inFlags |= needUpdateBuffer_InputWidgetFlag;
+    }
     else if (isCommand_UserEvent(ev, "lang.changed")) {
         set_String(&d->hint, &d->srcHint);
         translate_Lang(&d->hint);
@@ -725,7 +729,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
     }
     else if (isCommand_UserEvent(ev, "theme.changed")) {
         if (d->buffered) {
-            updateBuffered_InputWidget_(d);
+            d->inFlags |= needUpdateBuffer_InputWidgetFlag;
         }
         return iFalse;
     }
@@ -1004,6 +1008,9 @@ static void draw_InputWidget_(const iInputWidget *d) {
     const iBool    isFocused = isFocused_Widget(w);
     const iBool    isHover   = isHover_Widget(w) &&
                                contains_Widget(w, mouseCoord_Window(get_Window()));
+    if (d->inFlags & needUpdateBuffer_InputWidgetFlag) {
+        updateBuffered_InputWidget_(iConstCast(iInputWidget *, d));
+    }
     iPaint p;
     init_Paint(&p);
     iString *text = visText_InputWidget_(d);
diff --git a/src/ui/root.c b/src/ui/root.c
index 35eb84ef..548c0ca8 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -655,7 +655,7 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
         /* React to the current document only. */
         if (document_Command(cmd) == document_App()) {
             if (equal_Command(cmd, "document.changed")) {
-                iInputWidget *url = findWidget_App("url");
+                iInputWidget *url = findWidget_Root("url");
                 const iString *urlStr = collect_String(suffix_Command(cmd, "url"));
                 trimCache_App();
                 visitUrl_Visited(visited_App(), withSpacesEncoded_String(urlStr), 0); /* TODO: internal URI normalization */
diff --git a/src/ui/text.c b/src/ui/text.c
index e0aafc33..34e20bf1 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -1445,20 +1445,27 @@ void init_TextBuf(iTextBuf *d, int font, int color, const char *text) {
     SDL_Renderer *render = text_.render;
     d->size    = advance_Text(font, text);
     SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "0");
-    d->texture = SDL_CreateTexture(render,
-                                   SDL_PIXELFORMAT_RGBA4444,
-                                   SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET,
-                                   d->size.x,
-                                   d->size.y);
-    SDL_Texture *oldTarget = SDL_GetRenderTarget(render);
-    SDL_SetRenderTarget(render, d->texture);
-    SDL_SetTextureBlendMode(text_.cache, SDL_BLENDMODE_NONE); /* blended when TextBuf is drawn */
-    SDL_SetRenderDrawColor(text_.render, 0, 0, 0, 0);
-    SDL_RenderClear(text_.render);
-    draw_Text_(font, zero_I2(), color | fillBackground_ColorId, range_CStr(text));
-    SDL_SetTextureBlendMode(text_.cache, SDL_BLENDMODE_BLEND);
-    SDL_SetRenderTarget(render, oldTarget);
-    SDL_SetTextureBlendMode(d->texture, SDL_BLENDMODE_BLEND);
+    if (d->size.x * d->size.y) {
+        d->texture = SDL_CreateTexture(render,
+                                       SDL_PIXELFORMAT_RGBA4444,
+                                       SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET,
+                                       d->size.x,
+                                       d->size.y);
+    }
+    else {
+        d->texture = NULL;
+    }
+    if (d->texture) {
+        SDL_Texture *oldTarget = SDL_GetRenderTarget(render);
+        SDL_SetRenderTarget(render, d->texture);
+        SDL_SetTextureBlendMode(text_.cache, SDL_BLENDMODE_NONE); /* blended when TextBuf is drawn */
+        SDL_SetRenderDrawColor(text_.render, 0, 0, 0, 0);
+        SDL_RenderClear(text_.render);
+        draw_Text_(font, zero_I2(), color | fillBackground_ColorId, range_CStr(text));
+        SDL_SetTextureBlendMode(text_.cache, SDL_BLENDMODE_BLEND);
+        SDL_SetRenderTarget(render, oldTarget);
+        SDL_SetTextureBlendMode(d->texture, SDL_BLENDMODE_BLEND);
+    }
 }
 
 void deinit_TextBuf(iTextBuf *d) {
diff --git a/src/ui/window.c b/src/ui/window.c
index 704e6f2a..61851ca5 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -903,6 +903,7 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
 iBool setKeyRoot_Window(iWindow *d, iRoot *root) {
     if (d->keyRoot != root) {
         d->keyRoot = root;
+        postCommand_App("keyroot.changed");
         postRefresh_App();
         return iTrue;
     }