1 files changed, 158 insertions, 23 deletions

diff --git a/src/app.c b/src/app.c
index 3bf9aec1..71cff954 100644
--- a/src/app.c
+++ b/src/app.c
@@ -204,6 +204,7 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "uiscale arg:%f\n", uiScale_Window(d->window));
     appendFormat_String(str, "prefs.dialogtab arg:%d\n", d->prefs.dialogTab);
     appendFormat_String(str, "font.set arg:%d\n", d->prefs.font);
+    appendFormat_String(str, "font.user path:%s\n", cstr_String(&d->prefs.symbolFontPath));
     appendFormat_String(str, "headingfont.set arg:%d\n", d->prefs.headingFont);
     appendFormat_String(str, "zoom.set arg:%d\n", d->prefs.zoomPercent);
     appendFormat_String(str, "smoothscroll arg:%d\n", d->prefs.smoothScrolling);
@@ -212,6 +213,7 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "decodeurls arg:%d\n", d->prefs.decodeUserVisibleURLs);
     appendFormat_String(str, "linewidth.set arg:%d\n", d->prefs.lineWidth);
     /* TODO: Set up an array of booleans in Prefs and do these in a loop. */
+    appendFormat_String(str, "prefs.animate.changed arg:%d\n", d->prefs.uiAnimations);
     appendFormat_String(str, "prefs.mono.gemini.changed arg:%d\n", d->prefs.monospaceGemini);
     appendFormat_String(str, "prefs.mono.gopher.changed arg:%d\n", d->prefs.monospaceGopher);
     appendFormat_String(str, "prefs.boldlink.dark.changed arg:%d\n", d->prefs.boldLinkDark);
