jrd/ailin-nemui-irssi
1
0
Fork 0
forked from PsychoticNinja/ailin-nemui-irssi
Code Issues Pull Requests Projects Releases Wiki Activity

code changes

Browse Source
This commit is contained in:
ailin-nemui 2018-11-15 00:58:43 +01:00
parent d61d2f55e0
commit 102265b955
64 changed files with 212 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/chat-commands.c
View File

@ -325,7 +325,7 @@ static void cmd_quit(const char *data)
g_free(str); g_free(str);
} }
signal_emit("gui exit", 0); signal_emit__gui_exit();
} }
/* SYNTAX: MSG [-<server tag>] [-channel | -nick] *|<targets> <message> */ /* SYNTAX: MSG [-<server tag>] [-channel | -nick] *|<targets> <message> */

8
src/core/commands.c
View File

@ -326,9 +326,9 @@ void command_runsub(const char *cmd, const char *data,
subcmd = g_strconcat("command ", newcmd, NULL); subcmd = g_strconcat("command ", newcmd, NULL);
ascii_strdown(subcmd); ascii_strdown(subcmd);
if (!signal_emit(subcmd, 3, args, server, item)) { if (!signal_emit_raw(subcmd, 3, args, server, item)) {
defcmd = g_strdup_printf("default command %s", cmd); defcmd = g_strdup_printf("default command %s", cmd);
if (!signal_emit(defcmd, 3, data, server, item)) { if (!signal_emit_raw(defcmd, 3, data, server, item)) {
signal_emit__error_command(GINT_TO_POINTER(CMDERR_UNKNOWN), subcmd+8); signal_emit__error_command(GINT_TO_POINTER(CMDERR_UNKNOWN), subcmd+8);
} }
g_free(defcmd); g_free(defcmd);
@ -902,8 +902,8 @@ static void parse_command(const char *command, int expand_aliases,
oldcmd = current_command; oldcmd = current_command;
current_command = cmd+8; current_command = cmd+8;
if (server != NULL) server_ref(server); if (server != NULL) server_ref(server);
if (!signal_emit(cmd, 3, args, server, item)) { if (!signal_emit_raw(cmd, 3, args, server, item)) {
signal_emit_id(signal_default_command, 3, signal_emit__default_command(
command, server, item); command, server, item);
} }
if (server != NULL) { if (server != NULL) {

4
src/core/expandos.c
View File

@ -551,7 +551,7 @@ static int sig_timer(void)
struct tm *tm; struct tm *tm;
int last_min; int last_min;
signal_emit("expando timer", 0); signal_emit__expando_timer();
/* check if $Z has changed */ /* check if $Z has changed */
now = time(NULL); now = time(NULL);
@ -566,7 +566,7 @@ static int sig_timer(void)
return 1; return 1;
} }
signal_emit("time changed", 0); signal_emit__time_changed();
last_timestamp = now; last_timestamp = now;
} }

2
src/core/pidwait.c
View File

@ -30,7 +30,7 @@ static int signal_pidwait;
static void sig_child(GPid pid, gint status, gpointer data) static void sig_child(GPid pid, gint status, gpointer data)
{ {
signal_emit_id(signal_pidwait, 2, GINT_TO_POINTER(pid), signal_emit__pidwait(GINT_TO_POINTER(pid),
GINT_TO_POINTER(status)); GINT_TO_POINTER(status));
g_hash_table_remove(child_pids, GINT_TO_POINTER(pid)); g_hash_table_remove(child_pids, GINT_TO_POINTER(pid));
pids = g_slist_remove(pids, GINT_TO_POINTER(pid)); pids = g_slist_remove(pids, GINT_TO_POINTER(pid));

2
src/core/rawlog.c
View File

@ -74,7 +74,7 @@ static void rawlog_add(RAWLOG_REC *rawlog, char *str)
} }
g_queue_push_tail(rawlog->lines, str); g_queue_push_tail(rawlog->lines, str);
signal_emit_id(signal_rawlog, 2, rawlog, str); signal_emit__rawlog(rawlog, str);
} }
void rawlog_input(RAWLOG_REC *rawlog, const char *str) void rawlog_input(RAWLOG_REC *rawlog, const char *str)

2
src/core/session.c
View File

@ -87,7 +87,7 @@ static void cmd_upgrade(const char *data)
session_args = g_strsplit(str, " ", -1); session_args = g_strsplit(str, " ", -1);
g_free(str); g_free(str);
signal_emit("gui exit", 0); signal_emit__gui_exit();
} }
static void session_save_nick(CHANNEL_REC *channel, NICK_REC *nick, static void session_save_nick(CHANNEL_REC *channel, NICK_REC *nick,

4
src/core/settings.c
View File

@ -484,7 +484,7 @@ static void sig_init_finished(void)
config file, reload it */ config file, reload it */
g_warning("Some settings were automatically " g_warning("Some settings were automatically "
"updated, please /SAVE"); "updated, please /SAVE");
signal_emit("setup changed", 0); signal_emit__setup_changed();
} }
signal_emit__settings_userinfo_changed(GUINT_TO_POINTER(user_settings_changed)); signal_emit__settings_userinfo_changed(GUINT_TO_POINTER(user_settings_changed));
@ -814,7 +814,7 @@ int settings_reread(const char *fname)
mainconfig = tempconfig; mainconfig = tempconfig;
config_last_modifycounter = mainconfig->modifycounter; config_last_modifycounter = mainconfig->modifycounter;
signal_emit("setup changed", 0); signal_emit__setup_changed();
signal_emit__setup_reread(mainconfig->fname); signal_emit__setup_reread(mainconfig->fname);
return TRUE; return TRUE;
} }

4
src/core/signals.c
View File

