3 files changed, 45 insertions, 25 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ee6ea00..ea25183f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,7 @@ set (EMBED_RESOURCES
     res/about/lagrange.gmi
     res/about/license.gmi
     res/about/version.gmi
+    res/arg-help.txt
     res/fonts/Tinos-Regular.ttf
     res/fonts/Tinos-Italic.ttf
     res/fonts/Tinos-Bold.ttf
diff --git a/res/arg-help.txt b/res/arg-help.txt
new file mode 100644
index 00000000..d8e8c76c
--- /dev/null
+++ b/res/arg-help.txt
@@ -0,0 +1,19 @@
+Usage: lagrange [options] [URLs] [paths]
+
+URLs and local files are opened in separate tabs. By default the first 
+URL/path opens in the currently open tab.
+
+General options:
+
+  -E, --echo            Print all internal app events to stdout.
+      --help            Print these instructions.
+      --sw              Disable hardware accelerated rendering.
+  -V, --version         Print the application version.
+
+Options that control a running instance of Lagrange:
+
+      --close-tab       Close the current tab.
+  -L, --list-tab-urls   Print the URLs of open tabs to stdout. If the app isn't
+                        running, nothing is printed.
+      --new-tab [URL]   Open a new tab. If the URL is omitted, the user's
+                        homepage is opened.                              
diff --git a/src/app.c b/src/app.c
index 2614c454..9a7ced62 100644
--- a/src/app.c
+++ b/src/app.c
@@ -476,6 +476,29 @@ static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
 
 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
+       not a reliable source of this information, particularly when it comes to different
+       operating systems. */ {
+        char *exec = SDL_GetBasePath();
+        if (exec) {
+            d->execPath = newCStr_String(concatPath_CStr(
+                exec, cstr_Rangecc(baseName_Path(executablePath_CommandLine(&d->args)))));
+        }
+        else {
+            d->execPath = copy_String(executablePath_CommandLine(&d->args));
+        }
+        SDL_free(exec);
+    }
+#if defined (iHaveLoadEmbed)
+    /* Load the resources from a file. */ {
+        if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) {
+            if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN2))) {
+                fprintf(stderr, "failed to load resources: %s\n", strerror(errno));
+                exit(-1);
+            }
+        }
+    }
+#endif
     /* Configure the valid command line options. */ {
         defineValues_CommandLine(&d->args, "close-tab", 0);
         defineValues_CommandLine(&d->args, "echo;E", 0);
@@ -489,7 +512,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     iStringList *openCmds = new_StringList();
     /* Handle command line options. */ {
         if (contains_CommandLine(&d->args, "help")) {
-            printf("Usage: lagrange [options] [URLs] [paths]\n");
+            puts(cstr_Block(&blobArghelp_Embedded));
             terminate_App_(0);
         }
         if (contains_CommandLine(&d->args, "version;V")) {
@@ -528,22 +551,9 @@ static void init_App_(iApp *d, int argc, char **argv) {
             }
         }
     }
-    /* Where was the app started from? We ask SDL first because the command line alone is
-       not a reliable source of this information, particularly when it comes to different
-       operating systems. */ {
-        char *exec = SDL_GetBasePath();
-        if (exec) {
-            d->execPath = newCStr_String(concatPath_CStr(
-                exec, cstr_Rangecc(baseName_Path(executablePath_CommandLine(&d->args)))));
-        }
-        else {
-            d->execPath = copy_String(executablePath_CommandLine(&d->args));
-        }
-        SDL_free(exec);
-    }
-    init_Ipc(dataDir_App_());
     /* Only one instance is allowed to run at a time; the runtime files (bookmarks, etc.)
        are not shareable. */ {
+        init_Ipc(dataDir_App_());
         const iProcessId instance = check_Ipc();
         if (instance) {
             communicateWithRunningInstance_App_(d, instance, openCmds);
@@ -621,16 +631,6 @@ static void init_App_(iApp *d, int argc, char **argv) {
                       0x1f306);
         fetchRemote_Bookmarks(d->bookmarks);
     }
-#if defined (iHaveLoadEmbed)
-    /* Load the resources from a file. */ {
-        if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) {
-            if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN2))) {
-                fprintf(stderr, "failed to load resources: %s\n", strerror(errno));
-                exit(-1);
-            }
-        }
-    }
-#endif
     d->window = new_Window(d->initialWindowRect);
     init_Feeds(dataDir_App_());
     /* Widget state init. */