Minor tweaks

3 files changed, 16 insertions, 15 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 535a873e..a6fc39c5 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -413,8 +413,9 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                 pos.y += required - delta;
             }
         }
-        /* Save the document title. */
-        if (type == heading1_GmLineType && isEmpty_String(&d->title)) {
+        /* Save the document title (first high-level heading). */
+        if ((type == heading1_GmLineType || type == heading2_GmLineType) &&
+            isEmpty_String(&d->title)) {
             setRange_String(&d->title, line);
         }
         /* List bullet. */
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 2b6ee9f9..0d69861d 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -330,7 +330,7 @@ void submit_GmRequest(iGmRequest *d) {
             /* TODO: Check supported file types: images, audio */
             /* TODO: Detect text files based on contents? E.g., is the content valid UTF-8. */
             d->resp.statusCode = success_GmStatusCode;
-            if (endsWithCase_String(path, ".gmi")) {
+            if (endsWithCase_String(path, ".gmi") || endsWithCase_String(path, ".gemini")) {
                 setCStr_String(&d->resp.meta, "text/gemini; charset=utf-8");
             }
             else if (endsWithCase_String(path, ".txt")) {
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index b5fdde93..29803252 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1001,16 +1001,18 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return iTrue;
     }
     else if (equal_Command(cmd, "document.input.submit")) {
-        iString *value = collect_String(suffix_Command(cmd, "value"));
-        urlEncode_String(value);
-        iString *url = collect_String(copy_String(d->mod.url));
-        const size_t qPos = indexOfCStr_String(url, "?");
-        if (qPos != iInvalidPos) {
-            remove_Block(&url->chars, qPos, iInvalidSize);
+        if (arg_Command(cmd)) {
+            iString *value = collect_String(suffix_Command(cmd, "value"));
+            urlEncode_String(value);
+            iString *url = collect_String(copy_String(d->mod.url));
+            const size_t qPos = indexOfCStr_String(url, "?");
+            if (qPos != iInvalidPos) {
+                remove_Block(&url->chars, qPos, iInvalidSize);
+            }
+            appendCStr_String(url, "?");
+            append_String(url, value);
+            postCommandf_App("open url:%s", cstr_String(url));
         }
-        appendCStr_String(url, "?");
-        append_String(url, value);
-        postCommandf_App("open url:%s", cstr_String(url));
         return iTrue;
     }
     else if (equal_Command(cmd, "valueinput.cancelled") &&
@@ -1577,7 +1579,6 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
             }
         }
     }
-
 //    drawRect_Paint(&d->paint, (iRect){ visPos, run->bounds.size }, green_ColorId);
 //    drawRect_Paint(&d->paint, (iRect){ visPos, run->visBounds.size }, red_ColorId);
 }
@@ -1625,7 +1626,6 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
         const iRect visBufferRect = { zero_I2(), d->visBufferSize };
         iRect drawRect = visBufferRect;
         if (!isEmpty_Rangei_(intersect_Rangei_(visRange, d->visBufferValidRange))) {
-            const iRangei isct = intersect_Rangei_(visRange, d->visBufferValidRange);
             if (visRange.start < d->visBufferValidRange.start) {
                 drawRange = (iRangei){ visRange.start, d->visBufferValidRange.start };
             }
@@ -1652,7 +1652,7 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
         }
         if (!isEmpty_Range(&drawRange)) {
             setClip_Paint(p, drawRect);
-            fillRect_Paint(p, drawRect, vbDst == 1 ? blue_ColorId : red_ColorId); //tmBackground_ColorId);
+            fillRect_Paint(p, drawRect, tmBackground_ColorId); // vbDst == 1 ? blue_ColorId : red_ColorId
             render_GmDocument(d->doc, drawRange, drawRun_DrawContext_, &ctxStatic);
             unsetClip_Paint(p);
         }