8 files changed, 140 insertions, 28 deletions

diff --git a/res/MacOSXBundleInfo.plist.in b/res/MacOSXBundleInfo.plist.in
index 07a596aa..4dc685bd 100644
--- a/res/MacOSXBundleInfo.plist.in
+++ b/res/MacOSXBundleInfo.plist.in
@@ -38,8 +38,8 @@
                         <key>CFBundleTypeExtensions</key>
                         <array>
                                 <string>gmi</string>
-                                <string>gemini</string>
-                        </array>
+                                <string>gemini</string>
+                        </array>
                         <key>CFBundleTypeIconFile</key>
                         <string>text-gemini.icns</string>
                         <key>CFBundleTypeName</key>
@@ -52,5 +52,16 @@
                         <false/>
                 </dict>
         </array>
+                <key>CFBundleURLTypes</key>
+                <array>
+                        <dict>
+                                <key>CFBundleURLName</key>
+                                <string>Gemini</string>
+                                <key>CFBundleURLSchemes</key>
+                                <array>
+                                        <string>gemini</string>
+                                </array>
+                        </dict>
+                </array>
 </dict>
 </plist>
diff --git a/res/about/help.gmi b/res/about/help.gmi
index c8750140..1be94132 100644
--- a/res/about/help.gmi
+++ b/res/about/help.gmi
@@ -17,23 +17,22 @@ Like Gemini, Lagrange has been designed with minimalism in mind. It depends on a
 
 ### Features
 
-* UI inspired by Safari on macOS
-* Light and dark UI themes
-* Multiple tabs
-* Sidebar for page outline, managing bookmarks and identities, and viewing history
-* Smart suggestions when typing the URL — search bookmarks, history, identities
-* Scaling factor for the UI (for arbitrary monitor DPI)
 * Beautiful typography using Unicode fonts
 * Autogenerated page style and Unicode icon for each Gemini domain
+* Smart suggestions when typing the URL — search bookmarks, history, identities
+* Sidebar for page outline, managing bookmarks and identities, and viewing history
+* Multiple tabs
+* Identity management — create and use TLS client certificates
+* Light and dark UI themes
+* Select and copy text with the mouse
+* Find text on the page
 * Open image links inline on the same page
+* Open links via keyboard shortcuts
 * Instant back/forward navigation
 * Smooth scrolling
 * Scaling page content (50%...200%)
-* Select and copy text with the mouse
-* Find text on the page
-* Identity management — create and use TLS client certificates
+* Scaling factor for the UI (for arbitrary monitor DPI)
 * Persistent app state — tabs and history are restored on next run
-* Opening links via keyboard shortcuts
 
 ## What is Gemini
 
@@ -54,16 +53,21 @@ One way to browse Gemini content is via web browser extensions or proxies that t
 
 # User interface
 
-The user interface has been designed to have a feel similar to Safari on macOS.
-
 ## URL entry and quick search
 
 The URL input field is in its typical location in the navigation bar. It can be accessed quickly by pressing ${CTRL+}L.
 
-As you enter text, Lagrange starts looking for matches in bookmarks, history, content of cached pages, and identities. Search terms are case insensitive, and if many words are entered, they are all required to appear in the specified order in any matched content. Search of cached pages is limited to the (small-ish) set of pages that Lagrange keeps in memory for back navigation.
+As you enter text, Lagrange starts looking for matches in bookmarks, history, content of cached pages, and identities. Search terms are case insensitive, and if many words are entered, they are all required to appear in the specified order in any matched content. Search of cached pages is limited to the (small) set of pages that Lagrange keeps in memory for back navigation.
 
 ## Sidebar
 
+The sidebar can be toggled via menus or by pressing ${SHIFT+}${CTRL+}L. It has four tabs:
+
+* Bookmarks: List of bookmarks that you've created. These appear first in search results for quick and easy access.
+* History: Chronological list of visited URLs. This is not a full history of all the URLs you've accessed over time — only unique URLs are shown at the latest access time.
+* Identities: TLS client certificates.
+* Outline: List of the headings in the currently open tab. Useful when reading longer documents.
+
 ## Navigation
 
 ### Opening links using the keyboard