@ -271,7 +271,7 @@ static int signal_emit_real(Signal *rec, int params, va_list va,
return stopped; return stopped;
} }
int signal_emit(const char *signal, int params, ...) int signal_emit_raw(const char *signal, int params, ...)
{ {
Signal *rec; Signal *rec;
va_list va; va_list va;
@ -291,7 +291,7 @@ int signal_emit(const char *signal, int params, ...)
return rec != NULL; return rec != NULL;
} }
int signal_emit_id(int signal_id, int params, ...) int signal_emit_id_raw(int signal_id, int params, ...)
{ {
Signal *rec; Signal *rec;
va_list va; va_list va;

4
src/core/signals.h
View File

@ -40,8 +40,8 @@ void signal_remove_full(const char *signal, SIGNAL_FUNC func, void *user_data);
void signal_remove_id(int signal_id, SIGNAL_FUNC func, void *user_data); void signal_remove_id(int signal_id, SIGNAL_FUNC func, void *user_data);
/* emit signal */ /* emit signal */
int signal_emit(const char *signal, int params, ...); int signal_emit_raw(const char *signal, int params, ...);
int signal_emit_id(int signal_id, int params, ...); int signal_emit_id_raw(int signal_id, int params, ...);
/* continue currently emitted signal with different parameters */ /* continue currently emitted signal with different parameters */
void signal_continue(int params, ...); void signal_continue(int params, ...);

5
src/fe-common/core/completion.c
View File

@ -21,6 +21,7 @@
#include "module.h" #include "module.h"
#include "module-formats.h" #include "module-formats.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "commands.h" #include "commands.h"
#include "levels.h" #include "levels.h"
#include "misc.h" #include "misc.h"
@ -681,7 +682,7 @@ static void sig_complete_word(GList **list, WINDOW_REC *window,
/* complete parameters */ /* complete parameters */
signal = g_strconcat("complete command ", cmd, NULL); signal = g_strconcat("complete command ", cmd, NULL);
signal_emit(signal, 5, list, window, word, args, want_space); signal_emit__complete_command_(cmd, list, window, word, args, want_space);
if (command_have_sub(line)) { if (command_have_sub(line)) {
/* complete subcommand */ /* complete subcommand */
@ -722,7 +723,7 @@ static void sig_complete_erase(WINDOW_REC *window, const char *word,
} }
signal = g_strconcat("complete erase command ", cmd, NULL); signal = g_strconcat("complete erase command ", cmd, NULL);
signal_emit(signal, 3, window, word, args); signal_emit__complete_erase_command_(cmd, window, word, args);
g_free(signal); g_free(signal);
g_free(cmd); g_free(cmd);

7
src/fe-common/core/fe-channels.c
View File

@ -22,6 +22,7 @@
#include "module-formats.h" #include "module-formats.h"
#include "modules.h" #include "modules.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "commands.h" #include "commands.h"
#include "levels.h" #include "levels.h"
#include "misc.h" #include "misc.h"
@ -242,7 +243,7 @@ static void cmd_channel(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
if (*data == '\0') if (*data == '\0')
cmd_channel_list_joined(); cmd_channel_list_joined();
else if (server != NULL && server_ischannel(server, data)) { else if (server != NULL && server_ischannel(server, data)) {
signal_emit__command_join(data, server, item); signal_emit__command_("join", data, server, item);
} else { } else {
command_runsub("channel", data, server, item); command_runsub("channel", data, server, item);
} }
@ -578,7 +579,7 @@ static void cmd_names(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
g_string_truncate(unknowns, unknowns->len-1); g_string_truncate(unknowns, unknowns->len-1);
if (unknowns->len > 0 && g_strcmp0(channel, unknowns->str) != 0) if (unknowns->len > 0 && g_strcmp0(channel, unknowns->str) != 0)
signal_emit__command_names(unknowns->str, server, item); signal_emit__command_("names", unknowns->str, server, item);
g_string_free(unknowns, TRUE); g_string_free(unknowns, TRUE);
cmd_params_free(free_arg); cmd_params_free(free_arg);
@ -608,7 +609,7 @@ static void cmd_cycle(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
chanrec->server->tag, chanrec->name); chanrec->server->tag, chanrec->name);
/* FIXME: kludgy kludgy... */ /* FIXME: kludgy kludgy... */
signal_emit__command_part(data, server, item); signal_emit__command_("part", data, server, item);
if (g_slist_find(channels, chanrec) != NULL) { if (g_slist_find(channels, chanrec) != NULL) {
chanrec->left = TRUE; chanrec->left = TRUE;

10
src/fe-common/core/fe-common-core.c
View File

@ -22,6 +22,8 @@
#include "module-formats.h" #include "module-formats.h"
#include "args.h" #include "args.h"
#include "misc.h" #include "misc.h"
#include "signals.h"
#include "signal-registry.h"
#include "levels.h" #include "levels.h"
#include "settings.h" #include "settings.h"
@ -340,7 +342,7 @@ static void autoconnect_servers(void)
else else
str = g_strdup_printf("%s %d %s", autocon_server, autocon_port, autocon_password); str = g_strdup_printf("%s %d %s", autocon_server, autocon_port, autocon_password);
signal_emit__command_connect(str); signal_emit__command_("connect", str, NULL, NULL);
g_free(str); g_free(str);
return; return;
} }
@ -365,7 +367,7 @@ static void autoconnect_servers(void)
str = g_strdup_printf("%s %d", rec->address, rec->port); str = g_strdup_printf("%s %d", rec->address, rec->port);
} }
signal_emit__command_connect(str); signal_emit__command_("connect", str, NULL, NULL);
g_free(str); g_free(str);
} }
} }
@ -436,7 +438,7 @@ void fe_common_core_finish_init(void)
{ {
int setup_changed; int setup_changed;
signal_emit("irssi init read settings", 0); signal_emit__irssi_init_read_settings();
#ifdef SIGPIPE #ifdef SIGPIPE
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
@ -462,7 +464,7 @@ void fe_common_core_finish_init(void)
g_log_set_default_handler((GLogFunc) glog_func, NULL); g_log_set_default_handler((GLogFunc) glog_func, NULL);
if (setup_changed) if (setup_changed)
signal_emit("setup changed", 0); signal_emit__setup_changed();
autorun_startup(); autorun_startup();
autoconnect_servers(); autoconnect_servers();

3
src/fe-common/core/fe-core-commands.c
View File

@ -22,6 +22,7 @@
#include "module.h" #include "module.h"
#include "module-formats.h" #include "module-formats.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "commands.h" #include "commands.h"
#include "levels.h" #include "levels.h"
#include "misc.h" #include "misc.h"
@ -168,7 +169,7 @@ static void cmd_cat(const char *data)
/* SYNTAX: BEEP */ /* SYNTAX: BEEP */
static void cmd_beep(void) static void cmd_beep(void)
{ {
signal_emit("beep", 0); signal_emit__beep();
} }
static void cmd_nick(const char *data, SERVER_REC *server) static void cmd_nick(const char *data, SERVER_REC *server)

9
src/fe-common/core/fe-exec.c
View File

@ -21,6 +21,7 @@
#include "module.h" #include "module.h"
#include "modules.h" #include "modules.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "commands.h" #include "commands.h"
#include "pidwait.h" #include "pidwait.h"
#include "line-split.h" #include "line-split.h"
@ -368,7 +369,7 @@ static void sig_exec_input_reader(PROCESS_REC *rec)
} }
if (ret > 0) { if (ret > 0) {
signal_emit_id(signal_exec_input, 2, rec, str); signal_emit__exec_input(rec, str);
if (recvlen > 0) recvlen = 0; if (recvlen > 0) recvlen = 0;
} }
} while (ret > 0); } while (ret > 0);
@ -565,7 +566,7 @@ static void sig_pidwait(void *pid, void *statusp)
/* process exited - print the last line if /* process exited - print the last line if
there wasn't a newline at end. */ there wasn't a newline at end. */
if (line_split("\n", 1, &str, &rec->databuf) > 0 && *str != '\0') if (line_split("\n", 1, &str, &rec->databuf) > 0 && *str != '\0')
signal_emit_id(signal_exec_input, 2, rec, str); signal_emit__exec_input(rec, str);
if (!rec->silent) { if (!rec->silent) {
if (WIFSIGNALED(status)) { if (WIFSIGNALED(status)) {
@ -613,8 +614,8 @@ static void sig_exec_input(PROCESS_REC *rec, const char *text)
str = g_strconcat(rec->target_nick ? "-nick " : str = g_strconcat(rec->target_nick ? "-nick " :
rec->target_channel ? "-channel " : "", rec->target_channel ? "-channel " : "",
rec->target, " ", *text == '\0' ? " " : text, NULL); rec->target, " ", *text == '\0' ? " " : text, NULL);
signal_emit(rec->notice ? "command notice" : "command msg", signal_emit__command_(rec->notice ? "notice" : "msg",
3, str, server, item); str, server, item);
g_free(str); g_free(str);
} else if (rec->target_item != NULL) { } else if (rec->target_item != NULL) {
printtext(NULL, rec->target_item->visible_name, printtext(NULL, rec->target_item->visible_name,

2
src/fe-common/core/fe-log.c
View File

@ -675,7 +675,7 @@ static void sig_awaylog_show(LOG_REC *log, gpointer pmsgs, gpointer pfilepos)
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_AWAY_MSGS, log->real_fname, msgs); printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_AWAY_MSGS, log->real_fname, msgs);
str = g_strdup_printf("\"%s\" %d", log->real_fname, filepos); str = g_strdup_printf("\"%s\" %d", log->real_fname, filepos);
signal_emit__command_cat(str); signal_emit__command_("cat", str, NULL, NULL);
g_free(str); g_free(str);
} }
} }

5
src/fe-common/core/fe-queries.c
View File

@ -22,6 +22,7 @@
#include "module-formats.h" #include "module-formats.h"
#include "modules.h" #include "modules.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "commands.h" #include "commands.h"
#include "levels.h" #include "levels.h"
#include "settings.h" #include "settings.h"
@ -133,7 +134,7 @@ static void signal_query_nick_changed(QUERY_REC *query, const char *oldnick)
query->address == NULL ? "" : query->address); query->address == NULL ? "" : query->address);
} }
signal_emit__window_item_changed(window_item_window((WI_ITEM_REC *) query), query); signal_emit__window_item_changed(window_item_window((WI_ITEM_REC *) query), (WI_ITEM_REC *)query);
} }
static void signal_window_item_server_changed(WINDOW_REC *window, static void signal_window_item_server_changed(WINDOW_REC *window,
@ -274,7 +275,7 @@ static void cmd_query(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
if (*msg != '\0') { if (*msg != '\0') {
msg = g_strdup_printf("-nick %s %s", nick, msg); msg = g_strdup_printf("-nick %s %s", nick, msg);
signal_emit__command_msg(msg, server, query); signal_emit__command_("msg", msg, server, (WI_ITEM_REC *)query);
g_free(msg); g_free(msg);
} }

1
src/fe-common/core/fe-server.c
View File

@ -20,6 +20,7 @@
#include "module.h" #include "module.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "commands.h" #include "commands.h"
#include "network.h" #include "network.h"
#include "levels.h" #include "levels.h"

5
src/fe-common/core/fe-settings.c
View File

@ -21,6 +21,7 @@
#include "module.h" #include "module.h"
#include "module-formats.h" #include "module-formats.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "commands.h" #include "commands.h"
#include "servers.h" #include "servers.h"
#include "misc.h" #include "misc.h"
@ -196,7 +197,7 @@ static void cmd_set(char *data)
/* Unpossible! */ /* Unpossible! */
break; break;
} }
signal_emit("setup changed", 0); signal_emit__setup_changed();
printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_SET_TITLE, rec->section); printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_SET_TITLE, rec->section);
set_print(rec); set_print(rec);
} else } else
@ -227,7 +228,7 @@ static void cmd_toggle(const char *data)
else { else {
set_boolean(key, *value != '\0' ? value : "TOGGLE"); set_boolean(key, *value != '\0' ? value : "TOGGLE");
set_print(settings_get_record(key)); set_print(settings_get_record(key));
signal_emit("setup changed", 0); signal_emit__setup_changed();
} }
cmd_params_free(free_arg); cmd_params_free(free_arg);

1
src/fe-common/core/fe-windows.c
View File

@ -22,6 +22,7 @@
#include "module-formats.h" #include "module-formats.h"
#include "modules.h" #include "modules.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "commands.h" #include "commands.h"
#include "servers.h" #include "servers.h"
#include "misc.h" #include "misc.h"

7
src/fe-common/core/formats.c
View File

