zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-10 04:13:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Updates.

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@641 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-09-02 18:53:58 +00:00 • committed by cras
commit 755a8d40eb
31 changed files with 386 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/fe-common/irc/Makefile.am
View file

@ -12,7 +12,7 @@ INCLUDES = \
-DSYSCONFDIR=\""$(sysconfdir)"\"
libfe_common_irc_a_SOURCES = \
fe-channels.c \
fe-irc-channels.c \
fe-irc-commands.c \
fe-irc-server.c \
fe-ircnet.c \
@ -22,7 +22,6 @@ libfe_common_irc_a_SOURCES = \
fe-ignore.c \
fe-netjoin.c \
fe-netsplit.c \
fe-queries.c \
fe-common-irc.c \
irc-completion.c \
irc-window-activity.c \
@ -32,7 +31,6 @@ libfe_common_irc_a_SOURCES = \
noinst_HEADERS = \
fe-common-irc.h \
fe-queries.h \
irc-hilight-text.h \
module.h \
module-formats.h

319
src/fe-common/irc/fe-channels.c
View file

@ -1,319 +0,0 @@
/*
fe-channels.c : irssi
Copyright (C) 1999-2000 Timo Sirainen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "module.h"
#include "module-formats.h"
#include "modules.h"
#include "signals.h"
#include "commands.h"
#include "levels.h"
#include "misc.h"
#include "settings.h"
#include "irc.h"
#include "irc-channels.h"
#include "channels-setup.h"
#include "nicklist.h"
#include "windows.h"
#include "window-items.h"
static void signal_channel_created(CHANNEL_REC *channel, gpointer automatic)
{
if (window_item_find(channel->server, channel->name) == NULL) {
window_item_create((WI_ITEM_REC *) channel,
GPOINTER_TO_INT(automatic));
}
}
static void signal_channel_created_curwin(CHANNEL_REC *channel)
{
g_return_if_fail(channel != NULL);
window_add_item(active_win, (WI_ITEM_REC *) channel, FALSE);
}
static void signal_channel_destroyed(CHANNEL_REC *channel)
{
WINDOW_REC *window;
g_return_if_fail(channel != NULL);
window = window_item_window((WI_ITEM_REC *) channel);
if (window != NULL) {
window_remove_item(window, (WI_ITEM_REC *) channel);
if (window->items == NULL && windows->next != NULL &&
(!channel->joined || channel->left) &&
settings_get_bool("autoclose_windows")) {
window_destroy(window);
}
}
}
static void signal_window_item_removed(WINDOW_REC *window, WI_ITEM_REC *item)
{
IRC_CHANNEL_REC *channel;
g_return_if_fail(window != NULL);
channel = IRC_CHANNEL(item);
if (channel != NULL) channel_destroy(CHANNEL(channel));
}
static void sig_disconnected(IRC_SERVER_REC *server)
{
WINDOW_REC *window;
GSList *tmp;
g_return_if_fail(server != NULL);
if (!IS_IRC_SERVER(server))
return;
for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
CHANNEL_REC *channel = tmp->data;
window = window_item_window((WI_ITEM_REC *) channel);
window->waiting_channels =
g_slist_append(window->waiting_channels, g_strdup_printf("%s %s", server->tag, channel->name));
}
}
static void signal_window_item_changed(WINDOW_REC *window, WI_ITEM_REC *item)
{
g_return_if_fail(window != NULL);
if (item == NULL) return;
if (g_slist_length(window->items) > 1 && IS_IRC_CHANNEL(item)) {
printformat(item->server, item->name, MSGLEVEL_CLIENTNOTICE,
IRCTXT_TALKING_IN, item->name);
signal_stop();
}
}
static void cmd_wjoin_pre(const char *data)
{
GHashTable *optlist;
char *nick;
void *free_arg;
if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_GETREST,
"join", &optlist, &nick))
return;
if (g_hash_table_lookup(optlist, "window") != NULL) {
signal_add("channel created",
(SIGNAL_FUNC) signal_channel_created_curwin);
}
cmd_params_free(free_arg);
}
static void cmd_wjoin_post(const char *data)
{
GHashTable *optlist;
char *nick;
void *free_arg;
if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_GETREST,
"join", &optlist, &nick))
return;
if (g_hash_table_lookup(optlist, "window") != NULL) {
signal_remove("channel created",
(SIGNAL_FUNC) signal_channel_created_curwin);
}
cmd_params_free(free_arg);
}
static void cmd_channel_list_joined(void)
{
IRC_CHANNEL_REC *channel;
GString *nicks;
GSList *nicklist, *tmp, *ntmp;
if (channels == NULL) {
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NOT_IN_CHANNELS);
return;
}
/* print active channel */
channel = IRC_CHANNEL(active_win->active);
if (channel != NULL)
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_CURRENT_CHANNEL, channel->name);
/* print list of all channels, their modes, server tags and nicks */
printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, IRCTXT_CHANLIST_HEADER);
for (tmp = channels; tmp != NULL; tmp = tmp->next) {
channel = tmp->data;
nicklist = nicklist_getnicks(CHANNEL(channel));
nicks = g_string_new(NULL);
for (ntmp = nicklist; ntmp != NULL; ntmp = ntmp->next) {
NICK_REC *rec = ntmp->data;
g_string_sprintfa(nicks, "%s ", rec->nick);
}
if (nicks->len > 1) g_string_truncate(nicks, nicks->len-1);
printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, IRCTXT_CHANLIST_LINE,
channel->name, channel->mode, channel->server->tag, nicks->str);
g_slist_free(nicklist);
g_string_free(nicks, TRUE);
}
}
/* SYNTAX: CHANNEL LIST */
static void cmd_channel_list(void)
{
GString *str;
GSList *tmp;
str = g_string_new(NULL);
printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, IRCTXT_CHANSETUP_HEADER);
for (tmp = setupchannels; tmp != NULL; tmp = tmp->next) {
CHANNEL_SETUP_REC *rec = tmp->data;
g_string_truncate(str, 0);
if (rec->autojoin)
g_string_append(str, "autojoin, ");
if (rec->botmasks != NULL && *rec->botmasks != '\0')
g_string_sprintfa(str, "bots: %s, ", rec->botmasks);
if (rec->autosendcmd != NULL && *rec->autosendcmd != '\0')
g_string_sprintfa(str, "botcmd: %s, ", rec->autosendcmd);
if (str->len > 2) g_string_truncate(str, str->len-2);
printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, IRCTXT_CHANSETUP_LINE,
rec->name, rec->chatnet == NULL ? "" : rec->chatnet,
rec->password == NULL ? "" : rec->password, str->str);
}
g_string_free(str, TRUE);
printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, IRCTXT_CHANSETUP_FOOTER);
}
static void cmd_channel(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
{
if (*data == '\0')
cmd_channel_list_joined();
else if (ischannel(*data))
signal_emit("command join", 2, data, server);
else
command_runsub("channel", data, server, item);
}
/* SYNTAX: CHANNEL ADD [-auto | -noauto] [-bots <masks>] [-botcmd <command>]
<channel> <ircnet> [<password>] */
static void cmd_channel_add(const char *data)
{
GHashTable *optlist;
CHANNEL_SETUP_REC *rec;
char *botarg, *botcmdarg, *ircnet, *channel, *password;
void *free_arg;
if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_OPTIONS,
"channel add", &optlist, &channel, &ircnet, &password))
return;
botarg = g_hash_table_lookup(optlist, "bots");
botcmdarg = g_hash_table_lookup(optlist, "botcmd");
if (*ircnet == '\0' || *channel == '\0')
cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
rec = channels_setup_find(channel, ircnet);
if (rec == NULL) {
rec = g_new0(CHANNEL_SETUP_REC, 1);
rec->name = g_strdup(channel);
rec->chatnet = g_strdup(ircnet);
} else {
if (g_hash_table_lookup(optlist, "bots")) g_free_and_null(rec->botmasks);
if (g_hash_table_lookup(optlist, "botcmd")) g_free_and_null(rec->autosendcmd);
if (*password != '\0') g_free_and_null(rec->password);
}
if (g_hash_table_lookup(optlist, "auto")) rec->autojoin = TRUE;
if (g_hash_table_lookup(optlist, "noauto")) rec->autojoin = FALSE;
if (botarg != NULL && *botarg != '\0') rec->botmasks = g_strdup(botarg);
if (botcmdarg != NULL && *botcmdarg != '\0') rec->autosendcmd = g_strdup(botcmdarg);
if (*password != '\0' && strcmp(password, "-") != 0) rec->password = g_strdup(password);
channels_setup_create(rec);
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_CHANSETUP_ADDED, channel, ircnet);
cmd_params_free(free_arg);
}
/* SYNTAX: CHANNEL REMOVE <channel> <ircnet> */
static void cmd_channel_remove(const char *data)
{
CHANNEL_SETUP_REC *rec;
char *ircnet, *channel;
void *free_arg;
if (!cmd_get_params(data, &free_arg, 2, &channel, &ircnet))
return;
if (*ircnet == '\0' || *channel == '\0')
cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
rec = channels_setup_find(channel, ircnet);
if (rec == NULL)
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_CHANSETUP_NOT_FOUND, channel, ircnet);
else {
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_CHANSETUP_REMOVED, channel, ircnet);
channels_setup_destroy(rec);
}
cmd_params_free(free_arg);
}
void fe_channels_init(void)
{
settings_add_bool("lookandfeel", "autoclose_windows", TRUE);
signal_add("channel created", (SIGNAL_FUNC) signal_channel_created);
signal_add("channel destroyed", (SIGNAL_FUNC) signal_channel_destroyed);
signal_add("window item remove", (SIGNAL_FUNC) signal_window_item_removed);
signal_add_last("window item changed", (SIGNAL_FUNC) signal_window_item_changed);
signal_add_last("server disconnected", (SIGNAL_FUNC) sig_disconnected);
command_bind_first("join", NULL, (SIGNAL_FUNC) cmd_wjoin_pre);
command_bind_last("join", NULL, (SIGNAL_FUNC) cmd_wjoin_post);
command_bind("channel", NULL, (SIGNAL_FUNC) cmd_channel);
command_bind("channel add", NULL, (SIGNAL_FUNC) cmd_channel_add);
command_bind("channel remove", NULL, (SIGNAL_FUNC) cmd_channel_remove);
command_bind("channel list", NULL, (SIGNAL_FUNC) cmd_channel_list);
command_set_options("channel add", "auto noauto -bots -botcmd");
command_set_options("join", "window");
}
void fe_channels_deinit(void)
{
signal_remove("channel created", (SIGNAL_FUNC) signal_channel_created);
signal_remove("channel destroyed", (SIGNAL_FUNC) signal_channel_destroyed);
signal_remove("window item remove", (SIGNAL_FUNC) signal_window_item_removed);
signal_remove("window item changed", (SIGNAL_FUNC) signal_window_item_changed);
signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected);
command_unbind("join", (SIGNAL_FUNC) cmd_wjoin_pre);
command_unbind("join", (SIGNAL_FUNC) cmd_wjoin_post);
command_unbind("channel", (SIGNAL_FUNC) cmd_channel);
command_unbind("channel add", (SIGNAL_FUNC) cmd_channel_add);
command_unbind("channel remove", (SIGNAL_FUNC) cmd_channel_remove);
command_unbind("channel list", (SIGNAL_FUNC) cmd_channel_list);
}