diff --git a/src/app.c b/src/app.c
index 0144c6d7..03e9b036 100644
--- a/src/app.c
+++ b/src/app.c
@@ -88,6 +88,9 @@ struct Impl_App {
     iBool        running;
     iBool        pendingRefresh;
     int          tabEnum;
+    iStringList *launchCommands;
+    iBool        isFinishedLaunching;
+    iTime        lastDropTime; /* for detecting drops of multiple items */
     /* Preferences: */
     iBool        commandEcho; /* --echo */
     iBool        retainWindowSize;
@@ -283,6 +286,9 @@ static void saveState_App_(const iApp *d) {
 }
 
 static void init_App_(iApp *d, int argc, char **argv) {
+    d->isFinishedLaunching = iFalse;
+    d->launchCommands      = new_StringList();
+    iZap(d->lastDropTime);
     init_CommandLine(&d->args, argc, argv);
     init_SortedArray(&d->tickers, sizeof(iTicker), cmp_Ticker_);
     d->lastTickerTime    = SDL_GetTicks();
@@ -304,6 +310,9 @@ static void init_App_(iApp *d, int argc, char **argv) {
     init_String(&d->gopherProxy);
     init_String(&d->httpProxy);
     setThemePalette_Color(d->theme);
+#if defined (iPlatformApple)
+    setupApplication_MacOS();
+#endif
     loadPrefs_App_(d);
     load_Visited(d->visited, dataDir_App_);
     load_Bookmarks(d->bookmarks, dataDir_App_);
@@ -324,6 +333,12 @@ static void init_App_(iApp *d, int argc, char **argv) {
         postCommand_App("navigate.home");
     }
     postCommand_App("window.unfreeze");
+    d->isFinishedLaunching = iTrue;
+    /* Run any commands that were pending completion of launch. */ {
+        iForEach(StringList, i, d->launchCommands) {
+            postCommandString_App(i.value);
+        }
+    }
 }
 
 static void deinit_App(iApp *d) {
@@ -340,6 +355,7 @@ static void deinit_App(iApp *d) {
     delete_Window(d->window);
     d->window = NULL;
     deinit_CommandLine(&d->args);
+    iRelease(d->launchCommands);
 }
 
 const iString *execPath_App(void) {
@@ -350,6 +366,21 @@ const iString *dataDir_App(void) {
     return collect_String(cleanedCStr_Path(dataDir_App_));
 }
 
+const iString *debugInfo_App(void) {
+    iApp *d = &app_;
+    iString *msg = collectNew_String();
+    format_String(msg, "# Debug information\n");
+    appendFormat_String(msg, "## Launch arguments\n");
+    iConstForEach(StringList, i, args_CommandLine(&d->args)) {
+        appendFormat_String(msg, "* %zu: %s\n", i.pos, cstr_String(i.value));
+    }
+    appendFormat_String(msg, "## Launch commands\n");
+    iConstForEach(StringList, j, d->launchCommands) {
+        appendFormat_String(msg, "%s\n", cstr_String(j.value));
+    }
+    return msg;
+}
+
 iLocalDef iBool isWaitingAllowed_App_(const iApp *d) {
     return !d->pendingRefresh && isEmpty_SortedArray(&d->tickers);
 }
@@ -365,9 +396,22 @@ void processEvents_App(enum iAppEventMode eventMode) {
             case SDL_QUIT:
                 d->running = iFalse;
                 goto backToMainLoop;
-            case SDL_DROPFILE:
-                postCommandf_App("open url:file://%s", ev.drop.file);
+            case SDL_DROPFILE: {
+                iBool newTab = iFalse;
+                if (elapsedSeconds_Time(&d->lastDropTime) < 0.1) {
+                    /* Each additional drop gets a new tab. */
+                    newTab = iTrue;
+                }
+                d->lastDropTime = now_Time();
+                if (startsWithCase_CStr(ev.drop.file, "gemini:") ||
+                    startsWithCase_CStr(ev.drop.file, "file:")) {
+                    postCommandf_App("~open newtab:%d url:%s", newTab, ev.drop.file);
+                }
+                else {
+                    postCommandf_App("~open newtab:%d url:file://%s", newTab, ev.drop.file);
+                }
                 break;
+            }
             default: {
                 iBool wasUsed = processEvent_Window(d->window, &ev);
                 if (ev.type == SDL_USEREVENT && ev.user.code == command_UserEventCode) {
@@ -488,12 +532,21 @@ void postRefresh_App(void) {
 }
 
 void postCommand_App(const char *command) {
+    iApp *d = &app_;
     iAssert(command);
     SDL_Event ev;
     if (*command == '!') {
         /* Global command; this is global context so just ignore. */
         command++;
     }
+    if (*command == '~') {
+        /* Requires launch to be finished; defer it if needed. */
+        command++;
+        if (!d->isFinishedLaunching) {
+            pushBackCStr_StringList(d->launchCommands, command);
+            return;
+        }
+    }
     ev.user.type     = SDL_USEREVENT;
     ev.user.code     = command_UserEventCode;
     ev.user.windowID = get_Window() ? SDL_GetWindowID(get_Window()->win) : 0;
diff --git a/src/app.h b/src/app.h
index da86c37e..69b8d274 100644
--- a/src/app.h
+++ b/src/app.h
@@ -48,6 +48,7 @@ enum iUserEventCode {
 
 const iString *execPath_App     (void);
 const iString *dataDir_App      (void);
+const iString *debugInfo_App    (void);
 
 int         run_App                     (int argc, char **argv);
 void        processEvents_App           (enum iAppEventMode mode);
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 137e8303..843d2f46 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -308,6 +308,9 @@ static const iBlock *aboutPageSource_(iRangecc path) {
     if (equalCase_Rangecc(path, "version")) {
         return &blobVersion_Embedded;
     }
+    if (equalCase_Rangecc(path, "debug")) {
+        return utf8_String(debugInfo_App());
+    }
     return src;
 }
 
diff --git a/src/macos.m b/src/macos.m
index d44be7d0..bbbaaa19 100644
--- a/src/macos.m
+++ b/src/macos.m
@@ -121,8 +121,9 @@ enum iTouchBarVariant {
 }
 - (id)initWithSDLDelegate:(NSObject<NSApplicationDelegate> *)sdl;
 //- (NSTouchBar *)makeTouchBar;
-/* SDL needs to do its own thing. */
-- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename;
+- (BOOL)application:(NSApplication *)app openFile:(NSString *)filename;
+- (void)application:(NSApplication *)app openFiles:(NSArray<NSString *> *)filenames;
+- (void)application:(NSApplication *)app openURLs:(NSArray<NSURL *> *)urls;
 - (void)applicationDidFinishLaunching:(NSNotification *)notifications;
 @end
 
@@ -151,7 +152,7 @@ enum iTouchBarVariant {
 static void appearanceChanged_MacOS_(NSString *name) {
     const iBool isDark = [name containsString:@"Dark"];
     const iBool isHighContrast = [name containsString:@"HighContrast"];
-    postCommandf_App("os.theme.changed dark:%d contrast:%d", isDark ? 1 : 0, isHighContrast ? 1 : 0);
+    postCommandf_App("~os.theme.changed dark:%d contrast:%d", isDark ? 1 : 0, isHighContrast ? 1 : 0);
 //    printf("Effective appearance changed: %s\n", [name cStringUsingEncoding:NSUTF8StringEncoding]);
 //    fflush(stdout);
 }
@@ -170,8 +171,23 @@ static void appearanceChanged_MacOS_(NSString *name) {
     [menuCommands setObject:command forKey:[menuItem title]];
 }
 
-- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename {
-    return [sdlDelegate application:theApplication openFile:filename];
+- (BOOL)application:(NSApplication *)app openFile:(NSString *)filename {
+    return [sdlDelegate application:app openFile:filename];
+}
+
+- (void)application:(NSApplication *)app openFiles:(NSArray<NSString *> *)filenames {
+    /* TODO: According to AppKit docs, this method won't be called when openURLs is defined. */
+    for (NSString *fn in filenames) {
+        NSLog(@"openFiles: %@", fn);
+        [self application:app openFile:fn];
+    }
+}
+
+- (void)application:(NSApplication *)app openURLs:(NSArray<NSURL *> *)urls {
+    for (NSURL *url in urls) {
+        NSLog(@"openURLs: %@", [url absoluteString]);
+        [sdlDelegate application:app openFile:[url absoluteString]];
+    }
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)notification {
@@ -397,9 +413,30 @@ void enableMomentumScroll_MacOS(void) {
                                             forKey: @"AppleMomentumScrollSupported"];
 }
 
+@interface UrlHandler : NSObject
+- (void)handleURLEvent:(NSAppleEventDescriptor*)event
+        withReplyEvent:(NSAppleEventDescriptor*)replyEvent;
+@end
+
+@implementation UrlHandler
+- (void)handleURLEvent:(NSAppleEventDescriptor*)event
+        withReplyEvent:(NSAppleEventDescriptor*)replyEvent {
+    NSString *url = [[event paramDescriptorForKeyword:keyDirectObject] stringValue];
+    postCommandf_App("~open url:%s", [url cStringUsingEncoding:NSUTF8StringEncoding]);
+}
+@end
+
+void registerURLHandler_MacOS(void) {
+    UrlHandler *handler = [[UrlHandler alloc] init];
+    [[NSAppleEventManager sharedAppleEventManager]
+        setEventHandler:handler
+            andSelector:@selector(handleURLEvent:withReplyEvent:)
+          forEventClass:kInternetEventClass
+             andEventID:kAEGetURL];
+}
+
 void setupApplication_MacOS(void) {
     NSApplication *app = [NSApplication sharedApplication];
-    //appearanceChanged_MacOS_([[app effectiveAppearance] name]);
     /* Our delegate will override SDL's delegate. */
     MyDelegate *myDel = [[MyDelegate alloc] initWithSDLDelegate:app.delegate];
     [myDel setAppearance:[[app effectiveAppearance] name]];
@@ -502,3 +539,7 @@ void handleCommand_MacOS(const char *cmd) {
     }
 #endif
 }
+
+void log_MacOS(const char *msg) {
+    NSLog(@"%s", msg);
+}
diff --git a/src/main.c b/src/main.c
index c13b75d1..247c4b40 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,11 +31,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #if defined (iPlatformApple)
 extern void enableMomentumScroll_MacOS(void);
+extern void registerURLHandler_MacOS(void);
 #endif
 
 int main(int argc, char **argv) {
 #if defined (iPlatformApple)
     enableMomentumScroll_MacOS();
+    registerURLHandler_MacOS();
 #endif
 #if defined (iPlatformMsys)
     /* MSYS runtime takes care of WinMain. */
diff --git a/src/ui/window.c b/src/ui/window.c
index 87ca2614..0a63a941 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -138,8 +138,8 @@ static const iMenuItem viewMenuItems[] = {
     { "Show Page Outline", '4', KMOD_PRIMARY, "sidebar.mode arg:3 toggle:1" },
     { "Toggle Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
     { "---", 0, 0, NULL },
-    { "Go Back", navigateBack_KeyShortcut, "navigate.back" },
-    { "Go Forward", navigateForward_KeyShortcut, "navigate.forward" },
+    { "Go Back", SDLK_LEFTBRACKET, KMOD_PRIMARY, "navigate.back" },
+    { "Go Forward", SDLK_RIGHTBRACKET, KMOD_PRIMARY, "navigate.forward" },
     { "Reload Page", reload_KeyShortcut, "navigate.reload" },
     { "---", 0, 0, NULL },
     { "Zoom In", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" },
@@ -546,9 +546,6 @@ void init_Window(iWindow *d, iRect rect) {
     d->presentTime = 0.0;
     setId_Widget(d->root, "root");
     init_Text(d->render);
-#if defined (iPlatformApple) && !defined (iPlatformIOS)
-    setupApplication_MacOS();
-#endif
     setupUserInterface_Window(d);
     updateRootSize_Window_(d);
 }