@ -21,6 +21,7 @@
#include "module.h" #include "module.h"
#include "module-formats.h" #include "module-formats.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "special-vars.h" #include "special-vars.h"
#include "settings.h" #include "settings.h"
@ -853,7 +854,7 @@ void format_newline(WINDOW_REC *window)
{ {
g_return_if_fail(window != NULL); g_return_if_fail(window != NULL);
signal_emit_id(signal_gui_print_text, 6, window, signal_emit__gui_print_text(window,
GINT_TO_POINTER(-1), GINT_TO_POINTER(-1), GINT_TO_POINTER(-1), GINT_TO_POINTER(-1),
GINT_TO_POINTER(GUI_PRINT_FLAG_NEWLINE), GINT_TO_POINTER(GUI_PRINT_FLAG_NEWLINE),
"", NULL); "", NULL);
@ -1238,7 +1239,7 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
if (*str == '\0') { if (*str == '\0') {
/* empty line, write line info only */ /* empty line, write line info only */
signal_emit_id(signal_gui_print_text, 6, dest->window, GINT_TO_POINTER(fgcolor), signal_emit__gui_print_text(dest->window, GINT_TO_POINTER(fgcolor),
GINT_TO_POINTER(bgcolor), GINT_TO_POINTER(flags), str, dest); GINT_TO_POINTER(bgcolor), GINT_TO_POINTER(flags), str, dest);
} }
@ -1259,7 +1260,7 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
if (*str != '\0' || (flags & GUI_PRINT_FLAG_CLRTOEOL)) { if (*str != '\0' || (flags & GUI_PRINT_FLAG_CLRTOEOL)) {
/* send the text to gui handler */ /* send the text to gui handler */
signal_emit_id(signal_gui_print_text, 6, dest->window, signal_emit__gui_print_text(dest->window,
GINT_TO_POINTER(fgcolor), GINT_TO_POINTER(fgcolor),
GINT_TO_POINTER(bgcolor), GINT_TO_POINTER(bgcolor),
GINT_TO_POINTER(flags), str, GINT_TO_POINTER(flags), str,

1
src/fe-common/core/hilight-text.c
View File

@ -21,6 +21,7 @@
#include "module.h" #include "module.h"
#include "module-formats.h" #include "module-formats.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "commands.h" #include "commands.h"
#include "levels.h" #include "levels.h"
#include "misc.h" #include "misc.h"

5
src/fe-common/core/keyboard.c
View File

@ -21,6 +21,7 @@
#include "module.h" #include "module.h"
#include "module-formats.h" #include "module-formats.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "commands.h" #include "commands.h"
#include "levels.h" #include "levels.h"
#include "misc.h" #include "misc.h"
@ -613,7 +614,7 @@ static int key_emit_signal(KEYBOARD_REC *keyboard, KEY_REC *key)
char *str; char *str;
str = g_strconcat("key ", key->info->id, NULL); str = g_strconcat("key ", key->info->id, NULL);
consumed = signal_emit(str, 3, key->data, keyboard->gui_data, key->info); consumed = signal_emit__key_(str, key->data, keyboard->gui_data, key->info);
g_free(str); g_free(str);
return consumed; return consumed;
@ -745,7 +746,7 @@ static void sig_multi(const char *data, void *gui_data)
info = key_info_find(*tmp); info = key_info_find(*tmp);
if (info != NULL) { if (info != NULL) {
str = g_strconcat("key ", info->id, NULL); str = g_strconcat("key ", info->id, NULL);
signal_emit(str, 3, p, gui_data, info); signal_emit__key_(info->id, p, gui_data, info);
g_free(str); g_free(str);
} }
} }

17
src/fe-common/core/printtext.c
View File

@ -22,6 +22,7 @@
#include "module-formats.h" #include "module-formats.h"
#include "modules.h" #include "modules.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "commands.h" #include "commands.h"
#include "settings.h" #include "settings.h"
@ -68,11 +69,11 @@ void printformat_module_dest_charargs(const char *module, TEXT_DEST_REC *dest,
if (!sending_print_starting) { if (!sending_print_starting) {
sending_print_starting = TRUE; sending_print_starting = TRUE;
signal_emit_id(signal_print_starting, 1, dest); signal_emit__print_starting(dest);
sending_print_starting = FALSE; sending_print_starting = FALSE;
} }
signal_emit_id(signal_print_format, 5, theme, module, signal_emit__print_format(theme, module,
dest, GINT_TO_POINTER(formatnum), arglist); dest, GINT_TO_POINTER(formatnum), arglist);
str = format_get_text_theme_charargs(theme, module, dest, str = format_get_text_theme_charargs(theme, module, dest,
@ -179,7 +180,7 @@ static void print_line(TEXT_DEST_REC *dest, const char *text)
/* send both the formatted + stripped (for logging etc.) */ /* send both the formatted + stripped (for logging etc.) */
stripped = strip_codes(str); stripped = strip_codes(str);
signal_emit_id(signal_print_text, 3, dest, str, stripped); signal_emit__print_text(dest, str, stripped);
g_free_and_null(dest->hilight_color); g_free_and_null(dest->hilight_color);
g_free(str); g_free(str);
@ -308,7 +309,7 @@ static void printtext_dest_args(TEXT_DEST_REC *dest, const char *text, va_list v
if (!sending_print_starting) { if (!sending_print_starting) {
sending_print_starting = TRUE; sending_print_starting = TRUE;
signal_emit_id(signal_print_starting, 1, dest); signal_emit__print_starting(dest);
sending_print_starting = FALSE; sending_print_starting = FALSE;
} }
@ -353,7 +354,7 @@ void printtext_string(void *server, const char *target, int level, const char *t
if (!sending_print_starting) { if (!sending_print_starting) {
sending_print_starting = TRUE; sending_print_starting = TRUE;
signal_emit_id(signal_print_starting, 1, &dest); signal_emit__print_starting(&dest);
sending_print_starting = FALSE; sending_print_starting = FALSE;
} }
@ -375,7 +376,7 @@ void printtext_string_window(WINDOW_REC *window, int level, const char *text)
if (!sending_print_starting) { if (!sending_print_starting) {
sending_print_starting = TRUE; sending_print_starting = TRUE;
signal_emit_id(signal_print_starting, 1, &dest); signal_emit__print_starting(&dest);
sending_print_starting = FALSE; sending_print_starting = FALSE;
} }
@ -432,7 +433,7 @@ static void msg_beep_check(TEXT_DEST_REC *dest)
(beep_when_away || (dest->server != NULL && (beep_when_away || (dest->server != NULL &&
!dest->server->usermode_away)) && !dest->server->usermode_away)) &&
(beep_when_window_active || dest->window != active_win)) { (beep_when_window_active || dest->window != active_win)) {
signal_emit("beep", 0); signal_emit__beep();
} }
} }
@ -470,7 +471,7 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text)
format_send_to_gui(dest, str); format_send_to_gui(dest, str);
g_free(str); g_free(str);
signal_emit_id(signal_gui_print_text_finished, 1, dest->window); signal_emit__gui_print_text_finished(dest->window);
} }
void printtext_multiline(void *server, const char *target, int level, void printtext_multiline(void *server, const char *target, int level,

1
src/fe-common/core/themes.c
View File

@ -21,6 +21,7 @@
#include "module.h" #include "module.h"
#include "module-formats.h" #include "module-formats.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "commands.h" #include "commands.h"
#include "levels.h" #include "levels.h"
#include "misc.h" #include "misc.h"

2
src/fe-common/core/themes.h
View File

@ -10,7 +10,7 @@ typedef struct {
expanding {templates} */ expanding {templates} */
} MODULE_THEME_REC; } MODULE_THEME_REC;
typedef struct { typedef struct _THEME_REC {
int refcount; int refcount;
char *path; char *path;

3
src/fe-common/core/window-activity.c
View File

@ -20,6 +20,7 @@
#include "module.h" #include "module.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "levels.h" #include "levels.h"
#include "servers.h" #include "servers.h"
#include "channels.h" #include "channels.h"
@ -93,7 +94,7 @@ static void sig_hilight_text(TEXT_DEST_REC *dest, const char *msg)
} }
/* we should ask the text view if this line is hidden */ /* we should ask the text view if this line is hidden */
signal_emit_id(signal_window_hilight_check, 4, dest, msg, &data_level, &cb_ignore); signal_emit__window_hilight_check(dest, msg, &data_level, &cb_ignore);
if (cb_ignore) { if (cb_ignore) {
return; return;
} }

7
src/fe-common/core/window-commands.c
View File

@ -21,6 +21,7 @@
#include "module.h" #include "module.h"
#include "module-formats.h" #include "module-formats.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "commands.h" #include "commands.h"
#include "misc.h" #include "misc.h"
#include "servers.h" #include "servers.h"
@ -164,7 +165,7 @@ static void cmd_window(const char *data, void *server, WI_ITEM_REC *item)
if (*data == '\0') if (*data == '\0')
cmd_window_info(active_win); cmd_window_info(active_win);
else if (is_numeric(data, 0)) else if (is_numeric(data, 0))
signal_emit__command_window_refnum(data, server, item); signal_emit__command_("window refnum", data, server, item);
else else
command_runsub("window", data, server, item); command_runsub("window", data, server, item);
} }
@ -507,7 +508,7 @@ static void cmd_window_item(const char *data, void *server, WI_ITEM_REC *item)
while (*data == ' ') data++; while (*data == ' ') data++;
if (is_numeric(data, '\0')) if (is_numeric(data, '\0'))
signal_emit__command_window_item_goto(data, server, item); signal_emit__command_("window item goto", data, server, item);
else else
command_runsub("window item", data, server, item); command_runsub("window item", data, server, item);
} }
@ -873,7 +874,7 @@ static void cmd_window_default_command(const char *data, SERVER_REC *server, WI_
!settings_get_bool("window_number_commands")) { !settings_get_bool("window_number_commands")) {
return; return;
} }
signal_emit__command_window_refnum(data, server, item); signal_emit__command_("window refnum", data, server, item);
signal_stop(); signal_stop();
} }

1
src/fe-common/core/window-items.c
View File

@ -22,6 +22,7 @@
#include "module-formats.h" #include "module-formats.h"
#include "modules.h" #include "modules.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "servers.h" #include "servers.h"
#include "channels.h" #include "channels.h"
#include "settings.h" #include "settings.h"

7
src/fe-common/core/windows-layout.c
View File

