Added SILC Thread Queue API

[runtime.git] / apps / irssi / src / fe-common / core / fe-exec.c

diff --git a/apps/irssi/src/fe-common/core/fe-exec.c b/apps/irssi/src/fe-common/core/fe-exec.c
index 4b7c9ae0c98c640299e7ae37ec90b6ecada02028..3fa8899551c4b745562bd975ea34bfca5d6dde58 100644 (file)
--- a/apps/irssi/src/fe-common/core/fe-exec.c
+++ b/apps/irssi/src/fe-common/core/fe-exec.c
@@ -28,6 +28,7 @@
 #include "misc.h"
 #include "levels.h"
 
+#include "servers.h"
 #include "channels.h"
 #include "queries.h"
 
@@ -47,16 +48,22 @@ static void exec_wi_destroy(EXEC_WI_REC *rec)
         g_return_if_fail(rec != NULL);
 
        if (rec->destroying) return;
-        rec->destroying = TRUE;
+       rec->destroying = TRUE;
 
+       rec->process->target_item = NULL;
        if (window_item_window((WI_ITEM_REC *) rec) != NULL)
                window_item_destroy((WI_ITEM_REC *) rec);
 
        MODULE_DATA_DEINIT(rec);
-       g_free(rec->name);
+       g_free(rec->visible_name);
         g_free(rec);
 }
 
+static const char *exec_get_target(WI_ITEM_REC *item)
+{
+       return ((EXEC_WI_REC *) item)->visible_name;
+}
+
 static EXEC_WI_REC *exec_wi_create(WINDOW_REC *window, PROCESS_REC *rec)
 {
        EXEC_WI_REC *item;
@@ -67,7 +74,8 @@ static EXEC_WI_REC *exec_wi_create(WINDOW_REC *window, PROCESS_REC *rec)
        item = g_new0(EXEC_WI_REC, 1);
        item->type = module_get_uniq_id_str("WINDOW ITEM TYPE", "EXEC");
         item->destroy = (void (*) (WI_ITEM_REC *)) exec_wi_destroy;
-       item->name = rec->name != NULL ? g_strdup(rec->name) :
+       item->get_target = exec_get_target;
+       item->visible_name = rec->name != NULL ? g_strdup(rec->name) :
                g_strdup_printf("%%%d", rec->id);
 
        item->createtime = time(NULL);
@@ -180,6 +188,7 @@ static void process_destroy(PROCESS_REC *rec, int status)
 
        g_free_not_null(rec->name);
        g_free_not_null(rec->target);
+       g_free_not_null(rec->target_server);
         g_free(rec->args);
         g_free(rec);
 }
@@ -340,7 +349,7 @@ static void process_exec(PROCESS_REC *rec, const char *cmd)
 static void sig_exec_input_reader(PROCESS_REC *rec)
 {
         char tmpbuf[512], *str;
-        unsigned int recvlen;
+        gsize recvlen;
        int err, ret;
 
        g_return_if_fail(rec != NULL);
@@ -368,9 +377,10 @@ static void sig_exec_input_reader(PROCESS_REC *rec)
 }
 
 static void handle_exec(const char *args, GHashTable *optlist,
-                       WI_ITEM_REC *item)
+                        SERVER_REC *server, WI_ITEM_REC *item)
 {
        PROCESS_REC *rec;
+       SERVER_REC *target_server;
         char *target, *level;
        int notice, signum, interactive, target_nick, target_channel;
 
@@ -387,6 +397,7 @@ static void handle_exec(const char *args, GHashTable *optlist,
        }
 
        target = NULL;
+       target_server = NULL;
        notice = FALSE;
 
        if (g_hash_table_lookup(optlist, "in") != NULL) {
@@ -410,14 +421,17 @@ static void handle_exec(const char *args, GHashTable *optlist,
                 /* redirect output to active channel/query */
                if (item == NULL)
                        cmd_return_error(CMDERR_NOT_JOINED);
-               target = item->name;
+               target = (char *) window_item_get_target(item);
+               target_server = item->server;
                target_channel = IS_CHANNEL(item);
                target_nick = IS_QUERY(item);
        } else if (g_hash_table_lookup(optlist, "msg") != NULL) {
                 /* redirect output to /msg <nick> */
                target = g_hash_table_lookup(optlist, "msg");
+               target_server = server;
        } else if (g_hash_table_lookup(optlist, "notice") != NULL) {
                target = g_hash_table_lookup(optlist, "notice");
+               target_server = server;
                 notice = TRUE;
        }
 
@@ -449,6 +463,8 @@ static void handle_exec(const char *args, GHashTable *optlist,
                         /* redirect output to target */
                        g_free_and_null(rec->target);
                        rec->target = g_strdup(target);
+                       rec->target_server = target_server == NULL ? NULL :
+                               g_strdup(target_server->tag);
                         rec->notice = notice;
                }
 
@@ -464,10 +480,8 @@ static void handle_exec(const char *args, GHashTable *optlist,
                        g_free_and_null(rec->target);
                        rec->target_win = active_win;
 
-                       if (rec->target_item != NULL) {
+                       if (rec->target_item != NULL)
                                exec_wi_destroy(rec->target_item);
-                                rec->target_item = NULL;
-                       }
 
                        if (interactive) {
                                rec->target_item =
@@ -491,6 +505,8 @@ static void handle_exec(const char *args, GHashTable *optlist,
 
         rec->id = process_get_new_id();
        rec->target = g_strdup(target);
+       rec->target_server = target_server == NULL ? NULL :
+               g_strdup(target_server->tag);
        rec->target_win = active_win;
        rec->target_channel = target_channel;
        rec->target_nick = target_nick;
@@ -530,7 +546,7 @@ static void cmd_exec(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
        if (cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
                           PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_GETREST,
                           "exec", &optlist, &args)) {
-               handle_exec(args, optlist, item);
+               handle_exec(args, optlist, server, item);
                cmd_params_free(free_arg);
        }
 }
@@ -579,9 +595,18 @@ static void sig_exec_input(PROCESS_REC *rec, const char *text)
        server = NULL;
 
        if (rec->target != NULL) {
-               item = window_item_find(NULL, rec->target);
-               server = item != NULL ? item->server :
-                       active_win->active_server;
+               if (rec->target_server != NULL) {
+                       server = server_find_tag(rec->target_server);
+                       if (server == NULL) {
+                               /* disconnected - target is lost */
+                               return;
+                       }
+                       item = NULL;
+               } else {
+                       item = window_item_find(NULL, rec->target);
+                       server = item != NULL ? item->server :
+                               active_win->active_server;
+               }
 
                str = g_strconcat(rec->target_nick ? "-nick " :
                                  rec->target_channel ? "-channel " : "",
@@ -590,7 +615,7 @@ static void sig_exec_input(PROCESS_REC *rec, const char *text)
                            3, str, server, item);
                 g_free(str);
        } else if (rec->target_item != NULL) {
-               printtext(NULL, rec->target_item->name,
+               printtext(NULL, rec->target_item->visible_name,
                          rec->level, "%s", text);
        } else {
                printtext_window(rec->target_win, rec->level, "%s", text);
@@ -613,7 +638,8 @@ static void sig_window_destroyed(WINDOW_REC *window)
 
 static void event_text(const char *data, SERVER_REC *server, EXEC_WI_REC *item)
 {
-       if (!IS_EXEC_WI(item)) return;
+       if (!IS_EXEC_WI(item))
+               return;
 
        net_sendbuffer_send(item->process->out, data, strlen(data));
        net_sendbuffer_send(item->process->out, "\n", 1);