pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-04 12:25:42 +02:00
Code Activity

irc: create server/channel/raw buffers with function buffer_new_props (issue #1942)

Browse Source 
With this function, buffer properties are set when the buffer is created and
can be read immediately by other plugins/scripts, for example in a callback of
signal "buffer_opened".
This commit is contained in:
Sébastien Helleu
2023-05-20 16:07:01 +02:00
parent f767db22a8
commit 3ca3ea32fd
3 changed files with 119 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-channel.c
+62 -28
View File
File diff suppressed because it is too large Load Diff
src/plugins/irc/irc-raw.c
+24 -8
View File
@@ -379,16 +379,39 @@ irc_raw_refresh (int clear)
void
irc_raw_open (int switch_to_buffer)
{
struct t_hashtable *buffer_props;
if (!irc_raw_buffer)
{
irc_raw_buffer = weechat_buffer_search (IRC_PLUGIN_NAME,
IRC_RAW_BUFFER_NAME);
if (!irc_raw_buffer)
{
irc_raw_buffer = weechat_buffer_new (
buffer_props = weechat_hashtable_new (
32,
WEECHAT_HASHTABLE_STRING,
WEECHAT_HASHTABLE_STRING,
NULL, NULL);
if (buffer_props)
{
weechat_hashtable_set (buffer_props,
"localvar_set_type", "debug");
weechat_hashtable_set (buffer_props,
"localvar_set_server", IRC_RAW_BUFFER_NAME);
weechat_hashtable_set (buffer_props,
"localvar_set_channel", IRC_RAW_BUFFER_NAME);
weechat_hashtable_set (buffer_props,
"localvar_set_no_log", "1");
/* disable all highlights on this buffer */
weechat_hashtable_set (buffer_props, "highlight_words", "-");
}
irc_raw_buffer = weechat_buffer_new_props (
IRC_RAW_BUFFER_NAME,
buffer_props,
&irc_input_data_cb, NULL, NULL,
&irc_buffer_close_cb, NULL, NULL);
if (buffer_props)
weechat_hashtable_free (buffer_props);
/* failed to create buffer ? then return */
if (!irc_raw_buffer)
@@ -399,13 +422,6 @@ irc_raw_open (int switch_to_buffer)
weechat_buffer_set (irc_raw_buffer, "short_name",
IRC_RAW_BUFFER_NAME);
}
weechat_buffer_set (irc_raw_buffer, "localvar_set_type", "debug");
weechat_buffer_set (irc_raw_buffer, "localvar_set_server", IRC_RAW_BUFFER_NAME);
weechat_buffer_set (irc_raw_buffer, "localvar_set_channel", IRC_RAW_BUFFER_NAME);
weechat_buffer_set (irc_raw_buffer, "localvar_set_no_log", "1");
/* disable all highlights on this buffer */
weechat_buffer_set (irc_raw_buffer, "highlight_words", "-");
irc_raw_set_localvar_filter ();
src/plugins/irc/irc-server.c
+33 -13
View File
@@ -4668,6 +4668,7 @@ irc_server_create_buffer (struct t_irc_server *server)
{
char buffer_name[1024], charset_modifier[1024];
struct t_gui_buffer *ptr_buffer_for_merge;
struct t_hashtable *buffer_props;
ptr_buffer_for_merge = NULL;
switch (weechat_config_integer (irc_config_look_server_buffer))
@@ -4682,31 +4683,50 @@ irc_server_create_buffer (struct t_irc_server *server)
break;
}
buffer_props = weechat_hashtable_new (
32,
WEECHAT_HASHTABLE_STRING,
WEECHAT_HASHTABLE_STRING,
NULL, NULL);
if (buffer_props)
{
weechat_hashtable_set (buffer_props, "localvar_set_type", "server");
weechat_hashtable_set (buffer_props,
"localvar_set_server", server->name);
weechat_hashtable_set (buffer_props,
"localvar_set_channel", server->name);
snprintf (charset_modifier, sizeof (charset_modifier),
"irc.%s", server->name);
weechat_hashtable_set (buffer_props,
"localvar_set_charset_modifier",
charset_modifier);
if (weechat_config_boolean (irc_config_network_send_unknown_commands))
{
weechat_hashtable_set (buffer_props,
"input_get_unknown_commands", "1");
}
}
snprintf (buffer_name, sizeof (buffer_name),
"server.%s", server->name);
server->buffer = weechat_buffer_new (buffer_name,
&irc_input_data_cb, NULL, NULL,
&irc_buffer_close_cb, NULL, NULL);
server->buffer = weechat_buffer_new_props (
buffer_name,
buffer_props,
&irc_input_data_cb, NULL, NULL,
&irc_buffer_close_cb, NULL, NULL);
if (buffer_props)
weechat_hashtable_free (buffer_props);
if (!server->buffer)
return NULL;
if (!weechat_buffer_get_integer (server->buffer, "short_name_is_set"))
weechat_buffer_set (server->buffer, "short_name", server->name);
weechat_buffer_set (server->buffer, "localvar_set_type", "server");
weechat_buffer_set (server->buffer, "localvar_set_server", server->name);
weechat_buffer_set (server->buffer, "localvar_set_channel", server->name);
snprintf (charset_modifier, sizeof (charset_modifier),
"irc.%s", server->name);
weechat_buffer_set (server->buffer, "localvar_set_charset_modifier",
charset_modifier);
(void) weechat_hook_signal_send ("logger_backlog",
WEECHAT_HOOK_SIGNAL_POINTER,
server->buffer);
if (weechat_config_boolean (irc_config_network_send_unknown_commands))
weechat_buffer_set (server->buffer, "input_get_unknown_commands", "1");
/* set highlights settings on server buffer */
weechat_buffer_set (server->buffer, "highlight_words_add",
weechat_config_string (irc_config_look_highlight_server));