@ -20,6 +20,7 @@
#include "module.h" #include "module.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "misc.h" #include "misc.h"
#include "levels.h" #include "levels.h"
#include "lib-config/iconfig.h" #include "lib-config/iconfig.h"
@ -110,7 +111,7 @@ static void window_add_items(WINDOW_REC *window, CONFIG_NODE *node)
void windows_layout_restore(void) void windows_layout_restore(void)
{ {
signal_emit("layout restore", 0); signal_emit__layout_restore();
} }
static void sig_layout_restore(void) static void sig_layout_restore(void)
@ -238,7 +239,7 @@ void windows_layout_save(void)
sorted = windows_get_sorted(); sorted = windows_get_sorted();
g_slist_foreach(sorted, (GFunc) window_save, node); g_slist_foreach(sorted, (GFunc) window_save, node);
g_slist_free(sorted); g_slist_free(sorted);
signal_emit("layout save", 0); signal_emit__layout_save();
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
TXT_WINDOWS_LAYOUT_SAVED); TXT_WINDOWS_LAYOUT_SAVED);
@ -255,7 +256,7 @@ void windows_layout_reset(void)
} }
iconfig_set_str(NULL, "windows", NULL); iconfig_set_str(NULL, "windows", NULL);
signal_emit("layout reset", 0); signal_emit__layout_reset();
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
TXT_WINDOWS_LAYOUT_RESET); TXT_WINDOWS_LAYOUT_RESET);

7
src/fe-common/irc/dcc/fe-dcc-chat.c
View File

@ -20,6 +20,7 @@
#include "module.h" #include "module.h"
#include "signals.h" #include "signals.h"
#include "../signal-registry.h"
#include "commands.h" #include "commands.h"
#include "levels.h" #include "levels.h"
#include "settings.h" #include "settings.h"
@ -269,7 +270,7 @@ static void cmd_me(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
dcc = item_get_dcc(item); dcc = item_get_dcc(item);
if (dcc != NULL) if (dcc != NULL)
signal_emit__message_dcc_own_action(dcc, data); signal_emit__message_dcc_own__action(dcc, data);
} }
static void cmd_action(const char *data, SERVER_REC *server, WI_ITEM_REC *item) static void cmd_action(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
@ -299,7 +300,7 @@ static void cmd_action(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
if (query_find(NULL, target) == NULL) if (query_find(NULL, target) == NULL)
completion_last_message_add(target); completion_last_message_add(target);
signal_emit__message_dcc_own_action(dcc, text); signal_emit__message_dcc_own__action(dcc, text);
} }
cmd_params_free(free_arg); cmd_params_free(free_arg);
} }
@ -332,7 +333,7 @@ static void cmd_ctcp(const char *data, SERVER_REC *server)
IRCTXT_DCC_CHAT_NOT_FOUND, target+1); IRCTXT_DCC_CHAT_NOT_FOUND, target+1);
} else { } else {
ascii_strup(ctcpcmd); ascii_strup(ctcpcmd);
signal_emit__message_dcc_own_ctcp(dcc, ctcpcmd, ctcpdata); signal_emit__message_dcc_own__ctcp(dcc, ctcpcmd, ctcpdata);
} }
cmd_params_free(free_arg); cmd_params_free(free_arg);

1
src/fe-common/irc/dcc/fe-dcc.c
View File

@ -20,6 +20,7 @@
#include "module.h" #include "module.h"
#include "signals.h" #include "signals.h"
#include "../../core/signal-registry.h"
#include "commands.h" #include "commands.h"
#include "network.h" #include "network.h"
#include "levels.h" #include "levels.h"

1
src/fe-common/irc/fe-ctcp.c
View File

@ -21,6 +21,7 @@
#include "module.h" #include "module.h"
#include "module-formats.h" #include "module-formats.h"
#include "misc.h" #include "misc.h"
#include "signal-registry.h"
#include "settings.h" #include "settings.h"
#include "levels.h" #include "levels.h"

40
src/fe-common/irc/fe-events.c
View File

@ -21,6 +21,9 @@
#include "module.h" #include "module.h"
#include "module-formats.h" #include "module-formats.h"
#include "signals.h" #include "signals.h"
#include "../../irc/core/signal-registry.h"
#include "../core/signal-registry.h"
#include "signal-registry.h"
#include "misc.h" #include "misc.h"
#include "settings.h" #include "settings.h"
@ -61,12 +64,16 @@ static void event_privmsg(IRC_SERVER_REC *server, const char *data,
/* pass the original target to the signal, with the @+ here /* pass the original target to the signal, with the @+ here
* the other one is only needed for recode_in*/ * the other one is only needed for recode_in*/
signal_emit__message_irc_op_public(server, recoded, nick, addr, target); signal_emit__message_irc_op__public(server, recoded, nick, addr, target);
} else { } else {
recoded = recode_in(SERVER(server), msg, server_ischannel(SERVER(server), target) ? target : nick); recoded = recode_in(SERVER(server), msg, server_ischannel(SERVER(server), target) ? target : nick);
signal_emit(server_ischannel(SERVER(server), target) ? if (server_ischannel(SERVER(server), target))
"message public" : "message private", 5, signal_emit__message_public(
server, recoded, nick, addr, (SERVER_REC *)server, recoded, nick, addr,
get_visible_target(server, target));
else
signal_emit__message_private(
(SERVER_REC *)server, recoded, nick, addr,
get_visible_target(server, target)); get_visible_target(server, target));
} }
@ -119,7 +126,7 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
tmp = strchr(channel, 7); /* ^G does something weird.. */ tmp = strchr(channel, 7); /* ^G does something weird.. */
if (tmp != NULL) *tmp = '\0'; if (tmp != NULL) *tmp = '\0';
signal_emit__message_join(server, signal_emit__message_join((SERVER_REC *)server,
get_visible_target(server, channel), nick, addr); get_visible_target(server, channel), nick, addr);
g_free(params); g_free(params);
} }
@ -134,7 +141,7 @@ static void event_part(IRC_SERVER_REC *server, const char *data,
params = event_get_params(data, 2 | PARAM_FLAG_GETREST, params = event_get_params(data, 2 | PARAM_FLAG_GETREST,
&channel, &reason); &channel, &reason);
recoded = recode_in(SERVER(server), reason, channel); recoded = recode_in(SERVER(server), reason, channel);
signal_emit__message_part(server, signal_emit__message_part((SERVER_REC *)server,
get_visible_target(server, channel), nick, addr, recoded); get_visible_target(server, channel), nick, addr, recoded);
g_free(params); g_free(params);
g_free(recoded); g_free(recoded);
@ -149,7 +156,7 @@ static void event_quit(IRC_SERVER_REC *server, const char *data,
if (*data == ':') data++; /* quit message */ if (*data == ':') data++; /* quit message */
recoded = recode_in(SERVER(server), data, nick); recoded = recode_in(SERVER(server), data, nick);
signal_emit__message_quit(server, nick, addr, recoded); signal_emit__message_quit((SERVER_REC *)server, nick, addr, recoded);
g_free(recoded); g_free(recoded);
} }
@ -163,7 +170,7 @@ static void event_kick(IRC_SERVER_REC *server, const char *data,
params = event_get_params(data, 3 | PARAM_FLAG_GETREST, params = event_get_params(data, 3 | PARAM_FLAG_GETREST,
&channel, &nick, &reason); &channel, &nick, &reason);
recoded = recode_in(SERVER(server), reason, channel); recoded = recode_in(SERVER(server), reason, channel);
signal_emit__message_kick(server, get_visible_target(server, channel), signal_emit__message_kick((SERVER_REC *)server, get_visible_target(server, channel),
nick, kicker, addr, recoded); nick, kicker, addr, recoded);
g_free(params); g_free(params);
g_free(recoded); g_free(recoded);
@ -211,9 +218,12 @@ static void event_nick(IRC_SERVER_REC *server, const char *data,
params = event_get_params(data, 1, &newnick); params = event_get_params(data, 1, &newnick);
/* NOTE: server->nick was already changed in irc/core/irc-nicklist.c */ /* NOTE: server->nick was already changed in irc/core/irc-nicklist.c */
signal_emit(g_ascii_strcasecmp(newnick, server->nick) == 0 ? if (g_ascii_strcasecmp(newnick, server->nick) == 0)
"message own_nick" : "message nick", 4, signal_emit__message_own__nick(
server, newnick, sender, addr); (SERVER_REC *)server, newnick, sender, addr);
else
signal_emit__message_nick(
(SERVER_REC *)server, newnick, sender, addr);
g_free(params); g_free(params);
} }
@ -253,7 +263,7 @@ static void event_invite(IRC_SERVER_REC *server, const char *data,
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
params = event_get_params(data, 2, NULL, &channel); params = event_get_params(data, 2, NULL, &channel);
signal_emit__message_invite(server, get_visible_target(server, channel), nick, addr); signal_emit__message_invite((SERVER_REC *)server, get_visible_target(server, channel), nick, addr);
g_free(params); g_free(params);
} }
@ -267,7 +277,7 @@ static void event_topic(IRC_SERVER_REC *server, const char *data,
params = event_get_params(data, 2 | PARAM_FLAG_GETREST, params = event_get_params(data, 2 | PARAM_FLAG_GETREST,
&channel, &topic); &channel, &topic);
recoded = recode_in(SERVER(server), topic, channel); recoded = recode_in(SERVER(server), topic, channel);
signal_emit__message_topic(server, signal_emit__message_topic((SERVER_REC *)server,
get_visible_target(server, channel), recoded, nick, addr); get_visible_target(server, channel), recoded, nick, addr);
g_free(params); g_free(params);
g_free(recoded); g_free(recoded);
@ -409,7 +419,7 @@ static void sig_whowas_event_end(IRC_SERVER_REC *server, const char *data,
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
if (server->whowas_found) { if (server->whowas_found) {
signal_emit__event_369(server, data, sender, addr); signal_emit__event_("369", (SERVER_REC *)server, data, sender, addr);
return; return;
} }
@ -427,7 +437,7 @@ static void event_received(IRC_SERVER_REC *server, const char *data,
} }
/* numeric event. */ /* numeric event. */
signal_emit__default_event_numeric(server, data, nick, addr); signal_emit__default_event_numeric((SERVER_REC *)server, data, nick, addr);
} }
void fe_events_init(void) void fe_events_init(void)