13
src/fe-common/irc/fe-common-irc.c
View file

@ -34,8 +34,8 @@
void fe_irc_modules_init(void);
void fe_irc_modules_deinit(void);
void fe_channels_init(void);
void fe_channels_deinit(void);
void fe_irc_channels_init(void);
void fe_irc_channels_deinit(void);
void fe_irc_commands_init(void);
void fe_irc_commands_deinit(void);
@ -58,9 +58,6 @@ void fe_events_numeric_deinit(void);
void fe_ignore_init(void);
void fe_ignore_deinit(void);
void fe_query_init(void);
void fe_query_deinit(void);
void irc_completion_init(void);
void irc_completion_deinit(void);
@ -109,7 +106,7 @@ void fe_common_irc_init(void)
theme_register(fecommon_irc_formats);
fe_channels_init();
fe_irc_channels_init();
fe_irc_commands_init();
fe_ircnet_init();
fe_irc_server_init();
@ -119,7 +116,6 @@ void fe_common_irc_init(void)
fe_ignore_init();
fe_netsplit_init();
fe_netjoin_init();
fe_query_init();
irc_completion_init();
irc_hilight_text_init();
irc_window_activity_init();
@ -131,7 +127,7 @@ void fe_common_irc_deinit(void)
{
fe_irc_modules_deinit();
fe_channels_deinit();
fe_irc_channels_deinit();
fe_irc_commands_deinit();
fe_ircnet_deinit();
fe_irc_server_deinit();
@ -141,7 +137,6 @@ void fe_common_irc_deinit(void)
fe_ignore_deinit();
fe_netsplit_deinit();
fe_netjoin_deinit();
fe_query_deinit();
irc_completion_deinit();
irc_hilight_text_deinit();
irc_window_activity_deinit();

4
src/fe-common/irc/fe-events.c
View file

@ -113,7 +113,7 @@ static void event_privmsg(const char *data, IRC_SERVER_REC *server, const char *
print_channel_msg(server, msg, nick, addr, target);
} else {
/* private message */
item = (WI_ITEM_REC *) privmsg_get_query(server, nick, FALSE);
item = (WI_ITEM_REC *) privmsg_get_query(SERVER(server), nick, FALSE);
printformat(server, nick, MSGLEVEL_MSGS,
item == NULL ? IRCTXT_MSG_PRIVATE : IRCTXT_MSG_PRIVATE_QUERY, nick, addr, msg);
}
@ -156,7 +156,7 @@ static void ctcp_msg_check_action(const char *data, IRC_SERVER_REC *server,
}
} else {
/* private action */
item = (WI_ITEM_REC *) privmsg_get_query(server, nick, FALSE);
item = (WI_ITEM_REC *) privmsg_get_query(SERVER(server), nick, FALSE);
printformat(server, nick, level,
item == NULL ? IRCTXT_ACTION_PRIVATE : IRCTXT_ACTION_PRIVATE_QUERY,
nick, addr == NULL ? "" : addr, data);

44
src/fe-common/irc/fe-irc-channels.c Normal file
View file

@ -0,0 +1,44 @@
/*
fe-irc-channels.c : irssi
Copyright (C) 1999-2000 Timo Sirainen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "module.h"
#include "signals.h"
#include "commands.h"
#include "servers.h"
#include "irc.h"
static void cmd_channel(const char *data, SERVER_REC *server)
{
if (ischannel(*data)) {
signal_emit("command join", 2, data, server);
signal_stop();
}
}
void fe_irc_channels_init(void)
{
command_bind("channel", NULL, (SIGNAL_FUNC) cmd_channel);
}
void fe_irc_channels_deinit(void)
{
command_unbind("channel", (SIGNAL_FUNC) cmd_channel);
}

5
src/fe-common/irc/fe-irc-commands.c
View file

@ -27,7 +27,6 @@
#include "levels.h"
#include "irc.h"
#include "irc-commands.h"
#include "servers.h"
#include "mode-lists.h"
#include "nicklist.h"
@ -56,7 +55,7 @@ static void cmd_msg(gchar *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
"msg", &optlist, &target, &msg))
return;
if (*target == '\0' || *msg == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
server = irccmd_options_get_server("msg", optlist, server);
server = IRC_SERVER(cmd_options_get_server("msg", optlist, SERVER(server)));
if (*target == '=')
{
@ -119,7 +118,7 @@ static void cmd_msg(gchar *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
else
{
/* private message */
item = (WI_ITEM_REC *) privmsg_get_query(server, target, TRUE);
item = (WI_ITEM_REC *) privmsg_get_query(SERVER(server), target, TRUE);
printformat(server, target, MSGLEVEL_MSGS | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
item == NULL ? IRCTXT_OWN_MSG_PRIVATE : IRCTXT_OWN_MSG_PRIVATE_QUERY, target, msg, server->nick);
}

