5 files changed, 64 insertions, 6 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 53eb06bd..c8daa2e2 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -297,9 +297,46 @@ static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
     if (isEmpty_StringArray(title)) {
         pushBackCStr_StringArray(title, "Lagrange");
     }
-    const iString *text = collect_String(joinCStr_StringArray(title, " \u2014 "));
-    setTitle_Window(get_Window(), text);
-    setTabPageLabel_Widget(findWidget_App("doctabs"), d, text);
+    /* Take away parts if it doesn't fit. */
+    iLabelWidget *tabButton = tabPageButton_Widget(findWidget_App("doctabs"), d);
+    const int avail = bounds_Widget(as_Widget(tabButton)).size.x - 3 * gap_UI;
+    iBool setWindow = (document_App() == d);
+    for (;;) {
+        iString *text = collect_String(joinCStr_StringArray(title, " \u2014 "));
+        if (setWindow) {
+            /* Longest version for the window title, and omit the icon. */
+            setTitle_Window(get_Window(), text);
+            setWindow = iFalse;
+        }
+        const iChar siteIcon = siteIcon_GmDocument(d->doc);
+        if (siteIcon) {
+            if (!isEmpty_String(text)) {
+                prependCStr_String(text, " ");
+            }
+            prependChar_String(text, siteIcon);
+        }
+        const int width = advanceRange_Text(default_FontId, range_String(text)).x;
+        if (width <= avail ||
+            isEmpty_StringArray(title)) {
+            updateText_LabelWidget(tabButton, text);
+            break;
+        }
+        if (size_StringArray(title) == 1) {
+            /* Just truncate to fit. */
+            const char *endPos;
+            tryAdvanceNoWrap_Text(default_FontId,
+                                  range_String(text),
+                                  avail - advance_Text(default_FontId, "...").x,
+                                  &endPos);
+            updateText_LabelWidget(
+                tabButton,
+                collectNewFormat_String("%s...",
+                                        cstrCollect_String(newRange_String(
+                                            (iRangecc){ constBegin_String(text), endPos }))));
+            break;
+        }
+        remove_StringArray(title, size_StringArray(title) - 1);
+    }
 }
 
 static void setSource_DocumentWidget_(iDocumentWidget *d, const iString *source) {
@@ -446,6 +483,10 @@ iHistory *history_DocumentWidget(iDocumentWidget *d) {
     return d->history;
 }
 
+const iString *url_DocumentWidget(const iDocumentWidget *d) {
+    return d->url;
+}
+
 void setUrlFromCache_DocumentWidget(iDocumentWidget *d, const iString *url, iBool isFromCache) {
     if (cmpStringSc_String(d->url, url, &iCaseInsensitive)) {
         set_String(d->url, url);
@@ -710,12 +751,14 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             }
         }
         refresh_Widget(w);
+        updateWindowTitle_DocumentWidget_(d);
     }
     else if (equal_Command(cmd, "tabs.changed")) {
         if (cmp_String(id_Widget(w), suffixPtr_Command(cmd, "id")) == 0) {
             /* Set palette for our document. */
             updateTheme_DocumentWidget_(d);
         }
+        updateWindowTitle_DocumentWidget_(d);
         return iFalse;
     }
     else if (equal_Command(cmd, "server.showcert")) {
diff --git a/src/ui/documentwidget.h b/src/ui/documentwidget.h
index 5ce28f4e..38fcf8e3 100644
--- a/src/ui/documentwidget.h
+++ b/src/ui/documentwidget.h
@@ -13,4 +13,5 @@ void    setUrl_DocumentWidget           (iDocumentWidget *, const iString *url);
 void    setUrlFromCache_DocumentWidget  (iDocumentWidget *d, const iString *url, iBool isFromCache);
 void    setInitialScroll_DocumentWidget (iDocumentWidget *, int scrollY); /* set after content received */
 
-iBool   isRequestOngoing_DocumentWidget (const iDocumentWidget *);
+const iString * url_DocumentWidget              (const iDocumentWidget *);
+iBool           isRequestOngoing_DocumentWidget (const iDocumentWidget *);
diff --git a/src/ui/util.c b/src/ui/util.c
index 40debd28..9ac1913d 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -317,7 +317,8 @@ static void addTabPage_Widget_(iWidget *tabs, enum iWidgetAddPos addPos, iWidget
         findChild_Widget(tabs, "tabs.buttons"),
         iClob(new_LabelWidget(label, key, kmods, format_CStr("tabs.switch page:%p", page))),
         addPos);
-    setFlags_Widget(button, selected_WidgetFlag | expand_WidgetFlag, isSel);
+    setFlags_Widget(button, selected_WidgetFlag, isSel);
+    setFlags_Widget(button, expand_WidgetFlag, iTrue);
     addChildPos_Widget(pages, page, addPos);
     setFlags_Widget(page, hidden_WidgetFlag | disabled_WidgetFlag, !isSel);
 }