19
src/fe-common/irc/fe-irc-commands.c
View File

@ -21,6 +21,7 @@
#include "module.h" #include "module.h"
#include "module-formats.h" #include "module-formats.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "misc.h" #include "misc.h"
#include "special-vars.h" #include "special-vars.h"
#include "settings.h" #include "settings.h"
@ -59,7 +60,7 @@ static void cmd_me(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
splitdata = irc_server_split_action(server, target, data); splitdata = irc_server_split_action(server, target, data);
while ((subdata = splitdata[n++])) { while ((subdata = splitdata[n++])) {
irc_server_send_action(server, target, subdata); irc_server_send_action(server, target, subdata);
signal_emit__message_irc_own_action(server, subdata, signal_emit__message_irc_own__action(server, subdata,
item->visible_name); item->visible_name);
} }
g_strfreev(splitdata); g_strfreev(splitdata);
@ -91,7 +92,7 @@ static void cmd_action(const char *data, IRC_SERVER_REC *server)
splittexts = irc_server_split_action(server, target, text); splittexts = irc_server_split_action(server, target, text);
while ((subtext = splittexts[n++])) { while ((subtext = splittexts[n++])) {
irc_server_send_action(server, target, subtext); irc_server_send_action(server, target, subtext);
signal_emit__message_irc_own_action(server, subtext, signal_emit__message_irc_own__action(server, subtext,
target); target);
} }
@ -116,7 +117,7 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server,
if (*target == '\0' || *msg == '\0') if (*target == '\0' || *msg == '\0')
cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
signal_emit__message_irc_own_notice(server, msg, target); signal_emit__message_irc_own__notice(server, msg, target);
cmd_params_free(free_arg); cmd_params_free(free_arg);
} }
@ -145,7 +146,7 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC *server,
} }
ascii_strup(ctcpcmd); ascii_strup(ctcpcmd);
signal_emit__message_irc_own_ctcp(server, ctcpcmd, ctcpdata, target); signal_emit__message_irc_own__ctcp(server, ctcpcmd, ctcpdata, target);
cmd_params_free(free_arg); cmd_params_free(free_arg);
} }
@ -166,7 +167,7 @@ static void cmd_nctcp(const char *data, IRC_SERVER_REC *server,
if (*target == '\0' || *text == '\0') if (*target == '\0' || *text == '\0')
cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
signal_emit__message_irc_own_notice(server, text, target); signal_emit__message_irc_own__notice(server, text, target);
cmd_params_free(free_arg); cmd_params_free(free_arg);
} }
@ -187,7 +188,7 @@ static void cmd_wall(const char *data, IRC_SERVER_REC *server,
chanrec = irc_channel_find(server, channame); chanrec = irc_channel_find(server, channame);
if (chanrec == NULL) cmd_param_error(CMDERR_CHAN_NOT_FOUND); if (chanrec == NULL) cmd_param_error(CMDERR_CHAN_NOT_FOUND);
signal_emit__message_irc_own_wall(server, msg, signal_emit__message_irc_own__wall(server, msg,
chanrec->visible_name); chanrec->visible_name);
cmd_params_free(free_arg); cmd_params_free(free_arg);
@ -200,10 +201,10 @@ static void bans_ask_channel(const char *channel, IRC_SERVER_REC *server,
str = g_string_new(NULL); str = g_string_new(NULL);
g_string_printf(str, "%s b", channel); g_string_printf(str, "%s b", channel);
signal_emit__command_mode(str->str, server, item); signal_emit__command_("mode", str->str, (SERVER_REC *)server, item);
if (server->emode_known) { if (server->emode_known) {
g_string_printf(str, "%s e", channel); g_string_printf(str, "%s e", channel);
signal_emit__command_mode(str->str, server, item); signal_emit__command_("mode", str->str, (SERVER_REC *)server, item);
} }
g_string_free(str, TRUE); g_string_free(str, TRUE);
} }
@ -289,7 +290,7 @@ static void cmd_ver(gchar *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
str = g_strdup_printf("%s VERSION", *data == '\0' ? str = g_strdup_printf("%s VERSION", *data == '\0' ?
window_item_get_target(item) : data); window_item_get_target(item) : data);
signal_emit__command_ctcp(str, server, item); signal_emit__command_("ctcp", str, (SERVER_REC *)server, item);
g_free(str); g_free(str);
} }

1
src/fe-text/gui-printtext.c
View File

@ -20,6 +20,7 @@
#include "module.h" #include "module.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "settings.h" #include "settings.h"
#include "formats.h" #include "formats.h"

29
src/fe-text/gui-readline.c
View File

@ -21,6 +21,7 @@
#include "module.h" #include "module.h"
#include "module-formats.h" #include "module-formats.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "misc.h" #include "misc.h"
#include "settings.h" #include "settings.h"
#include "special-vars.h" #include "special-vars.h"
@ -890,17 +891,17 @@ static void key_scroll_forward(void)
static void key_scroll_start(void) static void key_scroll_start(void)
{ {
signal_emit__command_scrollback_home(NULL, active_win->active_server, active_win->active); signal_emit__command_("scrollback home", NULL, active_win->active_server, active_win->active);
} }
static void key_scroll_end(void) static void key_scroll_end(void)
{ {
signal_emit__command_scrollback_end(NULL, active_win->active_server, active_win->active); signal_emit__command_("scrollback end", NULL, active_win->active_server, active_win->active);
} }
static void key_change_window(const char *data) static void key_change_window(const char *data)
{ {
signal_emit__command_window_goto(data, active_win->active_server, active_win->active); signal_emit__command_("window goto", data, active_win->active_server, active_win->active);
} }
static void key_completion(int erase, int backward) static void key_completion(int erase, int backward)
@ -950,37 +951,37 @@ static void key_check_replaces(void)
static void key_previous_window(void) static void key_previous_window(void)
{ {
signal_emit__command_window_previous("", active_win->active_server, active_win->active); signal_emit__command_("window previous", "", active_win->active_server, active_win->active);
} }
static void key_next_window(void) static void key_next_window(void)
{ {
signal_emit__command_window_next("", active_win->active_server, active_win->active); signal_emit__command_("window next", "", active_win->active_server, active_win->active);
} }
static void key_left_window(void) static void key_left_window(void)
{ {
signal_emit__command_window_left("", active_win->active_server, active_win->active); signal_emit__command_("window _left", "", active_win->active_server, active_win->active);
} }
static void key_right_window(void) static void key_right_window(void)
{ {
signal_emit__command_window_right("", active_win->active_server, active_win->active); signal_emit__command_("window right", "", active_win->active_server, active_win->active);
} }
static void key_upper_window(void) static void key_upper_window(void)
{ {
signal_emit__command_window_up("", active_win->active_server, active_win->active); signal_emit__command_("window up", "", active_win->active_server, active_win->active);
} }
static void key_lower_window(void) static void key_lower_window(void)
{ {
signal_emit__command_window_down("", active_win->active_server, active_win->active); signal_emit__command_("window down", "", active_win->active_server, active_win->active);
} }
static void key_active_window(void) static void key_active_window(void)
{ {
signal_emit__command_window_goto("active", active_win->active_server, active_win->active); signal_emit__command_("window goto", "active", active_win->active_server, active_win->active);
} }
static SERVER_REC *get_prev_server(SERVER_REC *current) static SERVER_REC *get_prev_server(SERVER_REC *current)
@ -1049,7 +1050,7 @@ static void key_previous_window_item(void)
SERVER_REC *server; SERVER_REC *server;
if (active_win->items != NULL) { if (active_win->items != NULL) {
signal_emit__command_window_item_prev("", signal_emit__command_("window item prev", "",
active_win->active_server, active_win->active); active_win->active_server, active_win->active);
} else if (servers != NULL || lookup_servers != NULL) { } else if (servers != NULL || lookup_servers != NULL) {
/* change server */ /* change server */
@ -1057,7 +1058,7 @@ static void key_previous_window_item(void)
if (server == NULL) if (server == NULL)
server = active_win->connect_server; server = active_win->connect_server;
server = get_prev_server(server); server = get_prev_server(server);
signal_emit__command_window_server(server->tag, signal_emit__command_("window server", server->tag,
active_win->active_server, active_win->active); active_win->active_server, active_win->active);
} }
} }
@ -1067,7 +1068,7 @@ static void key_next_window_item(void)
SERVER_REC *server; SERVER_REC *server;
if (active_win->items != NULL) { if (active_win->items != NULL) {
signal_emit__command_window_item_next("", signal_emit__command_("window item next", "",
active_win->active_server, active_win->active); active_win->active_server, active_win->active);
} else if (servers != NULL || lookup_servers != NULL) { } else if (servers != NULL || lookup_servers != NULL) {
/* change server */ /* change server */
@ -1075,7 +1076,7 @@ static void key_next_window_item(void)
if (server == NULL) if (server == NULL)
server = active_win->connect_server; server = active_win->connect_server;
server = get_next_server(server); server = get_next_server(server);
signal_emit__command_window_server(server->tag, signal_emit__command_("window server", server->tag,
active_win->active_server, active_win->active); active_win->active_server, active_win->active);
} }
} }

