8 files changed, 185 insertions, 22 deletions

diff --git a/src/gmrequest.c b/src/gmrequest.c
index 2471f311..cd193627 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -629,7 +629,7 @@ void submit_GmRequest(iGmRequest *d) {
     iGmResponse *resp = d->resp;
     clear_GmResponse(resp);
 #if !defined (NDEBUG)
-    printf("[GmRequest] URL: %s\n", cstr_String(&d->url));
+    printf("[GmRequest] URL: %s\n", cstr_String(&d->url)); fflush(stdout);
 #endif
     iUrl url;
     init_Url(&url, &d->url);
@@ -901,10 +901,11 @@ void submit_GmRequest(iGmRequest *d) {
     /* Titan requests can have an arbitrary payload. */
     if (isTitan_GmRequest_(d)) {
         iBlock content;
-        initCopy_Block(&content, utf8_String(&d->url));
+        init_Block(&content, 0);
         if (d->titan) {
             printf_Block(&content,
-                         ";mime=%s;size=%zu",
+                         "%s;mime=%s;size=%zu",
+                         cstr_String(&d->url),
                          cstr_String(&d->titan->mime),
                          size_Block(&d->titan->data));
             if (!isEmpty_String(&d->titan->token)) {
@@ -917,7 +918,8 @@ void submit_GmRequest(iGmRequest *d) {
         }
         else {
             /* Empty data. */
-            appendCStr_Block(&content, ";mime=application/octet-stream;size=0\r\n");
+            printf_Block(
+                &content, "%s;mime=application/octet-stream;size=0\r\n", cstr_String(&d->url));
         }
         setContent_TlsRequest(d->req, &content);
         deinit_Block(&content);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 8072a025..0c4dee89 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -48,6 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "scrollwidget.h"
 #include "touch.h"
 #include "translation.h"
+#include "uploadwidget.h"
 #include "util.h"
 #include "visbuf.h"
 #include "visited.h"
@@ -2426,6 +2427,24 @@ static iBool handleSwipe_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
     return iFalse;
 }
 
+static iBool cancelRequest_DocumentWidget_(iDocumentWidget *d, iBool postBack) {
+    if (d->request) {
+        iWidget *w = as_Widget(d);
+        postCommandf_Root(w->root,
+                          "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;
+            if (postBack) {
+                postCommand_Root(w->root, "navigate.back");
+            }
+        }
+        updateFetchProgress_DocumentWidget_(d);
+        return iTrue;
+    }
+    return iFalse;
+}
+
 static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
     iWidget *w = as_Widget(d);
     if (equal_Command(cmd, "document.openurls.changed")) {
@@ -2792,6 +2811,18 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         }
         return wasHandled;
     }
+    else if (equal_Command(cmd, "document.upload") && d == document_App()) {
+        if (equalCase_Rangecc(urlScheme_String(d->mod.url), "gemini") ||
+            equalCase_Rangecc(urlScheme_String(d->mod.url), "titan")) {
+            iUploadWidget *upload = new_UploadWidget();
+            setUrl_UploadWidget(upload, d->mod.url);
+            setResponseViewer_UploadWidget(upload, d);
+            addChild_Widget(get_Root()->widget, iClob(upload));
+            finalizeSheet_Mobile(as_Widget(upload));
+            postRefresh_App();
+        }
+        return iTrue;
+    }
     else if (equal_Command(cmd, "media.updated") || equal_Command(cmd, "media.finished")) {
         return handleMediaCommand_DocumentWidget_(d, cmd);
     }
@@ -2812,15 +2843,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return iFalse;
     }
     else if (equal_Command(cmd, "document.stop") && document_App() == d) {
-        if (d->request) {
-            postCommandf_Root(w->root,
-                "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;
-                postCommand_Root(w->root, "navigate.back");
-            }
-            updateFetchProgress_DocumentWidget_(d);
+        if (cancelRequest_DocumentWidget_(d, iTrue /* navigate back */)) {
             return iTrue;
         }
     }
@@ -3613,6 +3636,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             { "---", 0, 0, NULL },
                             { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
                             { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
+                            { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" },
                             { "---", 0, 0, NULL },
                             { "${menu.page.copyurl}", 0, 0, "document.copylink" } },
                         15);
@@ -3642,6 +3666,11 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                 }
                 d->menu = makeMenu_Widget(w, data_Array(&items), size_Array(&items));
                 deinit_Array(&items);
+                setMenuItemDisabled_Widget(
+                    d->menu,
+                    "document.upload",
+                    !equalCase_Rangecc(urlScheme_String(d->mod.url), "gemini") &&
+                    !equalCase_Rangecc(urlScheme_String(d->mod.url), "titan"));
             }
             processContextMenuEvent_Widget(d->menu, ev, {});
         }
@@ -5004,6 +5033,22 @@ iBool isRequestOngoing_DocumentWidget(const iDocumentWidget *d) {
     return d->request != NULL;
 }
 
+void takeRequest_DocumentWidget(iDocumentWidget *d, iGmRequest *finishedRequest) {
+    cancelRequest_DocumentWidget_(d, iFalse /* don't post anything */);
+    const iString *url = url_GmRequest(finishedRequest);
+    
+    add_History(d->mod.history, url);
+    setUrl_DocumentWidget_(d, url);
+    d->state = fetching_RequestState;
+    iAssert(d->request == NULL);
+    d->request = finishedRequest;
+    postCommand_Widget(d,
+                       "document.request.finished doc:%p reqid:%u request:%p",
+                       d,
+                       id_GmRequest(d->request),
+                       d->request);
+}
+
 void updateSize_DocumentWidget(iDocumentWidget *d) {
     updateDocumentWidthRetainingScrollPosition_DocumentWidget_(d, iFalse);
     resetWideRuns_DocumentWidget_(d);
diff --git a/src/ui/documentwidget.h b/src/ui/documentwidget.h
index 1921b25a..cc09c72d 100644
--- a/src/ui/documentwidget.h
+++ b/src/ui/documentwidget.h
@@ -26,6 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/stream.h>
 
 iDeclareType(GmDocument)
+iDeclareType(GmRequest)
 iDeclareType(History)
 
 iDeclareWidgetClass(DocumentWidget)
@@ -58,4 +59,6 @@ void    setRedirectCount_DocumentWidget (iDocumentWidget *, int count);
 void    setSource_DocumentWidget        (iDocumentWidget *, const iString *sourceText);
 void    setOpenedFromSidebar_DocumentWidget(iDocumentWidget *, iBool fromSidebar);
 
+void    takeRequest_DocumentWidget      (iDocumentWidget *, iGmRequest *finishedRequest); /* ownership given */
+
 void    updateSize_DocumentWidget       (iDocumentWidget *);
diff --git a/src/ui/keys.c b/src/ui/keys.c
index 5fcfbea2..6de30f57 100644
--- a/src/ui/keys.c
+++ b/src/ui/keys.c
@@ -238,6 +238,7 @@ static const struct { int id; iMenuItem bind; int flags; } defaultBindings_[] =
     { 99, { "${keys.split.item} ${menu.split.vertical} 2:1",    SDLK_r, 0,  "ui.split arg:2 axis:1",            }, noDirectTrigger_BindFlag },
     { 100,{ "${keys.hoverurl}",             '/', KMOD_PRIMARY,              "prefs.hoverlink.toggle"            }, 0 },
     { 110,{ "${menu.save.downloads}",       SDLK_s, KMOD_PRIMARY,           "document.save"                     }, 0 },
+    { 120,{ "${keys.upload}",               SDLK_u, KMOD_PRIMARY,           "document.upload"                   }, 0 },
     /* The following cannot currently be changed (built-in duplicates). */
 #if defined (iPlatformApple)
     { 1002, { NULL, SDLK_LEFTBRACKET,  KMOD_PRIMARY,             "navigate.back"        }, 0 },
diff --git a/src/ui/root.c b/src/ui/root.c
index c78c9632..91077019 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1161,6 +1161,7 @@ void createUserInterface_Root(iRoot *d) {
                         { star_Icon " ${menu.page.subscribe}", subscribeToPage_KeyModifier, "feeds.subscribe" },
                         { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
                         { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
+                        { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" },
                         { "---", 0, 0, NULL },
                         { "${menu.page.copyurl}", 0, 0, "document.copylink" },
                         { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" },
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index 036571a5..968b3775 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -25,9 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "inputwidget.h"
 #include "documentwidget.h"
 #include "color.h"
+#include "command.h"
 #include "gmrequest.h"
 #include "app.h"
 
+#include <the_Foundation/file.h>
+#include <the_Foundation/fileinfo.h>
+
 iDefineObjectConstruction(UploadWidget)
 
 struct Impl_UploadWidget {
@@ -39,6 +43,11 @@ struct Impl_UploadWidget {
     iInputWidget *   mime;
     iInputWidget *   token;
     iInputWidget *   input;
+    iLabelWidget *   filePathLabel;
+    iLabelWidget *   fileSizeLabel;
+    iString          filePath;
+    size_t           fileSize;
+    iAtomicInt       isRequestUpdated;
 };
 
 void init_UploadWidget(iUploadWidget *d) {
@@ -49,6 +58,8 @@ void init_UploadWidget(iUploadWidget *d) {
     init_String(&d->url);
     d->viewer = NULL;
     d->request = NULL;
+    init_String(&d->filePath);
+    d->fileSize = 0;
     addChildFlags_Widget(w,
                          iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.upload}", NULL)),
                          frameless_WidgetFlag);
@@ -64,10 +75,11 @@ void init_UploadWidget(iUploadWidget *d) {
         iWidget *page = new_Widget();
         setFlags_Widget(page, arrangeSize_WidgetFlag, iTrue);
         d->input = new_InputWidget(0);
+        setHint_InputWidget(d->input, "${hint.upload.text}");
         setEnterInsertsLF_InputWidget(d->input, iTrue);
         setFixedSize_Widget(as_Widget(d->input), init_I2(120 * gap_UI, -1));
         addChild_Widget(page, iClob(d->input));
-        appendTabPage_Widget(tabs, iClob(page), "${heading.upload.text}", '1', 0);
+        appendFramelessTabPage_Widget(tabs, iClob(page), "${heading.upload.text}", '1', 0);
     }
     /* File content. */ {
         appendTwoColumnTabPage_Widget(tabs, "${heading.upload.file}", '2', &headings, &values);        
@@ -75,9 +87,9 @@ void init_UploadWidget(iUploadWidget *d) {
 //        iWidget *hint = addChild_Widget(values, iClob(new_LabelWidget("${upload.file.drophint}", NULL)));
 //        pad->sizeRef = hint;
         addChild_Widget(headings, iClob(new_LabelWidget("${upload.file.name}", NULL)));
-        addChild_Widget(values, iClob(new_LabelWidget("filename.ext", NULL)));
+        d->filePathLabel = addChild_Widget(values, iClob(new_LabelWidget("${upload.file.drophere}", NULL)));
         addChild_Widget(headings, iClob(new_LabelWidget("${upload.file.size}", NULL)));        
-        addChild_Widget(values, iClob(new_LabelWidget("0 KB", NULL)));
+        d->fileSizeLabel = addChild_Widget(values, iClob(new_LabelWidget("\u2014", NULL)));
         d->mime = new_InputWidget(0);
         setFixedSize_Widget(as_Widget(d->mime), init_I2(50 * gap_UI, -1));
         addTwoColumnDialogInputField_Widget(headings, values, "${upload.mime}", "upload.mime", iClob(d->mime));
@@ -100,6 +112,10 @@ void init_UploadWidget(iUploadWidget *d) {
                                                       KMOD_PRIMARY,
                                                       "upload.accept" } },
                                      2);
+        setId_Widget(addChildPosFlags_Widget(buttons,
+                                             iClob(new_LabelWidget("0", NULL)),
+                                             front_WidgetAddPos, frameless_WidgetFlag),
+                     "upload.pending");
         addChild_Widget(w, iClob(buttons));
     }
     resizeToLargestPage_Widget(tabs);
@@ -107,12 +123,16 @@ void init_UploadWidget(iUploadWidget *d) {
 }
 
 void deinit_UploadWidget(iUploadWidget *d) {
+    deinit_String(&d->filePath);
     deinit_String(&d->url);
     iRelease(d->request);
 }
 
 void setUrl_UploadWidget(iUploadWidget *d, const iString *url) {
-    set_String(&d->url, url);
+    iUrl parts;
+    init_Url(&parts, url);
+    setCStr_String(&d->url, "titan");
+    appendRange_String(&d->url, (iRangecc){ parts.scheme.end, constEnd_String(url) });
     setText_LabelWidget(d->info, &d->url);
 }
 
@@ -120,6 +140,20 @@ void setResponseViewer_UploadWidget(iUploadWidget *d, iDocumentWidget *doc) {
     d->viewer = doc;
 }
 
+static iWidget *acceptButton_UploadWidget_(iUploadWidget *d) {
+    return lastChild_Widget(findChild_Widget(as_Widget(d), "dialogbuttons"));
+}
+
+static void requestUpdated_UploadWidget_(iUploadWidget *d, iGmRequest *req) {
+    if (!exchange_Atomic(&d->isRequestUpdated, iTrue)) {
+        postCommand_Widget(d, "upload.request.updated reqid:%u", id_GmRequest(req));
+    }
+}
+
+static void requestFinished_UploadWidget_(iUploadWidget *d, iGmRequest *req) {
+    postCommand_Widget(d, "upload.request.finished reqid:%u", id_GmRequest(req));
+}
+
 static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     if (isCommand_Widget(w, ev, "upload.cancel")) {
@@ -128,12 +162,80 @@ static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
         destroy_Widget(w);
         return iTrue;
     }
+    const char *cmd = command_UserEvent(ev);
     if (isCommand_Widget(w, ev, "upload.accept")) {
+        iWidget * tabs     = findChild_Widget(w, "upload.tabs");
+        const int tabIndex = tabPageIndex_Widget(tabs, currentTabPage_Widget(tabs));
         /* Make a GmRequest and send the data. */
+        iAssert(d->request == NULL);
+        iAssert(!isEmpty_String(&d->url));
+        d->request = new_GmRequest(certs_App());
+        setUrl_GmRequest(d->request, &d->url);
+        if (tabIndex == 0) {
+            /* Uploading text. */
+            setTitanData_GmRequest(d->request,
+                                   collectNewCStr_String("text/plain"),
+                                   utf8_String(text_InputWidget(d->input)),
+                                   text_InputWidget(d->token));
+        }
+        else {
+            /* Uploading a file. */
+            iFile *f = iClob(new_File(&d->filePath));
+            if (!open_File(f, readOnly_FileMode)) {
+                makeMessage_Widget("${heading.upload.error.file}",
+                                   "${upload.error.msg}",
+                                   (iMenuItem[]){ "${dlg.message.ok}", 0, 0, "message.ok" }, 1);
+                iReleasePtr(&d->request);
+                return iTrue;
+            }
+            setTitanData_GmRequest(d->request,
+                                   text_InputWidget(d->mime),
+                                   collect_Block(readAll_File(f)),
+                                   text_InputWidget(d->token));
+            close_File(f);
+        }
+        iConnect(GmRequest, d->request, updated,  d, requestUpdated_UploadWidget_);
+        iConnect(GmRequest, d->request, finished, d, requestFinished_UploadWidget_);
+        submit_GmRequest(d->request);
         /* The dialog will remain open until the request finishes, showing upload progress. */
+        setFocus_Widget(NULL);
+        setFlags_Widget(tabs, disabled_WidgetFlag, iTrue);
+        setFlags_Widget(as_Widget(d->token), disabled_WidgetFlag, iTrue);
+        setFlags_Widget(acceptButton_UploadWidget_(d), disabled_WidgetFlag, iTrue);
+        return iTrue;
+    }
+    else if (isCommand_Widget(w, ev, "upload.request.updated")) {
+        /* TODO: Upload progress update? */   
+    }
+    else if (isCommand_Widget(w, ev, "upload.request.finished") &&
+             id_GmRequest(d->request) == argU32Label_Command(cmd, "reqid")) {
+        if (d->viewer) {
+            takeRequest_DocumentWidget(d->viewer, d->request);
+            d->request = NULL; /* DocumentWidget has it now. */
+        }
+        setupSheetTransition_Mobile(w, iFalse);
+        destroy_Widget(w);
+        return iTrue;        
     }
     if (ev->type == SDL_DROPFILE) {
         /* Switch to File tab. */
+        iWidget *tabs = findChild_Widget(w, "upload.tabs");
+        showTabPage_Widget(tabs, tabPage_Widget(tabs, 1));
+        setCStr_String(&d->filePath, ev->drop.file);
+        iFileInfo *info = iClob(new_FileInfo(&d->filePath));
+        if (isDirectory_FileInfo(info)) {
+            makeMessage_Widget("${heading.upload.error.file}",
+                               "${upload.error.directory}",
+                               (iMenuItem[]){ "${dlg.message.ok}", 0, 0, "message.ok" }, 1);
+            clear_String(&d->filePath);
+            d->fileSize = 0;
+            return iTrue;
+        }
+        d->fileSize = size_FileInfo(info);
+        setText_LabelWidget(d->filePathLabel, &d->filePath);
+        setTextCStr_LabelWidget(d->fileSizeLabel, formatCStrs_Lang("num.bytes.n", d->fileSize));
+        setTextCStr_InputWidget(d->mime, mediaType_Path(&d->filePath));
+        return iTrue;
     }
     return processEvent_Widget(w, ev);
 }
diff --git a/src/ui/util.c b/src/ui/util.c
index 6bc358de..da7a69b4 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -864,6 +864,13 @@ iLabelWidget *findMenuItem_Widget(iWidget *menu, const char *command) {
     return NULL;
 }
 
+void setMenuItemDisabled_Widget(iWidget *menu, const char *command, iBool disable) {
+    iLabelWidget *item = findMenuItem_Widget(menu, command);
+    if (item) {
+        setFlags_Widget(as_Widget(item), disabled_WidgetFlag, disable);
+    }
+}
+
 int checkContextMenu_Widget(iWidget *menu, const SDL_Event *ev) {
     if (menu && ev->type == SDL_MOUSEBUTTONDOWN && ev->button.button == SDL_BUTTON_RIGHT) {
         if (isVisible_Widget(menu)) {
@@ -1428,8 +1435,8 @@ iWidget *makeToggle_Widget(const char *id) {
     return toggle;
 }
 
-static void appendFramelessTabPage_(iWidget *tabs, iWidget *page, const char *title, int shortcut,
-                                    int kmods) {
+void appendFramelessTabPage_Widget(iWidget *tabs, iWidget *page, const char *title, int shortcut,
+                                   int kmods) {
     appendTabPage_Widget(tabs, page, title, shortcut, kmods);
     setFlags_Widget(
         (iWidget *) back_ObjectList(children_Widget(findChild_Widget(tabs, "tabs.buttons"))),
@@ -1461,7 +1468,7 @@ iWidget *appendTwoColumnTabPage_Widget(iWidget *tabs, const char *title, int sho
     *values = addChildFlags_Widget(
         columns, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
     addChildFlags_Widget(page, iClob(new_Widget()), expand_WidgetFlag);
-    appendFramelessTabPage_(tabs, iClob(page), title, shortcut, shortcut ? KMOD_PRIMARY : 0);
+    appendFramelessTabPage_Widget(tabs, iClob(page), title, shortcut, shortcut ? KMOD_PRIMARY : 0);
     return page;
 }
 
@@ -1888,7 +1895,7 @@ iWidget *makePreferences_Widget(void) {
     /* Keybindings. */
     if (deviceType_App() == desktop_AppDeviceType) {
         iBindingsWidget *bind = new_BindingsWidget();
-        appendFramelessTabPage_(tabs, iClob(bind), "${heading.prefs.keys}", '7', KMOD_PRIMARY);
+        appendFramelessTabPage_Widget(tabs, iClob(bind), "${heading.prefs.keys}", '7', KMOD_PRIMARY);
     }
     addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
     updatePreferencesLayout_Widget(dlg);
diff --git a/src/ui/util.h b/src/ui/util.h
index 5b02a4b3..021f72d1 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -226,7 +226,8 @@ void        openMenu_Widget     (iWidget *, iInt2 windowCoord);
 void        openMenuFlags_Widget(iWidget *, iInt2 windowCoord, iBool postCommands);
 void        closeMenu_Widget    (iWidget *);
 
-iLabelWidget *  findMenuItem_Widget (iWidget *menu, const char *command);
+iLabelWidget *  findMenuItem_Widget         (iWidget *menu, const char *command);
+void            setMenuItemDisabled_Widget  (iWidget *menu, const char *command, iBool disable);
 
 int         checkContextMenu_Widget (iWidget *, const SDL_Event *ev); /* see macro below */
 
@@ -242,6 +243,7 @@ iLabelWidget *  makeMenuButton_LabelWidget  (const char *label, const iMenuItem
 
 iWidget *       makeTabs_Widget         (iWidget *parent);
 void            appendTabPage_Widget    (iWidget *tabs, iWidget *page, const char *label, int key, int kmods);
+void            appendFramelessTabPage_Widget(iWidget *tabs, iWidget *page, const char *title, int shortcut, int kmods);
 iWidget *       appendTwoColumnTabPage_Widget(iWidget *tabs, const char *title, int shortcut, iWidget **headings,
                                               iWidget **values);
 void            prependTabPage_Widget   (iWidget *tabs, iWidget *page, const char *label, int key, int kmods);