zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-19 16:42:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Moved some stuff from irc to core. Added command_bind_proto() function to

Browse source 
bind protocol-specific commands. Added #define command_bind_irc() for easier
access. CMD_IRC_SERVER(server) check should be done at the beginning of each
command requiring IRC server as active server, it handles it correctly the
cases when it is not. Did some other cleanups as well.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1955 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-11-02 01:05:14 +00:00 • committed by cras
commit f354fe54c7
70 changed files with 381 additions and 438 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/core/commands.c
View file

@ -111,8 +111,8 @@ int command_have_sub(const char *command)
return FALSE;
}
static COMMAND_MODULE_REC *command_module_get(COMMAND_REC *rec,
const char *module)
static COMMAND_MODULE_REC *
command_module_get(COMMAND_REC *rec, const char *module, int protocol)
{
COMMAND_MODULE_REC *modrec;
@ -122,14 +122,18 @@ static COMMAND_MODULE_REC *command_module_get(COMMAND_REC *rec,
if (modrec == NULL) {
modrec = g_new0(COMMAND_MODULE_REC, 1);
modrec->name = g_strdup(module);
modrec->protocol = -1;
rec->modules = g_slist_append(rec->modules, modrec);
}
if (protocol != -1)
modrec->protocol = protocol;
return modrec;
}
void command_bind_to(const char *module, int pos, const char *cmd,
const char *category, SIGNAL_FUNC func)
int protocol, const char *category, SIGNAL_FUNC func)
{
COMMAND_REC *rec;
COMMAND_MODULE_REC *modrec;
@ -145,7 +149,7 @@ void command_bind_to(const char *module, int pos, const char *cmd,
rec->category = category == NULL ? NULL : g_strdup(category);
commands = g_slist_append(commands, rec);
}
modrec = command_module_get(rec, module);
modrec = command_module_get(rec, module, protocol);
modrec->signals = g_slist_append(modrec->signals, func);
@ -433,7 +437,7 @@ void command_set_options_module(const char *module,
rec = command_find(cmd);
g_return_if_fail(rec != NULL);
modrec = command_module_get(rec, module);
modrec = command_module_get(rec, module, -1);
reload = modrec->options != NULL;
if (reload) {
@ -769,6 +773,28 @@ void commands_remove_module(const char *module)
}
}
static int cmd_protocol_match(COMMAND_REC *cmd, SERVER_REC *server)
{
GSList *tmp;
for (tmp = cmd->modules; tmp != NULL; tmp = tmp->next) {
COMMAND_MODULE_REC *rec = tmp->data;
if (rec->protocol == -1) {
/* at least one module accepts the command
without specific protocol */
return 1;
}
if (server != NULL && rec->protocol == server->chat_type) {
/* matching protocol found */
return 1;
}
}
return 0;
}
#define alias_runstack_push(alias) \
alias_runstack = g_slist_append(alias_runstack, alias)
@ -781,6 +807,7 @@ void commands_remove_module(const char *module)
static void parse_command(const char *command, int expand_aliases,
SERVER_REC *server, void *item)
{
COMMAND_REC *rec;
const char *alias, *newcmd;
char *cmd, *orig, *args, *oldcmd;
@ -810,6 +837,17 @@ static void parse_command(const char *command, int expand_aliases,
return;
}
rec = command_find(newcmd);
if (rec != NULL && !cmd_protocol_match(rec, server)) {
g_free(orig);
signal_emit("error command", 2,
GINT_TO_POINTER(server == NULL ?
CMDERR_NOT_CONNECTED :
CMDERR_ILLEGAL_PROTO));
return;
}
cmd = g_strconcat("command ", newcmd, NULL);
if (server != NULL)
server_redirect_default(SERVER(server), cmd);