330
src/fe-common/irc/fe-queries.c
View file

@ -1,330 +0,0 @@
/*
fe-queries.c : irssi
Copyright (C) 1999-2000 Timo Sirainen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "module.h"
#include "module-formats.h"
#include "modules.h"
#include "signals.h"
#include "commands.h"
#include "settings.h"
#include "irc.h"
#include "irc-commands.h"
#include "levels.h"
#include "irc-queries.h"
#include "windows.h"
#include "window-items.h"
static int queryclose_tag, query_auto_close;
/* Return query where to put the private message. */
QUERY_REC *privmsg_get_query(IRC_SERVER_REC *server, const char *nick, int own)
{
QUERY_REC *query;
query = irc_query_find(server, nick);
if (query == NULL && settings_get_bool("autocreate_query") &&
(!own || settings_get_bool("autocreate_own_query")))
query = irc_query_create(server, nick, TRUE);
return query;
}
static void signal_query_created(QUERY_REC *query, gpointer automatic)
{
if (window_item_find(query->server, query->name) != NULL)
return;
window_item_create((WI_ITEM_REC *) query, GPOINTER_TO_INT(automatic));
printformat(query->server, query->name, MSGLEVEL_CLIENTNOTICE,
IRCTXT_QUERY_STARTED, query->name);
}
static void signal_query_created_curwin(QUERY_REC *query)
{
g_return_if_fail(query != NULL);
window_add_item(active_win, (WI_ITEM_REC *) query, FALSE);
}
static void signal_query_destroyed(QUERY_REC *query)
{
WINDOW_REC *window;
g_return_if_fail(query != NULL);
window = window_item_window((WI_ITEM_REC *) query);
if (window != NULL) {
window_remove_item(window, (WI_ITEM_REC *) query);
if (window->items == NULL && windows->next != NULL &&
!query->unwanted && settings_get_bool("autoclose_windows"))
window_destroy(window);
}
}
static void signal_window_item_removed(WINDOW_REC *window, WI_ITEM_REC *item)
{
QUERY_REC *query;
g_return_if_fail(window != NULL);
query = IRC_QUERY(item);
if (query != NULL) query_destroy(query);
}
static void sig_server_connected(IRC_SERVER_REC *server)
{
GSList *tmp;
if (!IS_IRC_SERVER(server))
return;
/* check if there's any queries without server */
for (tmp = queries; tmp != NULL; tmp = tmp->next) {
QUERY_REC *rec = tmp->data;
if (rec->server == NULL &&
g_strcasecmp(rec->server_tag, server->tag) == 0) {
window_item_change_server((WI_ITEM_REC *) rec, server);
server->queries = g_slist_append(server->queries, rec);
}
}
}
static void cmd_window_server(const char *data)
{
SERVER_REC *server;
g_return_if_fail(data != NULL);
server = server_find_tag(data);
if (IS_IRC_SERVER(server) && IS_IRC_QUERY(active_win->active)) {
/* /WINDOW SERVER used in a query window */
query_change_server((QUERY_REC *) active_win->active, server);
window_change_server(active_win, server);
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_QUERY_SERVER_CHANGED, server->tag, server->connrec->address,
server->connrec->chatnet == NULL ? "" : server->connrec->chatnet);
signal_stop();
}
}
/* SYNTAX: UNQUERY [<nick>] */
static void cmd_unquery(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
{
QUERY_REC *query;
g_return_if_fail(data != NULL);
if (*data == '\0') {
/* remove current query */
query = IRC_QUERY(item);
if (query == NULL) return;
} else {
query = irc_query_find(server, data);
if (query == NULL) {
printformat(server, NULL, MSGLEVEL_CLIENTERROR, IRCTXT_NO_QUERY, data);
return;
}
}
query_destroy(query);
}
/* SYNTAX: QUERY [-window] <nick> */
static void cmd_query(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
{
GHashTable *optlist;
WINDOW_REC *window;
QUERY_REC *query;
char *nick;
void *free_arg;
g_return_if_fail(data != NULL);
if (*data == '\0') {
/* remove current query */
cmd_unquery("", server, item);
return;
}
if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
PARAM_FLAG_UNKNOWN_OPTIONS,
"query", &optlist, &nick))
return;
if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
server = irccmd_options_get_server("query", optlist, server);
if (server == NULL) {
cmd_params_free(free_arg);
return;
}
if (*nick != '=' && (server == NULL || !server->connected))
cmd_param_error(CMDERR_NOT_CONNECTED);
if (g_hash_table_lookup(optlist, "window") != NULL) {
signal_add("query created",
(SIGNAL_FUNC) signal_query_created_curwin);
}
query = irc_query_find(server, nick);
if (query == NULL)
irc_query_create(server, nick, FALSE);
else {
/* query already existed - change to query window */
window = window_item_window((WI_ITEM_REC *) query);
g_return_if_fail(window != NULL);
window_set_active(window);
window_item_set_active(window, (WI_ITEM_REC *) query);
}
if (g_hash_table_lookup(optlist, "window") != NULL) {
signal_remove("query created",
(SIGNAL_FUNC) signal_query_created_curwin);
}
cmd_params_free(free_arg);
}
static int window_has_query(WINDOW_REC *window)
{
GSList *tmp;
g_return_val_if_fail(window != NULL, FALSE);
for (tmp = window->items; tmp != NULL; tmp = tmp->next) {
if (IS_IRC_QUERY(tmp->data))
return TRUE;
}
return FALSE;
}
static void sig_window_changed(WINDOW_REC *window, WINDOW_REC *old_window)
{
if (query_auto_close <= 0)
return;
/* reset the window's last_line timestamp so that query doesn't get
closed immediately after switched to the window, or after changed
to some other window from it */
if (window != NULL && window_has_query(window))
window->last_line = time(NULL);
if (old_window != NULL && window_has_query(old_window))
old_window->last_line = time(NULL);
}
static void sig_window_restore_item(WINDOW_REC *window, const char *item)
{
IRC_SERVER_REC *server;
QUERY_REC *rec;
char *tag, *nick;
tag = g_strdup(item);
nick = strchr(tag, ' ');
if (nick == NULL || ischannel(*(nick+1))) {
g_free(tag);
return;
}
server = (IRC_SERVER_REC *) server_find_tag(tag);
rec = irc_query_create(server, nick+1, TRUE);
if (server == NULL)
rec->server_tag = g_strdup(tag);
g_free(tag);
signal_stop();
}
static int sig_query_autoclose(void)
{
WINDOW_REC *window;
GSList *tmp, *next;
time_t now;
now = time(NULL);
for (tmp = queries; tmp != NULL; tmp = next) {
QUERY_REC *rec = tmp->data;
next = tmp->next;
window = window_item_window((WI_ITEM_REC *) rec);
if (window != active_win && rec->new_data == 0 &&
now-window->last_line > query_auto_close)
query_destroy(rec);
}
return 1;
}
static void read_settings(void)
{
query_auto_close = settings_get_int("autoclose_query");
if (query_auto_close > 0 && queryclose_tag == -1)
queryclose_tag = g_timeout_add(5000, (GSourceFunc) sig_query_autoclose, NULL);
else if (query_auto_close <= 0 && queryclose_tag != -1) {
g_source_remove(queryclose_tag);
queryclose_tag = -1;
}
}
void fe_query_init(void)
{
settings_add_bool("lookandfeel", "autocreate_query", TRUE);
settings_add_bool("lookandfeel", "autocreate_own_query", TRUE);
settings_add_int("lookandfeel", "autoclose_query", 0);
queryclose_tag = -1;
read_settings();
signal_add("query created", (SIGNAL_FUNC) signal_query_created);
signal_add("query destroyed", (SIGNAL_FUNC) signal_query_destroyed);
signal_add("window item remove", (SIGNAL_FUNC) signal_window_item_removed);
signal_add("server connected", (SIGNAL_FUNC) sig_server_connected);
signal_add("window changed", (SIGNAL_FUNC) sig_window_changed);
signal_add("window restore item", (SIGNAL_FUNC) sig_window_restore_item);
signal_add("setup changed", (SIGNAL_FUNC) read_settings);
command_bind("query", NULL, (SIGNAL_FUNC) cmd_query);
command_bind("unquery", NULL, (SIGNAL_FUNC) cmd_unquery);
command_bind("window server", NULL, (SIGNAL_FUNC) cmd_window_server);
command_set_options("query", "window");
}
void fe_query_deinit(void)
{
if (queryclose_tag != -1) g_source_remove(queryclose_tag);
signal_remove("query created", (SIGNAL_FUNC) signal_query_created);
signal_remove("query destroyed", (SIGNAL_FUNC) signal_query_destroyed);
signal_remove("window item remove", (SIGNAL_FUNC) signal_window_item_removed);
signal_remove("server connected", (SIGNAL_FUNC) sig_server_connected);
signal_remove("window changed", (SIGNAL_FUNC) sig_window_changed);
signal_remove("window restore item", (SIGNAL_FUNC) sig_window_restore_item);
signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
command_unbind("query", (SIGNAL_FUNC) cmd_query);
command_unbind("unquery", (SIGNAL_FUNC) cmd_unquery);
command_unbind("window server", (SIGNAL_FUNC) cmd_window_server);
}

