1 files changed, 47 insertions, 39 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 70e66180..69dde8c7 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -60,8 +60,8 @@ struct Impl_MediaRequest {
 
 static void updated_MediaRequest_(iAnyObject *obj) {
     iMediaRequest *d = obj;
-        postCommandf_App("media.updated link:%u request:%p", d->linkId, d);
-    }
+    postCommandf_App("media.updated link:%u request:%p", d->linkId, d);
+}
 
 static void finished_MediaRequest_(iAnyObject *obj) {
     iMediaRequest *d = obj;
@@ -243,10 +243,11 @@ static void resetSmoothScroll_DocumentWidget_(iDocumentWidget *d) {
 }
 
 static int documentWidth_DocumentWidget_(const iDocumentWidget *d) {
-    const iWidget *w = constAs_Widget(d);
-    const iRect bounds = bounds_Widget(w);
+    const iWidget *w      = constAs_Widget(d);
+    const iRect    bounds = bounds_Widget(w);
+    const iPrefs * prefs  = prefs_App();
     return iMini(bounds.size.x - gap_UI * d->pageMargin * 2,
-                 fontSize_UI * 40 * zoom_App() / 100); /* TODO: Add user preference .*/
+                 fontSize_UI * prefs->lineWidth * prefs->zoomPercent / 100);
 }
 
 static iRect documentBounds_DocumentWidget_(const iDocumentWidget *d) {
@@ -369,9 +370,9 @@ static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) {
         if (d->hoverLink &&
             linkFlags_GmDocument(d->doc, d->hoverLink->linkId) & permanent_GmLinkFlag) {
             setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW); /* not dismissable */
+        }
     }
 }
-}
 
 static void updateVisible_DocumentWidget_(iDocumentWidget *d) {
     const iRangei visRange = visibleRange_DocumentWidget_(d);
@@ -573,7 +574,9 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
     if (category_GmStatusCode(statusCode) != categoryInput_GmStatusCode) {
         iString str;
         invalidate_DocumentWidget_(d);
-        updateTheme_DocumentWidget_(d);
+        if (document_App() == d) {
+            updateTheme_DocumentWidget_(d);
+        }
         clear_String(&d->sourceMime);
 //        set_Block(&d->sourceContent, &response->body);
         initBlock_String(&str, &response->body);
@@ -1208,7 +1211,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                 "document.request.cancelled doc:%p url:%s", d, cstr_String(d->mod.url));
             iReleasePtr(&d->request);
             if (d->state != ready_RequestState) {
-            d->state = ready_RequestState;
+                d->state = ready_RequestState;
                 postCommand_App("navigate.back");
             }
             updateFetchProgress_DocumentWidget_(d);
@@ -1256,9 +1259,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                 }
                 else if (startsWith_String(&d->sourceMime, "image/")) {
                     appendCStr_String(savePath, cstr_String(&d->sourceMime) + 6);
+                }
+            }
             if (fileExists_FileInfo(savePath)) {
-        }
-    }
                 /* Make it unique. */
                 iDate now;
                 initCurrent_Date(&now);