@@ -545,6 +547,7 @@ static void terminate_App_(int rc) {
 static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
                                                 const iStringList *openCmds) {
     iString *cmds = new_String();
+    iBool requestRaise = iFalse;
     const iProcessId pid = currentId_Process();
     iConstForEach(CommandLine, i, &d->args) {
         if (i.argType == value_CommandLineArgType) {
@@ -552,6 +555,7 @@ static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
         }
         if (equal_CommandLineConstIterator(&i, "go-home")) {
             appendCStr_String(cmds, "navigate.home\n");
+            requestRaise = iTrue;
         }
         else if (equal_CommandLineConstIterator(&i, "new-tab")) {
             iCommandLineArg *arg = argument_CommandLineConstIterator(&i);
@@ -563,6 +567,7 @@ static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
                 appendCStr_String(cmds, "tabs.new\n");
             }
             iRelease(arg);
+            requestRaise = iTrue;
         }
         else if (equal_CommandLineConstIterator(&i, "close-tab")) {
             appendCStr_String(cmds, "tabs.close\n");
@@ -573,13 +578,15 @@ static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
     }
     if (!isEmpty_StringList(openCmds)) {
         append_String(cmds, collect_String(joinCStr_StringList(openCmds, "\n")));
+        requestRaise = iTrue;
     }
     if (isEmpty_String(cmds)) {
         /* By default open a new tab. */
         appendCStr_String(cmds, "tabs.new\n");
+        requestRaise = iTrue;
     }
     if (!isEmpty_String(cmds)) {
-        iString *result = communicate_Ipc(cmds);
+        iString *result = communicate_Ipc(cmds, requestRaise);
         if (result) {
             fwrite(cstr_String(result), 1, size_String(result), stdout);
             fflush(stdout);
@@ -594,6 +601,18 @@ static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
 }
 #endif /* defined (LAGRANGE_ENABLE_IPC) */
 
+static iBool hasCommandLineOpenableScheme_(const iRangecc uri) {
+    static const char *schemes[] = {
+        "gemini:", "gopher:", "finger:", "file:", "data:", "about:"
+    };
+    iForIndices(i, schemes) {
+        if (startsWithCase_Rangecc(uri, schemes[i])) {
+            return iTrue;
+        }
+    }
+    return iFalse;
+}
+
 static void init_App_(iApp *d, int argc, char **argv) {
     init_CommandLine(&d->args, argc, argv);
     /* Where was the app started from? We ask SDL first because the command line alone is
@@ -628,6 +647,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
         defineValues_CommandLine(&d->args, "go-home", 0);
         defineValues_CommandLine(&d->args, "help", 0);
         defineValues_CommandLine(&d->args, listTabUrls_CommandLineOption, 0);
+        defineValues_CommandLine(&d->args, openUrlOrSearch_CommandLineOption, 1);
         defineValuesN_CommandLine(&d->args, "new-tab", 0, 1);
         defineValues_CommandLine(&d->args, "sw", 0);
         defineValues_CommandLine(&d->args, "version;V", 0);
@@ -643,30 +663,38 @@ static void init_App_(iApp *d, int argc, char **argv) {
             terminate_App_(0);
         }
         /* Check for URLs. */
-        iBool newTab = iFalse;
         iConstForEach(CommandLine, i, &d->args) {
             const iRangecc arg = i.entry;
             if (i.argType == value_CommandLineArgType) {
                 /* URLs and file paths accepted. */
-                const iBool isKnownScheme =
-                    startsWithCase_Rangecc(arg, "gemini:") || startsWithCase_Rangecc(arg, "gopher:") ||
-                    startsWithCase_Rangecc(arg, "finger:") || startsWithCase_Rangecc(arg, "file:")   ||
-                    startsWithCase_Rangecc(arg, "data:")   || startsWithCase_Rangecc(arg, "about:");
-                if (isKnownScheme || fileExistsCStr_FileInfo(cstr_Rangecc(arg))) {
+                const iBool isOpenable = hasCommandLineOpenableScheme_(arg);
+                if (isOpenable || fileExistsCStr_FileInfo(cstr_Rangecc(arg))) {
                     iString *decUrl =
-                        isKnownScheme ? urlDecodeExclude_String(collectNewRange_String(arg), "/?#:")
-                                      : makeFileUrl_String(collectNewRange_String(arg));
+                        isOpenable ? urlDecodeExclude_String(collectNewRange_String(arg), "/?#:")
+                                   : makeFileUrl_String(collectNewRange_String(arg));
                     pushBack_StringList(openCmds,
                                         collectNewFormat_String(
-                                            "open newtab:%d url:%s", newTab, cstr_String(decUrl)));
+                                            "open newtab:1 url:%s", cstr_String(decUrl)));
                     delete_String(decUrl);
-                    newTab = iTrue;
                 }
                 else {
                     fprintf(stderr, "Invalid URL/file: %s\n", cstr_Rangecc(arg));
                     terminate_App_(1);
                 }
             }
+            else if (equal_CommandLineConstIterator(&i, openUrlOrSearch_CommandLineOption)) {
+                const iCommandLineArg *arg = iClob(argument_CommandLineConstIterator(&i));
+                const iString *input = value_CommandLineArg(arg, 0);
+                if (startsWith_String(input, "//")) {
+                    input = collectNewFormat_String("gemini:%s", cstr_String(input));
+                }
+                if (hasCommandLineOpenableScheme_(range_String(input))) {
+                    input = collect_String(urlDecodeExclude_String(input, "/?#:"));
+                }
+                pushBack_StringList(
+                    openCmds,
+                    collectNewFormat_String("search newtab:1 query:%s", cstr_String(input)));
+            }
             else if (!isDefined_CommandLine(&d->args, collectNewRange_String(i.entry))) {
                 fprintf(stderr, "Unknown option: %s\n", cstr_Rangecc(arg));
                 terminate_App_(1);
@@ -1541,24 +1569,25 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
                          isSelected_Widget(findChild_Widget(d, "prefs.imageloadscroll")));
         postCommandf_App("hidetoolbarscroll arg:%d",
                          isSelected_Widget(findChild_Widget(d, "prefs.hidetoolbarscroll")));
-        postCommandf_App("ostheme arg:%d",
-                         isSelected_Widget(findChild_Widget(d, "prefs.ostheme")));
+        postCommandf_App("ostheme arg:%d", isSelected_Widget(findChild_Widget(d, "prefs.ostheme")));
+        postCommandf_App("font.user path:%s",
+                         cstrText_InputWidget(findChild_Widget(d, "prefs.userfont")));
         postCommandf_App("decodeurls arg:%d",
                          isSelected_Widget(findChild_Widget(d, "prefs.decodeurls")));
         postCommandf_App("searchurl address:%s",
-                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.searchurl"))));
+                         cstrText_InputWidget(findChild_Widget(d, "prefs.searchurl")));
         postCommandf_App("cachesize.set arg:%d",
-                         toInt_String(text_InputWidget(findChild_Widget(d, "prefs.cachesize"))));
+                         toInt_String(text_InputWidget(findChild_Widget(d, "prefs.cachesize"))));        
         postCommandf_App("ca.file path:%s",
-                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.ca.file"))));
+                         cstrText_InputWidget(findChild_Widget(d, "prefs.ca.file")));
         postCommandf_App("ca.path path:%s",
-                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.ca.path"))));
+                         cstrText_InputWidget(findChild_Widget(d, "prefs.ca.path")));
         postCommandf_App("proxy.gemini address:%s",
-                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.proxy.gemini"))));
+                         cstrText_InputWidget(findChild_Widget(d, "prefs.proxy.gemini")));
         postCommandf_App("proxy.gopher address:%s",
-                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.proxy.gopher"))));
+                         cstrText_InputWidget(findChild_Widget(d, "prefs.proxy.gopher")));
         postCommandf_App("proxy.http address:%s",
-                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.proxy.http"))));
+                         cstrText_InputWidget(findChild_Widget(d, "prefs.proxy.http")));
         const iWidget *tabs = findChild_Widget(d, "prefs.tabs");
         if (tabs) {
             postCommandf_App("prefs.dialogtab arg:%u",
@@ -1665,12 +1694,36 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf, iBool switchToNe
 
 static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
     iApp *d = &app_;
+    if (equal_Command(cmd, "ident.showmore")) {
+        iForEach(ObjectList, i, children_Widget(findChild_Widget(dlg, "headings"))) {
+            if (flags_Widget(i.object) & collapse_WidgetFlag) {
+                setFlags_Widget(i.object, hidden_WidgetFlag, iFalse);
+            }
+        }
+        iForEach(ObjectList, j, children_Widget(findChild_Widget(dlg, "values"))) {
+            if (flags_Widget(j.object) & collapse_WidgetFlag) {
+                setFlags_Widget(j.object, hidden_WidgetFlag, iFalse);
+            }
+        }
+        setFlags_Widget(child_Widget(findChild_Widget(dlg, "dialogbuttons"), 0), disabled_WidgetFlag,
+                        iTrue);
+        arrange_Widget(dlg);
+        refresh_Widget(dlg);        
+        return iTrue;
+    }
+    if (equal_Command(cmd, "ident.scope")) {
+        iLabelWidget *scope = findChild_Widget(dlg, "ident.scope");
+        setText_LabelWidget(scope,
+                            text_LabelWidget(child_Widget(
+                                findChild_Widget(as_Widget(scope), "menu"), arg_Command(cmd))));
+        return iTrue;
+    }
     if (equal_Command(cmd, "ident.temp.changed")) {
         setFlags_Widget(
             findChild_Widget(dlg, "ident.temp.note"), hidden_WidgetFlag, !arg_Command(cmd));
         return iFalse;
     }
-    if (equal_Command(cmd, "ident.accept") || equal_Command(cmd, "cancel")) {
+    if (equal_Command(cmd, "ident.accept") || equal_Command(cmd, "ident.cancel")) {
         if (equal_Command(cmd, "ident.accept")) {
             const iString *commonName   = text_InputWidget (findChild_Widget(dlg, "ident.common"));
             const iString *email        = text_InputWidget (findChild_Widget(dlg, "ident.email"));
@@ -1718,11 +1771,52 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
                 }
             }
             /* The input seems fine. */
-            newIdentity_GmCerts(d->certs, isTemp ? temporary_GmIdentityFlag : 0,
-                                until, commonName, email, userId, domain, organization, country);
+            iGmIdentity *ident = newIdentity_GmCerts(d->certs,
+                                                     isTemp ? temporary_GmIdentityFlag : 0,
+                                                     until,
+                                                     commonName,
+                                                     email,
+                                                     userId,
+                                                     domain,
+                                                     organization,
+                                                     country);
+            /* Use in the chosen scope. */ {
+                const iLabelWidget *scope    = findChild_Widget(dlg, "ident.scope");
+                const iString *     selLabel = text_LabelWidget(scope);
+                int                 selScope = 0;
+                iConstForEach(ObjectList,
+                              i,
+                              children_Widget(findChild_Widget(constAs_Widget(scope), "menu"))) {
+                    if (isInstance_Object(i.object, &Class_LabelWidget)) {
+                        const iLabelWidget *item = i.object;
+                        if (equal_String(text_LabelWidget(item), selLabel)) {
+                            break;
+                        }
+                        selScope++;
+                    }
+                }
+                const iString *docUrl = url_DocumentWidget(document_Root(dlg->root));
+                iString *useUrl = NULL;
+                switch (selScope) {
+                    case 0: /* current domain */
+                        useUrl = collectNewFormat_String("gemini://%s",
+                                                         cstr_Rangecc(urlHost_String(docUrl)));
+                        break;
+                    case 1: /* current page */
+                        useUrl = collect_String(copy_String(docUrl));
+                        break;
+                    default: /* not used */
+                        break;
+                }
+                if (useUrl) {
+                    signIn_GmCerts(d->certs, ident, useUrl);
+                    postCommand_App("navigate.reload");
+                }
+            }
             postCommandf_App("sidebar.mode arg:%d show:1", identities_SidebarMode);
             postCommand_App("idents.changed");
         }
+        setupSheetTransition_Mobile(dlg, iFalse);
         destroy_Widget(dlg);
         return iTrue;
     }
@@ -1813,6 +1907,22 @@ iBool handleCommand_App(const char *cmd) {
         resetFonts_Text();
         return iTrue;
     }
+    else if (equal_Command(cmd, "font.user")) {
+        const char *path = suffixPtr_Command(cmd, "path");
+        if (cmp_String(&d->prefs.symbolFontPath, path)) {
+            if (!isFrozen) {
+                setFreezeDraw_Window(get_Window(), iTrue);
+            }
+            setCStr_String(&d->prefs.symbolFontPath, path);
+            loadUserFonts_Text();
+            resetFonts_Text();
+            if (!isFrozen) {
+                postCommand_App("font.changed");
+                postCommand_App("window.unfreeze");
+            }
+        }
+        return iTrue;
+    }
     else if (equal_Command(cmd, "font.set")) {
         if (!isFrozen) {
             setFreezeDraw_Window(get_Window(), iTrue);
@@ -2011,6 +2121,10 @@ iBool handleCommand_App(const char *cmd) {
         d->prefs.openArchiveIndexPages = arg_Command(cmd) != 0;
         return iTrue;
     }
+    else if (equal_Command(cmd, "prefs.animate.changed")) {
+        d->prefs.uiAnimations = arg_Command(cmd) != 0;
+        return iTrue;
+    }
     else if (equal_Command(cmd, "saturation.set")) {
         d->prefs.saturation = (float) arg_Command(cmd) / 100.0f;
         if (!isFrozen) {
@@ -2070,6 +2184,20 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iTrue;
     }
+    else if (equal_Command(cmd, "search")) {
+        const int newTab = argLabel_Command(cmd, "newtab");
+        const iString *query = collect_String(suffix_Command(cmd, "query"));
+        if (!isLikelyUrl_String(query)) {
+            const iString *url = searchQueryUrl_App(query);
+            if (!isEmpty_String(url)) {
+                postCommandf_App("open newtab:%d url:%s", newTab, cstr_String(url));
+            }
+        }
+        else {
+            postCommandf_App("open newtab:%d url:%s", newTab, cstr_String(query));
+        }
+        return iTrue;
+    }
     else if (equal_Command(cmd, "open")) {
         iString *url = collectNewCStr_String(suffixPtr_Command(cmd, "url"));
         const iBool noProxy = argLabel_Command(cmd, "noproxy");
@@ -2239,6 +2367,8 @@ iBool handleCommand_App(const char *cmd) {
         setToggle_Widget(findChild_Widget(dlg, "prefs.archive.openindex"), d->prefs.openArchiveIndexPages);
         setToggle_Widget(findChild_Widget(dlg, "prefs.ostheme"), d->prefs.useSystemTheme);
         setToggle_Widget(findChild_Widget(dlg, "prefs.customframe"), d->prefs.customFrame);
+        setToggle_Widget(findChild_Widget(dlg, "prefs.animate"), d->prefs.uiAnimations);
+        setText_InputWidget(findChild_Widget(dlg, "prefs.userfont"), &d->prefs.symbolFontPath);
         updatePrefsPinSplitButtons_(dlg, d->prefs.pinSplit);
         updateDropdownSelection_(findChild_Widget(dlg, "prefs.uilang"), cstr_String(&d->prefs.uiLanguage));
         setToggle_Widget(findChild_Widget(dlg, "prefs.retainwindow"), d->prefs.retainWindowSize);
@@ -2454,6 +2584,11 @@ iBool handleCommand_App(const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "ipc.signal")) {
+        if (argLabel_Command(cmd, "raise")) {
+            if (d->window && d->window->win) {
+                SDL_RaiseWindow(d->window->win);
+            }
+        }
         signal_Ipc(arg_Command(cmd));
         return iTrue;
     }