Added --tab-url option to print active tab's URL

IssueID #319

3 files changed, 13 insertions, 0 deletions

diff --git a/res/arg-help.txt b/res/arg-help.txt
index e87881d3..9f6548f2 100644
--- a/res/arg-help.txt
+++ b/res/arg-help.txt
@@ -21,3 +21,4 @@ Options that control a running instance of Lagrange:
                         running, nothing is printed.
       --new-tab [URL]   Open a new tab. If the URL is omitted, the user's
                         homepage is opened.                              
+      --tab-url         Print the URL of the active tab.
diff --git a/src/app.c b/src/app.c
index abfd584a..8318eee4 100644
--- a/src/app.c
+++ b/src/app.c
@@ -581,6 +581,9 @@ static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
         else if (equal_CommandLineConstIterator(&i, "close-tab")) {
             appendCStr_String(cmds, "tabs.close\n");
         }
+        else if (equal_CommandLineConstIterator(&i, "tab-url")) {
+            appendFormat_String(cmds, "ipc.active.url pid:%d\n", pid);
+        }
         else if (equal_CommandLineConstIterator(&i, listTabUrls_CommandLineOption)) {
             appendFormat_String(cmds, "ipc.list.urls pid:%d\n", pid);
         }
@@ -658,6 +661,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
         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, "tab-url", 0);
         defineValues_CommandLine(&d->args, "sw", 0);
         defineValues_CommandLine(&d->args, "version;V", 0);
     }
@@ -2772,6 +2776,12 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iTrue;
     }
+    else if (equal_Command(cmd, "ipc.active.url")) {
+        write_Ipc(argLabel_Command(cmd, "pid"),
+                  collectNewFormat_String("%s\n", cstr_String(url_DocumentWidget(document_App()))),
+                  response_IpcWrite);
+        return iTrue;        
+    }
     else if (equal_Command(cmd, "ipc.signal")) {
         if (argLabel_Command(cmd, "raise")) {
             if (d->window && d->window->win) {
diff --git a/src/ipc.c b/src/ipc.c
index ce98b6cf..e4c95c50 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -172,6 +172,7 @@ static void handleSignal_IpcResponse_(int sig) {
 }
 
 iBool write_Ipc(iProcessId pid, const iString *input, enum iIpcWrite type) {
+    if (!pid) return iFalse;
     iBool ok = iFalse;
     iFile *f = newCStr_File(inputFilePath_(&ipc_, pid));
     if (open_File(f, text_FileMode | append_FileMode)) {
@@ -281,6 +282,7 @@ void listen_Ipc(void) {
 }
 
 iBool write_Ipc(iProcessId pid, const iString *input, enum iIpcWrite type) {
+    if (!pid) return iFalse;
     iUnused(type);
     HANDLE slot = CreateFile(slotName_(pid),
                              GENERIC_WRITE,