@@ -383,6 +384,10 @@ void showTabPage_Widget(iWidget *tabs, const iWidget *page) {
     }
 }
 
+iLabelWidget *tabPageButton_Widget(iWidget *tabs, const iAnyObject *page) {
+    return tabButtonForPage_Widget_(tabs, page);
+}
+
 void setTabPageLabel_Widget(iWidget *tabs, const iAnyObject *page, const iString *label) {
     iLabelWidget *button = tabButtonForPage_Widget_(tabs, page);
     setText_LabelWidget(button, label);
diff --git a/src/ui/util.h b/src/ui/util.h
index 6eeea11d..6e210422 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -98,6 +98,7 @@ iWidget *   makeTabs_Widget         (iWidget *parent);
 void        appendTabPage_Widget    (iWidget *tabs, iWidget *page, const char *label, int key, int kmods);
 void        prependTabPage_Widget   (iWidget *tabs, iWidget *page, const char *label, int key, int kmods);
 iWidget *   tabPage_Widget          (iWidget *tabs, size_t index);
+iLabelWidget *tabPageButton_Widget  (iWidget *tabs, const iAnyObject *page);
 iWidget *   removeTabPage_Widget    (iWidget *tabs, size_t index); /* returns the page */
 void        showTabPage_Widget      (iWidget *tabs, const iWidget *page);
 void        setTabPageLabel_Widget  (iWidget *tabs, const iAnyObject *page, const iString *label);
diff --git a/src/ui/window.c b/src/ui/window.c
index 1f05b80d..bc690426 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -133,6 +133,13 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
             }
         }
     }
+    else if (equal_Command(cmd, "tabs.changed")) {
+        /* Update navbar according to the current tab. */
+        iDocumentWidget *doc = document_App();
+        setText_InputWidget(findWidget_App("url"), url_DocumentWidget(doc));
+        updateTextCStr_LabelWidget(findChild_Widget(navBar, "reload"),
+                                   isRequestOngoing_DocumentWidget(doc) ? stopCStr_ : reloadCStr_);
+    }
     else if (equal_Command(cmd, "navigate.reload")) {
         iDocumentWidget *doc = document_Command(cmd);
         if (isRequestOngoing_DocumentWidget(doc)) {
@@ -409,7 +416,8 @@ static void setupUserInterface_Window(iWindow *d) {
     }
 #endif
     /* Glboal keyboard shortcuts. */ {
-        // addAction_Widget(d->root, SDLK_LEFTBRACKET, KMOD_SHIFT | KMOD_PRIMARY, "tabs.prev");
+        addAction_Widget(d->root, SDLK_LEFTBRACKET, KMOD_SHIFT | KMOD_PRIMARY, "tabs.prev");
+        addAction_Widget(d->root, SDLK_RIGHTBRACKET, KMOD_SHIFT | KMOD_PRIMARY, "tabs.next");
         addAction_Widget(d->root, 'l', KMOD_PRIMARY, "focus.set id:url");
         addAction_Widget(d->root, 'f', KMOD_PRIMARY, "focus.set id:find.input");
     }