7
src/fe-common/irc/fe-queries.h
View file

@ -1,7 +0,0 @@
#ifndef __FE_QUERIES_H
#define __FE_QUERIES_H
/* Return query where to put the private message. */
QUERY_REC *privmsg_get_query(IRC_SERVER_REC *server, const char *nick, int own);
#endif

3
src/fe-common/irc/irc-completion.c
View file

@ -26,7 +26,6 @@
#include "settings.h"
#include "irc.h"
#include "irc-commands.h"
#include "servers.h"
#include "irc-channels.h"
#include "irc-queries.h"
@ -260,7 +259,7 @@ static void cmd_msg(const char *data, IRC_SERVER_REC *server)
PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_GETREST,
"msg", &optlist, &target, &msg))
return;
server = irccmd_options_get_server("msg", optlist, server);
server = IRC_SERVER(cmd_options_get_server("msg", optlist, SERVER(server)));
if (*target != '\0' && *msg != '\0') {
if (!ischannel(*target) && *target != '=' && server != NULL)

14
src/fe-common/irc/module-formats.c
View file

@ -34,7 +34,6 @@ FORMAT_REC fecommon_irc_formats[] = {
{ "server_reconnect_list", "%_$0%_: $1:$2 ($3) ($5 left before reconnecting)", 6, { 0, 0, 1, 0, 0, 0 } },
{ "server_reconnect_removed", "Removed reconnection to server %_$0%_ port %_$1%_", 3, { 0, 1, 0 } },
{ "server_reconnect_not_found", "Reconnection tag %_$0%_ not found", 1, { 0 } },
{ "query_server_changed", "Query with %_$2%_ changed to server %_$1%_", 3, { 0, 0, 0 } },
{ "setupserver_added", "Server $0 saved", 2, { 0, 1 } },
{ "setupserver_removed", "Server $0 removed", 2, { 0, 1 } },
{ "setupserver_not_found", "Server $0 not found", 2, { 0, 1 } },
@ -95,16 +94,6 @@ FORMAT_REC fecommon_irc_formats[] = {
{ "invitelist", "%_$0%_: invite %c$1", 2, { 0, 0 } },
{ "no_such_channel", "$0: No such channel", 1, { 0 } },
{ "channel_synced", "Join to %_$0%_ was synced in %_$1%_ secs", 2, { 0, 2 } },
{ "not_in_channels", "You are not on any channels", 0 },
{ "current_channel", "Current channel $0", 1, { 0 } },
{ "chanlist_header", "You are on the following channels:", 0 },
{ "chanlist_line", "$[-10]0 %|+$1 ($2): $3", 4, { 0, 0, 0, 0 } },
{ "chansetup_not_found", "Channel $0 not found", 2, { 0, 0 } },
{ "chansetup_added", "Channel $0 saved", 2, { 0, 0 } },
{ "chansetup_removed", "Channel $0 removed", 2, { 0, 0 } },
{ "chansetup_header", "Channel IRC net Password Settings", 0 },
{ "chansetup_line", "$[15]0 %|$[10]1 $[10]2 $3", 4, { 0, 0, 0, 0 } },
{ "chansetup_footer", "", 0 },
/* ---- */
{ NULL, "Nick", 0 },
@ -201,9 +190,6 @@ FORMAT_REC fecommon_irc_formats[] = {
{ "ignore_header", "Ignorance List:", 0 },
{ "ignore_line", "$[-4]0 $1: $2 $3 $4", 4, { 1, 0, 0, 0 } },
{ "ignore_footer", "", 0 },
{ "talking_in", "You are now talking in %_$0%_", 1, { 0 } },
{ "query_start", "Starting query with %_$0%_", 1, { 0 } },
{ "no_query", "No query with %_$0%_", 1, { 0 } },
{ "no_msgs_got", "You have not received a message from anyone yet", 0 },
{ "no_msgs_sent", "You have not sent a message to anyone yet", 0 },

14
src/fe-common/irc/module-formats.h
View file

@ -12,7 +12,6 @@ enum {
IRCTXT_SERVER_RECONNECT_LIST,
IRCTXT_RECONNECT_REMOVED,
IRCTXT_RECONNECT_NOT_FOUND,
IRCTXT_QUERY_SERVER_CHANGED,
IRCTXT_SETUPSERVER_ADDED,
IRCTXT_SETUPSERVER_REMOVED,
IRCTXT_SETUPSERVER_NOT_FOUND,
@ -72,16 +71,6 @@ enum {
IRCTXT_INVITELIST,
IRCTXT_NO_SUCH_CHANNEL,
IRCTXT_CHANNEL_SYNCED,
IRCTXT_NOT_IN_CHANNELS,
IRCTXT_CURRENT_CHANNEL,
IRCTXT_CHANLIST_HEADER,
IRCTXT_CHANLIST_LINE,
IRCTXT_CHANSETUP_NOT_FOUND,
IRCTXT_CHANSETUP_ADDED,
IRCTXT_CHANSETUP_REMOVED,
IRCTXT_CHANSETUP_HEADER,
IRCTXT_CHANSETUP_LINE,
IRCTXT_CHANSETUP_FOOTER,
IRCTXT_FILL_4,
@ -171,9 +160,6 @@ enum {
IRCTXT_IGNORE_HEADER,
IRCTXT_IGNORE_LINE,
IRCTXT_IGNORE_FOOTER,
IRCTXT_TALKING_IN,
IRCTXT_QUERY_STARTED,
IRCTXT_NO_QUERY,
IRCTXT_NO_MSGS_GOT,
IRCTXT_NO_MSGS_SENT
};