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

Add local variables for buffers, fix alias creation, use of local variables $nick/$channel/$server in alias

Browse Source
This commit is contained in:
Sebastien Helleu
2008-10-24 15:12:32 +02:00
parent d19162626b
commit e37f7fa2b2
25 changed files with 600 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/alias/alias.c
+28 -9
View File
@@ -212,6 +212,23 @@ alias_replace_args (const char *alias_args, const char *user_args)
return res;
}
/*
* alias_run_command: replace local buffer variables in string, then run
* command on buffer
*/
void
alias_run_command (struct t_gui_buffer *buffer, const char *command)
{
char *string;
string = weechat_buffer_string_replace_local_var (buffer, command);
weechat_command (buffer,
(string) ? string : command);
if (string)
free (string);
}
/*
* alias_cb: callback for alias (called when user uses an alias)
*/
@@ -226,7 +243,6 @@ alias_cb (void *data, struct t_gui_buffer *buffer, int argc, char **argv,
int some_args_replaced, length1, length2;
/* make C compiler happy */
(void) buffer;
(void) argc;
(void) argv;
@@ -260,7 +276,7 @@ alias_cb (void *data, struct t_gui_buffer *buffer, int argc, char **argv,
{
some_args_replaced = 1;
if (*ptr_cmd[0] == '/')
weechat_command (weechat_current_buffer, args_replaced);
alias_run_command (buffer, args_replaced);
else
{
alias_command = malloc (1 + strlen(args_replaced) + 1);
@@ -268,7 +284,7 @@ alias_cb (void *data, struct t_gui_buffer *buffer, int argc, char **argv,
{
strcpy (alias_command, "/");
strcat (alias_command, args_replaced);
weechat_command (weechat_current_buffer, alias_command);
alias_run_command (buffer, alias_command);
free (alias_command);
}
}
@@ -295,16 +311,14 @@ alias_cb (void *data, struct t_gui_buffer *buffer, int argc, char **argv,
strcat (alias_command, " ");
strcat (alias_command, argv_eol[1]);
weechat_command (weechat_current_buffer,
alias_command);
alias_run_command (buffer, alias_command);
free (alias_command);
}
}
else
{
if (*ptr_cmd[0] == '/')
(void) weechat_command(weechat_current_buffer,
*ptr_cmd);
alias_run_command (buffer, *ptr_cmd);
else
{
alias_command = malloc (1 + strlen (*ptr_cmd) + 1);
@@ -312,8 +326,7 @@ alias_cb (void *data, struct t_gui_buffer *buffer, int argc, char **argv,
{
strcpy (alias_command, "/");
strcat (alias_command, *ptr_cmd);
weechat_command (weechat_current_buffer,
alias_command);
alias_run_command (buffer, alias_command);
free (alias_command);
}
}
@@ -706,6 +719,7 @@ alias_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
{
char *alias_name;
struct t_alias *ptr_alias;
struct t_config_option *ptr_option;
/* make C compiler happy */
(void) data;
@@ -728,6 +742,11 @@ alias_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
}
/* create config option */
ptr_option = weechat_config_search_option (alias_config_file,
alias_config_section_cmd,
alias_name);
if (ptr_option)
weechat_config_option_free (ptr_option);
weechat_config_new_option (
alias_config_file, alias_config_section_cmd,
alias_name, "string", NULL,
src/plugins/irc/irc-channel.c
+3
View File
@@ -97,6 +97,9 @@ irc_channel_new (struct t_irc_server *server, int channel_type,
}
weechat_buffer_set (new_buffer, "short_name", channel_name);
weechat_buffer_set (new_buffer, "localvar_set_nick", server->nick);
weechat_buffer_set (new_buffer, "localvar_set_server", server->name);
weechat_buffer_set (new_buffer, "localvar_set_channel", channel_name);
weechat_hook_signal_send ("logger_backlog",
WEECHAT_HOOK_SIGNAL_POINTER, new_buffer);
src/plugins/irc/irc-command.c
+2
View File
@@ -3138,6 +3138,8 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
}
weechat_buffer_set (irc_current_server->buffer, "short_name",
irc_current_server->name);
weechat_buffer_set (irc_current_server->buffer, "localvar_set_server",
irc_current_server->name);
weechat_bar_item_update ("buffer_name");
weechat_bar_item_update ("input_prompt");
return WEECHAT_RC_OK;
src/plugins/irc/irc-server.c
+11
View File
@@ -300,12 +300,22 @@ irc_server_set_with_option (struct t_irc_server *server,
void
irc_server_set_nick (struct t_irc_server *server, const char *nick)
{
struct t_irc_channel *ptr_channel;
if (server->nick)
free (server->nick);
server->nick = (nick) ? strdup (nick) : NULL;
weechat_buffer_set (server->buffer, "highlight_words", nick);
/* set local variable "nick" for server and all channels/pv */
weechat_buffer_set (server->buffer, "localvar_set_nick", nick);
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
weechat_buffer_set (ptr_channel->buffer, "localvar_set_nick", nick);
}
weechat_bar_item_update ("input_prompt");
}
@@ -2180,6 +2190,7 @@ irc_server_connect (struct t_irc_server *server, int disable_autojoin)
}
weechat_buffer_set (server->buffer, "short_name", server->name);
weechat_buffer_set (server->buffer, "localvar_set_server", server->name);
weechat_buffer_set (server->buffer, "display", "1");
src/plugins/plugin.c
+1
View File
@@ -415,6 +415,7 @@ plugin_load (const char *filename)
new_plugin->buffer_get_pointer = &gui_buffer_get_pointer;
new_plugin->buffer_set = &gui_buffer_set;
new_plugin->buffer_set_pointer = &gui_buffer_set_pointer;
new_plugin->buffer_string_replace_local_var = &gui_buffer_string_replace_local_var;
new_plugin->window_get_integer = &gui_window_get_integer;
new_plugin->window_get_string = &gui_window_get_string;
src/plugins/weechat-plugin.h
+4
View File
@@ -423,6 +423,8 @@ struct t_weechat_plugin
const char *value);
void (*buffer_set_pointer) (struct t_gui_buffer *buffer,
const char *property, void *pointer);
char *(*buffer_string_replace_local_var) (struct t_gui_buffer *buffer,
const char *string);
/* windows */
int (*window_get_integer) (struct t_gui_window *window,
@@ -912,6 +914,8 @@ extern int weechat_plugin_end (struct t_weechat_plugin *plugin);
weechat_plugin->buffer_set(__buffer, __property, __value)
#define weechat_buffer_set_pointer(__buffer, __property, __pointer) \
weechat_plugin->buffer_set_pointer(__buffer, __property, __pointer)
#define weechat_buffer_string_replace_local_var(__buffer, __string) \
weechat_plugin->buffer_string_replace_local_var(__buffer, __string)
/* windows */
#define weechat_window_get_integer(__window, __property) \