1
src/fe-text/gui-windows.c
View File

@ -20,6 +20,7 @@
#include "module.h" #include "module.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "misc.h" #include "misc.h"
#include "settings.h" #include "settings.h"
#include "special-vars.h" #include "special-vars.h"

7
src/fe-text/irssi.c
View File

@ -23,6 +23,9 @@
#include "modules-load.h" #include "modules-load.h"
#include "args.h" #include "args.h"
#include "signals.h" #include "signals.h"
#include "core/signal-registry.h"
#include "fe-common/core/signal-registry.h"
#include "signal-registry.h"
#include "levels.h" #include "levels.h"
#include "core.h" #include "core.h"
#include "settings.h" #include "settings.h"
@ -194,7 +197,7 @@ static void textui_finish_init(void)
dirty_check(); dirty_check();
fe_common_core_finish_init(); fe_common_core_finish_init();
signal_emit("irssi init finished", 0); signal_emit__irssi_init_finished();
statusbar_redraw(NULL, TRUE); statusbar_redraw(NULL, TRUE);
if (servers == NULL && lookup_servers == NULL) { if (servers == NULL && lookup_servers == NULL) {
@ -336,7 +339,7 @@ int main(int argc, char **argv)
if (reload_config) { if (reload_config) {
/* SIGHUP received, do /RELOAD */ /* SIGHUP received, do /RELOAD */
reload_config = FALSE; reload_config = FALSE;
signal_emit__command_reload(""); signal_emit__command_("reload", "", NULL, NULL);
} }
dirty_check(); dirty_check();

2
src/fe-text/mainwindows-layout.c
View File

@ -20,6 +20,8 @@
#include "module.h" #include "module.h"
#include "signals.h" #include "signals.h"
#include "fe-common/core/signal-registry.h"
#include "signal-registry.h"
#include "misc.h" #include "misc.h"
#include "lib-config/iconfig.h" #include "lib-config/iconfig.h"
#include "settings.h" #include "settings.h"

3
src/fe-text/mainwindows.c
View File

@ -21,6 +21,7 @@
#include "module.h" #include "module.h"
#include "module-formats.h" #include "module-formats.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "commands.h" #include "commands.h"
#include "levels.h" #include "levels.h"
#include "misc.h" #include "misc.h"
@ -833,7 +834,7 @@ void mainwindows_resize(int width, int height)
window_set_active(active_mainwin->active); window_set_active(active_mainwin->active);
} }
signal_emit("terminal resized", 0); signal_emit__terminal_resized();
irssi_redraw(); irssi_redraw();
} }

2
src/fe-text/mainwindows.h
View File

@ -13,7 +13,7 @@
#define MAIN_WINDOW_TEXT_WIDTH(window) \ #define MAIN_WINDOW_TEXT_WIDTH(window) \
((window)->width-(window)->statusbar_columns) ((window)->width-(window)->statusbar_columns)
typedef struct { typedef struct _MAIN_WINDOW_REC {
WINDOW_REC *active; WINDOW_REC *active;
TERM_WINDOW *screen_win; TERM_WINDOW *screen_win;

1
src/fe-text/statusbar.c
View File

@ -20,6 +20,7 @@
#include "module.h" #include "module.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "expandos.h" #include "expandos.h"
#include "special-vars.h" #include "special-vars.h"

2
src/fe-text/statusbar.h
View File

@ -46,7 +46,7 @@ typedef struct {
GSList *items; GSList *items;
} STATUSBAR_CONFIG_REC; } STATUSBAR_CONFIG_REC;
typedef struct { typedef struct _STATUSBAR_REC {
STATUSBAR_GROUP_REC *group; STATUSBAR_GROUP_REC *group;
STATUSBAR_CONFIG_REC *config; STATUSBAR_CONFIG_REC *config;

3
src/fe-text/term-terminfo.c
View File

@ -20,6 +20,7 @@
#include "module.h" #include "module.h"
#include "signals.h" #include "signals.h"
#include "core/signal-registry.h"
#include "term.h" #include "term.h"
#include "terminfo-core.h" #include "terminfo-core.h"
#include "fe-windows.h" #include "fe-windows.h"
@ -739,7 +740,7 @@ void term_gets(GArray *buffer, int *line_count)
} else if (ret == -1 && (errno == EINTR || errno == EAGAIN)) } else if (ret == -1 && (errno == EINTR || errno == EAGAIN))
ret = 0; ret = 0;
if (ret == -1) if (ret == -1)
signal_emit__command_quit("Lost terminal"); signal_emit__command_("quit", "Lost terminal", NULL, NULL);
if (ret > 0) { if (ret > 0) {
/* convert input to unichars. */ /* convert input to unichars. */

1
src/fe-text/textbuffer-view.c
View File

@ -23,6 +23,7 @@
#include "module.h" #include "module.h"
#include "textbuffer-view.h" #include "textbuffer-view.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "utf8.h" #include "utf8.h"
typedef struct { typedef struct {

4
src/irc/core/ctcp.c
View File

@ -240,7 +240,7 @@ static void ctcp_msg(IRC_SERVER_REC *server, const char *data,
if (args != NULL) *args++ = '\0'; else args = ""; if (args != NULL) *args++ = '\0'; else args = "";
ascii_strdown(str+9); ascii_strdown(str+9);
if (!signal_emit(str, 5, server, args, nick, addr, target)) { if (!signal_emit__ctcp_msg_(data, server, args, nick, addr, target)) {
signal_emit__default_ctcp_msg(server, data, nick, addr, target); signal_emit__default_ctcp_msg(server, data, nick, addr, target);
} }
g_free(str); g_free(str);
@ -259,7 +259,7 @@ static void ctcp_reply(IRC_SERVER_REC *server, const char *data,
if (args != NULL) *args++ = '\0'; else args = ""; if (args != NULL) *args++ = '\0'; else args = "";
ascii_strdown(str+11); ascii_strdown(str+11);
if (!signal_emit(str, 5, server, args, nick, addr, target)) { if (!signal_emit__ctcp_reply_(data, server, args, nick, addr, target)) {
signal_emit__default_ctcp_reply(server, data, nick, addr, target); signal_emit__default_ctcp_reply(server, data, nick, addr, target);
} }
g_free(str); g_free(str);

17
src/irc/core/irc-cap.c
View File

@ -77,15 +77,6 @@ void cap_finish_negotiation (IRC_SERVER_REC *server)
signal_emit__server_cap_end(server); signal_emit__server_cap_end(server);
} }
static void cap_emit_signal (IRC_SERVER_REC *server, char *cmd, char *args)
{
char *signal_name;
signal_name = g_strdup_printf("server cap %s %s", cmd, args? args: "");
signal_emit(signal_name, 1, server);
g_free(signal_name);
}
static gboolean parse_cap_name(char *name, char **key, char **val) static gboolean parse_cap_name(char *name, char **key, char **val)
{ {
const char *eq; const char *eq;
@ -227,7 +218,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
if (!strcmp(caps[i], "sasl")) if (!strcmp(caps[i], "sasl"))
got_sasl = TRUE; got_sasl = TRUE;
cap_emit_signal(server, "ack", caps[i]); signal_emit__server_cap_ack_(caps[i], server);
} }
/* Hopefully the server has ack'd all the caps requested and we're ready to terminate the /* Hopefully the server has ack'd all the caps requested and we're ready to terminate the
@ -242,7 +233,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
/* A NAK'd request means that a required cap can't be enabled or disabled, don't update the /* A NAK'd request means that a required cap can't be enabled or disabled, don't update the
* list of active caps and notify the listeners. */ * list of active caps and notify the listeners. */
for (i = 0; i < caps_length; i++) for (i = 0; i < caps_length; i++)
cap_emit_signal(server, "nak", caps[i]); signal_emit__server_cap_nak_(caps[i], server);
} }
else if (!g_ascii_strcasecmp(evt, "NEW")) { else if (!g_ascii_strcasecmp(evt, "NEW")) {
for (i = 0; i < caps_length; i++) { for (i = 0; i < caps_length; i++) {
@ -254,7 +245,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
} }
g_hash_table_insert(server->cap_supported, key, val); g_hash_table_insert(server->cap_supported, key, val);
cap_emit_signal(server, "new", key); signal_emit__server_cap_new_(key, server);
} }
} }
else if (!g_ascii_strcasecmp(evt, "DEL")) { else if (!g_ascii_strcasecmp(evt, "DEL")) {
@ -267,7 +258,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
} }
g_hash_table_remove(server->cap_supported, key); g_hash_table_remove(server->cap_supported, key);
cap_emit_signal(server, "delete", key); signal_emit__server_cap_delete_(key, server);
/* The server removed this CAP, remove it from the list /* The server removed this CAP, remove it from the list
* of the active ones if we had requested it */ * of the active ones if we had requested it */
server->cap_active = gslist_delete_string(server->cap_active, key, g_free); server->cap_active = gslist_delete_string(server->cap_active, key, g_free);

17
src/irc/core/irc.c
View File

@ -24,6 +24,7 @@
#include "net-sendbuffer.h" #include "net-sendbuffer.h"
#include "rawlog.h" #include "rawlog.h"
#include "misc.h" #include "misc.h"
#include "signal-registry.h"
#include "irc-servers.h" #include "irc-servers.h"
#include "irc-channels.h" #include "irc-channels.h"
@ -314,6 +315,7 @@ static void strip_params_colon(char *const params)
static void irc_server_event(IRC_SERVER_REC *server, const char *line, static void irc_server_event(IRC_SERVER_REC *server, const char *line,
const char *nick, const char *address) const char *nick, const char *address)
{ {
int emitted;
const char *signal; const char *signal;
char *event, *args; char *event, *args;
@ -328,15 +330,16 @@ static void irc_server_event(IRC_SERVER_REC *server, const char *line,
/* check if event needs to be redirected */ /* check if event needs to be redirected */
signal = server_redirect_get_signal(server, nick, event, args); signal = server_redirect_get_signal(server, nick, event, args);
if (signal == NULL) if (signal != NULL)
signal = event;
else
rawlog_redirect(server->rawlog, signal); rawlog_redirect(server->rawlog, signal);
/* emit it */ /* emit it */
current_server_event = event+6; current_server_event = event+6;
if (!signal_emit(signal, 4, server, args, nick, address)) emitted = signal == NULL ?
signal_emit_id(signal_default_event, 4, server, line, nick, address); signal_emit__event_(line, (SERVER_REC *)server, args, nick, address) :
signal_emit_raw(signal, 4, server, args, nick, address);
if (!emitted)
signal_emit__default_event((SERVER_REC *)server, line, nick, address);
current_server_event = NULL; current_server_event = NULL;
g_free(event); g_free(event);
@ -389,7 +392,7 @@ static void irc_parse_incoming_line(IRC_SERVER_REC *server, char *line)
line = irc_parse_prefix(line, &nick, &address); line = irc_parse_prefix(line, &nick, &address);
if (*line != '\0') if (*line != '\0')
signal_emit_id(signal_server_event, 4, server, line, nick, address); signal_emit__server_event((SERVER_REC *)server, line, nick, address);
} }
/* input function: handle incoming server messages */ /* input function: handle incoming server messages */
@ -410,7 +413,7 @@ static void irc_parse_incoming(SERVER_REC *server)
while (!server->disconnected && while (!server->disconnected &&
(ret = net_sendbuffer_receive_line(server->handle, &str, count < MAX_SOCKET_READS)) > 0) { (ret = net_sendbuffer_receive_line(server->handle, &str, count < MAX_SOCKET_READS)) > 0) {
rawlog_input(server->rawlog, str); rawlog_input(server->rawlog, str);
signal_emit_id(signal_server_incoming, 2, server, str); signal_emit__server_incoming(server, str);
if (server->connection_lost) if (server->connection_lost)
server_disconnect(server); server_disconnect(server);

6
src/irc/core/servers-redirect.c
View File

@ -442,10 +442,10 @@ static void redirect_abort(IRC_SERVER_REC *server, REDIRECT_REC *rec)
g_free(str); g_free(str);
if (rec->failure_signal != NULL) if (rec->failure_signal != NULL)
signal_emit(rec->failure_signal, 1, server); signal_emit_raw(rec->failure_signal, 1, server);
} else if (rec->last_signal != NULL) { } else if (rec->last_signal != NULL) {
/* emit the last signal */ /* emit the last signal */
signal_emit(rec->last_signal, 1, server); signal_emit_raw(rec->last_signal, 1, server);
} }
server->redirect_active = g_slist_remove(server->redirect_active, rec); server->redirect_active = g_slist_remove(server->redirect_active, rec);
@ -561,7 +561,7 @@ server_redirect_get(IRC_SERVER_REC *server, const char *prefix,
!(*redirect)->first_signal_sent) { !(*redirect)->first_signal_sent) {
/* emit the first_signal */ /* emit the first_signal */
(*redirect)->first_signal_sent = TRUE; (*redirect)->first_signal_sent = TRUE;
signal_emit((*redirect)->first_signal, 1, server); signal_emit_raw((*redirect)->first_signal, 1, server);
} }
return signal; return signal;

23
src/irc/dcc/dcc-chat.c
View File

@ -705,7 +705,7 @@ static void ctcp_msg_dcc_chat(IRC_SERVER_REC *server, const char *data,
static void dcc_chat_msg(CHAT_DCC_REC *dcc, const char *msg) static void dcc_chat_msg(CHAT_DCC_REC *dcc, const char *msg)
{ {
char *event, *cmd, *ptr; char *event, *cmd, *ptr;
int reply; int reply, emitted;
g_return_if_fail(IS_DCC_CHAT(dcc)); g_return_if_fail(IS_DCC_CHAT(dcc));
g_return_if_fail(msg != NULL); g_return_if_fail(msg != NULL);
@ -740,9 +740,14 @@ static void dcc_chat_msg(CHAT_DCC_REC *dcc, const char *msg)
cmd = g_ascii_strup(cmd, -1); cmd = g_ascii_strup(cmd, -1);
ascii_strdown(event+9); ascii_strdown(event+9);
if (!signal_emit(event, 2, dcc, ptr)) { emitted = reply ?
signal_emit(reply ? "default dcc reply" : signal_emit__dcc_reply_(msg+1, dcc, ptr) :
"default dcc ctcp", 3, dcc, cmd, ptr); signal_emit__dcc_ctcp_(msg+1, dcc, ptr);
if (!emitted) {
if (reply)
signal_emit__default_dcc_reply(dcc, cmd, ptr);
else
signal_emit__default_dcc_ctcp(dcc, cmd, ptr);
} }
g_free(cmd); g_free(cmd);
@ -756,9 +761,8 @@ static void dcc_ctcp_redirect(CHAT_DCC_REC *dcc, const char *msg)
g_return_if_fail(msg != NULL); g_return_if_fail(msg != NULL);
g_return_if_fail(IS_DCC_CHAT(dcc)); g_return_if_fail(IS_DCC_CHAT(dcc));
/* XXX: signal_emit carries additional user_data */ signal_emit__ctcp_msg_dcc(dcc->server, msg,
signal_emit("ctcp msg dcc", 6, dcc->server, msg, dcc->nick, "dcc", dcc->mynick, (DCC_REC *)dcc);
dcc->nick, "dcc", dcc->mynick, dcc);
} }
static void dcc_ctcp_reply_redirect(CHAT_DCC_REC *dcc, const char *msg) static void dcc_ctcp_reply_redirect(CHAT_DCC_REC *dcc, const char *msg)
@ -766,9 +770,8 @@ static void dcc_ctcp_reply_redirect(CHAT_DCC_REC *dcc, const char *msg)
g_return_if_fail(msg != NULL); g_return_if_fail(msg != NULL);
g_return_if_fail(IS_DCC_CHAT(dcc)); g_return_if_fail(IS_DCC_CHAT(dcc));
/* XXX: signal_emit carries additional user_data */ signal_emit__ctcp_reply_dcc(dcc->server, msg,
signal_emit("ctcp reply dcc", 6, dcc->server, msg, dcc->nick, "dcc", dcc->mynick, (DCC_REC *)dcc);
dcc->nick, "dcc", dcc->mynick, dcc);
} }
/* CTCP REPLY: REJECT */ /* CTCP REPLY: REJECT */

