IPC: Request window raise when opening new tabs, navigating

IssueID #234

3 files changed, 19 insertions, 8 deletions

diff --git a/src/app.c b/src/app.c
index 10cdd044..591b2cef 100644
--- a/src/app.c
+++ b/src/app.c
@@ -545,6 +545,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 +553,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 +565,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");
@@ -577,9 +580,10 @@ static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
     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);
@@ -2507,6 +2511,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;
     }
diff --git a/src/ipc.c b/src/ipc.c
index b0e996fb..ce98b6cf 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -176,8 +176,9 @@ iBool write_Ipc(iProcessId pid, const iString *input, enum iIpcWrite type) {
     iFile *f = newCStr_File(inputFilePath_(&ipc_, pid));
     if (open_File(f, text_FileMode | append_FileMode)) {
         write_File(f, utf8_String(input));
-        if (type == command_IpcWrite) {
-            printf_Stream(stream_File(f), "\nipc.signal arg:%d\n", currentId_Process());
+        if (type != response_IpcWrite) {
+            printf_Stream(stream_File(f), "\nipc.signal arg:%d%s\n", currentId_Process(),
+                          type == commandAndRaise_IpcWrite ? " raise:1" : "");
         }
         close_File(f);
         ok = iTrue;
@@ -186,10 +187,10 @@ iBool write_Ipc(iProcessId pid, const iString *input, enum iIpcWrite type) {
     return ok;
 }
 
-iString *communicate_Ipc(const iString *command) {
+iString *communicate_Ipc(const iString *command, iBool requestRaise) {
     const iProcessId dst = check_Ipc();
     if (dst) {
-        if (write_Ipc(dst, command, command_IpcWrite)) {
+        if (write_Ipc(dst, command, requestRaise ? commandAndRaise_IpcWrite : command_IpcWrite)) {
             response_ = new_IpcResponse();
             signal(SIGUSR1, handleSignal_IpcResponse_);
             lock_Mutex(&response_->mtx);
@@ -300,7 +301,7 @@ iBool write_Ipc(iProcessId pid, const iString *input, enum iIpcWrite type) {
     return ok;
 }
 
-iString *communicate_Ipc(const iString *command) {
+iString *communicate_Ipc(const iString *command, iBool requestRaise) {
     iProcessId pid = check_Ipc();
     if (!pid) {
         return NULL;
@@ -308,7 +309,7 @@ iString *communicate_Ipc(const iString *command) {
     /* Open a mailslot for the response. */
     HANDLE responseSlot = CreateMailslotA(slotName_(currentId_Process()), 0, 1000, NULL);
     /* Write the commands. */
-    if (!write_Ipc(pid, command, command_IpcWrite)) {
+    if (!write_Ipc(pid, command, requestRaise ? commandAndRaise_IpcWrite : command_IpcWrite)) {
         CloseHandle(responseSlot);
         return NULL;
     }
diff --git a/src/ipc.h b/src/ipc.h
index 69852876..5fd6167d 100644
--- a/src/ipc.h
+++ b/src/ipc.h
@@ -31,11 +31,12 @@ void        deinit_Ipc  (void);
 
 iProcessId  check_Ipc           (void);
 void        listen_Ipc          (void);
-iString *   communicate_Ipc     (const iString *command);
+iString *   communicate_Ipc     (const iString *command, iBool requestRaise);
 void        signal_Ipc          (iProcessId pid);
 
 enum iIpcWrite {
     command_IpcWrite,
+    commandAndRaise_IpcWrite,
     response_IpcWrite,
 };