@@ -1550,38 +1553,39 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                 iArray items;
                 init_Array(&items, sizeof(iMenuItem));
                 if (d->contextLink) {
+                    const iString *linkUrl = linkUrl_GmDocument(d->doc, d->contextLink->linkId);
                     pushBackN_Array(
                         &items,
-                        (iMenuItem[]){ { "Open Link in New Tab",
+                        (iMenuItem[]){
+                            { "Open Link in New Tab",
                               0,
                               0,
-                              format_CStr("!open newtab:1 url:%s",
-                                          cstr_String(linkUrl_GmDocument(
-                                              d->doc, d->contextLink->linkId))) },
-                            { "---", 0, 0, NULL },
-                            { "Copy Link",
+                              format_CStr("!open newtab:1 url:%s", cstr_String(linkUrl)) },
+                            { "Open Link in Background Tab",
                               0,
                               0,
-                              "document.copylink" }},
-                        3);
+                              format_CStr("!open newtab:2 url:%s", cstr_String(linkUrl)) },
+                            { "---", 0, 0, NULL },
+                            { "Copy Link", 0, 0, "document.copylink" } },
+                        4);
                 }
                 else {
                     if (!isEmpty_Range(&d->selectMark)) {
-                pushBackN_Array(
-                    &items,
+                        pushBackN_Array(
+                            &items,
                             (iMenuItem[]){ { "Copy", 0, 0, "copy" }, { "---", 0, 0, NULL } },
                             2);
                     }
                     pushBackN_Array(
                         &items,
-                    (iMenuItem[]){
-                        { "Go Back", navigateBack_KeyShortcut, "navigate.back" },
-                        { "Go Forward", navigateForward_KeyShortcut, "navigate.forward" },
-                        { "Reload Page", reload_KeyShortcut, "navigate.reload" },
-                        { "---", 0, 0, NULL },
+                        (iMenuItem[]){
+                            { "Go Back", navigateBack_KeyShortcut, "navigate.back" },
+                            { "Go Forward", navigateForward_KeyShortcut, "navigate.forward" },
+                            { "Reload Page", reload_KeyShortcut, "navigate.reload" },
+                            { "---", 0, 0, NULL },
                             { "Copy Page URL", 0, 0, "document.copylink" },
                             { "---", 0, 0, NULL } },
-                    6);
+                        6);
                     if (isEmpty_Range(&d->selectMark)) {
                         pushBackN_Array(
                             &items,
@@ -1617,6 +1621,9 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             else if (loc) {
                 d->selectMark.end = loc;
             }
+//            printf("mark %zu ... %zu\n", d->selectMark.start - cstr_String(source_GmDocument(d->doc)),
+//                   d->selectMark.end - cstr_String(source_GmDocument(d->doc)));
+//            fflush(stdout);
             refresh_Widget(w);
             return iTrue;
         }
@@ -1702,7 +1709,8 @@ static void fillRange_DrawContext_(iDrawContext *d, const iGmRun *run, enum iCol
         /* Selection may be done in either direction. */
         iSwap(const char *, mark.start, mark.end);
     }
-    if ((!*isInside && contains_Range(&run->text, mark.start)) || *isInside) {
+    if ((!*isInside && (contains_Range(&run->text, mark.start) || mark.start == run->text.end)) ||
+        *isInside) {
         int x = 0;
         if (!*isInside) {
             x = advanceRange_Text(run->font, (iRangecc){ run->text.start, mark.start }).x;
@@ -1873,23 +1881,23 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                 (flags & (imageFileExtension_GmLinkFlag | audioFileExtension_GmLinkFlag) ||
                  showHost)) {
                 format_String(&str,
-                    " \u2014%s%s%s\r%c%s",
-                    showHost ? " " : "",
+                              " \u2014%s%s%s\r%c%s",
+                              showHost ? " " : "",
                               showHost ? (flags & mailto_GmLinkFlag
                                               ? cstr_String(url)
                                               : ~flags & gemini_GmLinkFlag
-                                    ? format_CStr("%s://%s",
-                                                  cstr_Rangecc(parts.scheme),
-                                                  cstr_Rangecc(parts.host))
-                                    : cstr_Rangecc(parts.host))
-                             : "",
-                    showHost && (showImage || showAudio) ? " \u2014" : "",
-                    showImage || showAudio
-                        ? asciiBase_ColorEscape + fg
+                                                    ? format_CStr("%s://%s",
+                                                                  cstr_Rangecc(parts.scheme),
+                                                                  cstr_Rangecc(parts.host))
+                                                    : cstr_Rangecc(parts.host))
+                                       : "",
+                              showHost && (showImage || showAudio) ? " \u2014" : "",
+                              showImage || showAudio
+                                  ? asciiBase_ColorEscape + fg
                                   : (asciiBase_ColorEscape +
                                      linkColor_GmDocument(doc, run->linkId, domain_GmLinkPart)),
-                    showImage ? " View Image \U0001f5bc"
-                              : showAudio ? " Play Audio \U0001f3b5" : "");
+                              showImage ? " View Image \U0001f5bc"
+                                        : showAudio ? " Play Audio \U0001f3b5" : "");
             }
             if (run->flags & endOfLine_GmRunFlag && flags & visited_GmLinkFlag) {
                 iDate date;