4
src/irc/dcc/dcc.c
View File

@ -370,7 +370,7 @@ static void ctcp_msg_dcc(IRC_SERVER_REC *server, const char *data,
if (args != NULL) *args++ = '\0'; else args = ""; if (args != NULL) *args++ = '\0'; else args = "";
ascii_strdown(str+13); ascii_strdown(str+13);
if (!signal_emit(str, 6, server, args, nick, addr, target, chat)) { if (!signal_emit__ctcp_msg_dcc_(data, server, args, nick, addr, target, chat)) {
signal_emit__default_ctcp_msg_dcc(server, data, nick, addr, target, chat); signal_emit__default_ctcp_msg_dcc(server, data, nick, addr, target, chat);
} }
g_free(str); g_free(str);
@ -391,7 +391,7 @@ static void ctcp_reply_dcc(IRC_SERVER_REC *server, const char *data,
if (args != NULL) *args++ = '\0'; else args = ""; if (args != NULL) *args++ = '\0'; else args = "";
ascii_strdown(str+15); ascii_strdown(str+15);
if (!signal_emit(str, 5, server, args, nick, addr, target)) { if (!signal_emit__ctcp_reply_dcc_(data, server, args, nick, addr, target)) {
signal_emit__default_ctcp_reply_dcc(server, data, nick, addr, target); signal_emit__default_ctcp_reply_dcc(server, data, nick, addr, target);
} }
g_free(str); g_free(str);

2
src/irc/notifylist/notify-whois.c
View File

@ -115,7 +115,7 @@ static void event_whois_end(IRC_SERVER_REC *server, const char *data)
event = "notifylist away changed"; event = "notifylist away changed";
if (event != NULL) { if (event != NULL) {
signal_emit(event, 6, server, rec->nick, signal_emit_raw(event, 6, server, rec->nick,
rec->user != NULL ? rec->user : "??", rec->user != NULL ? rec->user : "??",
rec->host != NULL ? rec->host : "??", rec->host != NULL ? rec->host : "??",
rec->realname != NULL ? rec->realname : "??", rec->realname != NULL ? rec->realname : "??",

6
src/otr/otr-module.c
View File

@ -26,6 +26,8 @@
#include "common.h" #include "common.h"
#include "signals.h" #include "signals.h"
#include "fe-common/core/signal-registry.h"
#include "fe-common/irc/signal-registry.h"
#include "queries.h" #include "queries.h"
#include "commands.h" #include "commands.h"
@ -100,7 +102,7 @@ void sig_message_private(SERVER_REC *server, const char *msg, const char *nick,
*/ */
if (strncmp(new_msg, OTR_IRC_MARKER_ME, OTR_IRC_MARKER_ME_LEN) == 0) { if (strncmp(new_msg, OTR_IRC_MARKER_ME, OTR_IRC_MARKER_ME_LEN) == 0) {
signal_stop(); signal_stop();
signal_emit__message_irc_action(server, new_msg + OTR_IRC_MARKER_ME_LEN, nick, address, nick); signal_emit__message_irc_action((IRC_SERVER_REC *)server, new_msg + OTR_IRC_MARKER_ME_LEN, nick, address, nick);
} else { } else {
/* OTR received message */ /* OTR received message */
signal_continue(5, server, new_msg, nick, address, target); signal_continue(5, server, new_msg, nick, address, target);
@ -166,7 +168,7 @@ static void cmd_me(const char *data, IRC_SERVER_REC *server,
otrl_message_free(otrmsg); otrl_message_free(otrmsg);
} }
signal_emit__message_irc_own_action(server, data, item->visible_name); signal_emit__message_irc_own__action((IRC_SERVER_REC *)server, data, item->visible_name);
} }
/* /*

1
src/otr/otr-ops.c
View File

@ -20,6 +20,7 @@
#include "common.h" #include "common.h"
#include "signals.h" #include "signals.h"
#include "fe-common/core/signal-registry.h"
#include "levels.h" #include "levels.h"
#include "printtext.h" #include "printtext.h"
#include "fe-windows.h" #include "fe-windows.h"

1
src/otr/otr.c
View File

@ -27,6 +27,7 @@
#include "common.h" #include "common.h"
#include "levels.h" #include "levels.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "printtext.h" #include "printtext.h"
#include "statusbar-item.h" #include "statusbar-item.h"

2
src/perl/common/Core.xs
View File

@ -67,7 +67,7 @@ static void add_tuple(gpointer key_, gpointer value_, gpointer user_data)
} }
static void wrap_signal_emit(void *signal, void **p) { static void wrap_signal_emit(void *signal, void **p) {
signal_emit(signal, 6, p[0], p[1], p[2], p[3], p[4], p[5]); signal_emit_raw(signal, 6, p[0], p[1], p[2], p[3], p[4], p[5]);
} }
static void wrap_signal_continue(void *dummy, void **p) { static void wrap_signal_continue(void *dummy, void **p) {

1
src/perl/common/Expando.xs
View File

@ -1,6 +1,7 @@
#define PERL_NO_GET_CONTEXT #define PERL_NO_GET_CONTEXT
#include "module.h" #include "module.h"
#include "expandos.h" #include "expandos.h"
#include "perl/signal-registry.h"
typedef struct { typedef struct {
PERL_SCRIPT_REC *script; PERL_SCRIPT_REC *script;

10
src/perl/perl-core.c
View File

@ -24,6 +24,8 @@
#include "modules.h" #include "modules.h"
#include "core.h" #include "core.h"
#include "signals.h" #include "signals.h"
#include "../core/signal-registry.h"
#include "signal-registry.h"
#include "misc.h" #include "misc.h"
#include "settings.h" #include "settings.h"
@ -70,7 +72,7 @@ static void perl_script_destroy(PERL_SCRIPT_REC *script)
perl_signal_remove_script(script); perl_signal_remove_script(script);
perl_source_remove_script(script); perl_source_remove_script(script);
signal_emit__script_destroyed(script); signal_emit_raw("script destroyed", 1, script);
g_free(script->name); g_free(script->name);
g_free(script->package); g_free(script->package);
@ -148,7 +150,7 @@ void perl_scripts_deinit(void)
while (perl_scripts != NULL) while (perl_scripts != NULL)
perl_script_unload(perl_scripts->data); perl_script_unload(perl_scripts->data);
signal_emit("perl scripts deinit", 0); signal_emit_raw("perl scripts deinit", 0);
perl_signals_stop(); perl_signals_stop();
perl_sources_stop(); perl_sources_stop();
@ -250,7 +252,7 @@ static int perl_script_eval(PERL_SCRIPT_REC *script)
if (error != NULL) { if (error != NULL) {
error = g_strdup(error); error = g_strdup(error);
signal_emit__script_error(script, error); signal_emit_raw("script error", 2, script, error);
g_free(error); g_free(error);
} }
} }
@ -279,7 +281,7 @@ static PERL_SCRIPT_REC *script_load(char *name, const char *path,
script->data = g_strdup(data); script->data = g_strdup(data);
perl_scripts = g_slist_append(perl_scripts, script); perl_scripts = g_slist_append(perl_scripts, script);
signal_emit__script_created(script); signal_emit_raw("script created", 1, script);
if (!perl_script_eval(script)) if (!perl_script_eval(script))
script = NULL; /* the script is destroyed in "script error" signal */ script = NULL; /* the script is destroyed in "script error" signal */

2
src/perl/perl-core.h
View File

@ -1,7 +1,7 @@
#ifndef __PERL_CORE_H #ifndef __PERL_CORE_H
#define __PERL_CORE_H #define __PERL_CORE_H
typedef struct { typedef struct _PERL_SCRIPT_REC {
char *name; /* unique name */ char *name; /* unique name */
char *package; /* package name */ char *package; /* package name */

1
src/perl/perl-signals.c
View File

@ -25,6 +25,7 @@
#include "signals.h" #include "signals.h"
#include "commands.h" #include "commands.h"
#include "servers.h" #include "servers.h"
#include "signal-registry.h"
#include "perl-core.h" #include "perl-core.h"
#include "perl-common.h" #include "perl-common.h"

1
src/perl/perl-sources.c
View File

@ -22,6 +22,7 @@
#define PERL_NO_GET_CONTEXT #define PERL_NO_GET_CONTEXT
#include "module.h" #include "module.h"
#include "signals.h" #include "signals.h"
#include "signal-registry.h"
#include "perl-core.h" #include "perl-core.h"
#include "perl-common.h" #include "perl-common.h"

1
src/perl/textui/Statusbar.xs
View File

@ -1,5 +1,6 @@
#define PERL_NO_GET_CONTEXT #define PERL_NO_GET_CONTEXT
#include "module.h" #include "module.h"
#include "perl/signal-registry.h"
static GHashTable *perl_sbar_defs; static GHashTable *perl_sbar_defs;

8
tests/irc/core/test-channel-events.c
View File

@ -30,6 +30,8 @@
#include <recode.h> #include <recode.h>
#include <settings.h> #include <settings.h>
#include <signals.h> #include <signals.h>
#include <core/signal-registry.h>
#include <irc/core/signal-registry.h>
#include <time.h> #include <time.h>
#include <args.h> #include <args.h>
@ -139,7 +141,7 @@ static void test_event_topic_get(topic_test_case const *const test)
{ {
setup(); setup();
signal_emit__event_332(server, test->input); signal_emit__event_("332", (SERVER_REC *)server, test->input, NULL, NULL);
g_assert_cmpstr(channel->topic, ==, test->topic); g_assert_cmpstr(channel->topic, ==, test->topic);
g_assert_cmpstr(channel->topic_by, ==, test->topic_by); g_assert_cmpstr(channel->topic_by, ==, test->topic_by);
@ -155,7 +157,7 @@ static void test_event_topic(topic_test_case const *const test)
setup(); setup();
now = time(NULL); now = time(NULL);
signal_emit__event_topic(server, test->input, "newnick", signal_emit__event_("topic", (SERVER_REC *)server, test->input, "newnick",
"user@example.com"); "user@example.com");
g_assert_cmpstr(channel->topic, ==, test->topic); g_assert_cmpstr(channel->topic, ==, test->topic);
@ -169,7 +171,7 @@ static void test_event_topic_info(topic_test_case const *const test)
{ {
setup(); setup();
signal_emit__event_333(server, test->input); signal_emit__event_("333", (SERVER_REC *)server, test->input, NULL, NULL);
g_assert_cmpstr(channel->topic, ==, test->topic); g_assert_cmpstr(channel->topic, ==, test->topic);
g_assert_cmpstr(channel->topic_by, ==, test->topic_by); g_assert_cmpstr(channel->topic_by, ==, test->topic_by);

8
tests/irc/flood/test-796.c
View File

@ -31,6 +31,10 @@
#include "irc-servers.h" #include "irc-servers.h"
#include "irc-channels.h" #include "irc-channels.h"
#include <core/signal-registry.h>
#include <fe-common/core/signal-registry.h>
#include <irc/core/signal-registry.h>
/* irc.c */ /* irc.c */
void irc_init(void); void irc_init(void);
void irc_deinit(void); void irc_deinit(void);
@ -75,7 +79,7 @@ static void server_destroy_flood_set_up(ServerDestroyFloodData *fixture, const v
irc_init(); irc_init();
fe_common_core_init(); fe_common_core_init();
fe_common_irc_init(); fe_common_irc_init();
signal_emit("irssi init finished", 0); signal_emit__irssi_init_finished();
command_bind("echo", NULL, (SIGNAL_FUNC) cmd_echo); command_bind("echo", NULL, (SIGNAL_FUNC) cmd_echo);
signal_add("message public", (SIGNAL_FUNC) sig_public); signal_add("message public", (SIGNAL_FUNC) sig_public);
signal_add("server destroyed", (SIGNAL_FUNC) print_destroyed); signal_add("server destroyed", (SIGNAL_FUNC) print_destroyed);
@ -149,7 +153,7 @@ static void test_server_destroy_flood(ServerDestroyFloodData *fixture, const voi
*/ */
server_ref(server); server_ref(server);
signal_emit__event_privmsg(server, "#someroom :test message", "nick", "user@host"); signal_emit__event_("privmsg", (SERVER_REC *)server, "#someroom :test message", "nick", "user@host");
server_unref(server); server_unref(server);
g_log_set_always_fatal(loglev); g_log_set_always_fatal(loglev);