mirror of
https://github.com/weechat/weechat.git
synced 2026-07-03 00:03:12 +02:00
Rename command /silence to /mute
This commit is contained in:
+103
-103
@@ -2232,6 +2232,88 @@ command_layout (void *data, struct t_gui_buffer *buffer,
|
||||
return WEECHAT_RC_OK;
|
||||
}
|
||||
|
||||
/*
|
||||
* command_mute: execute a command mute
|
||||
*/
|
||||
|
||||
int
|
||||
command_mute (void *data, struct t_gui_buffer *buffer,
|
||||
int argc, char **argv, char **argv_eol)
|
||||
{
|
||||
int length, mute_mode;
|
||||
char *command, *ptr_command, *buffer_name, *pos;
|
||||
struct t_gui_buffer *mute_buffer, *ptr_buffer;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) data;
|
||||
|
||||
if (argc >= 2)
|
||||
{
|
||||
mute_mode = GUI_CHAT_MUTE_BUFFER;
|
||||
mute_buffer = gui_buffer_search_main ();
|
||||
ptr_command = argv_eol[1];
|
||||
|
||||
if (string_strcasecmp (argv[1], "-current") == 0)
|
||||
{
|
||||
mute_buffer = buffer;
|
||||
ptr_command = argv_eol[2];
|
||||
}
|
||||
else if (string_strcasecmp (argv[1], "-buffer") == 0)
|
||||
{
|
||||
ptr_buffer = NULL;
|
||||
if (argc < 3)
|
||||
return WEECHAT_RC_ERROR;
|
||||
buffer_name = strdup (argv[2]);
|
||||
if (!buffer_name)
|
||||
return WEECHAT_RC_ERROR;
|
||||
pos = strchr (buffer_name, '.');
|
||||
if (pos)
|
||||
{
|
||||
pos[0] = '\0';
|
||||
pos++;
|
||||
ptr_buffer = gui_buffer_search_by_name (buffer_name, pos);
|
||||
}
|
||||
free (buffer_name);
|
||||
if (ptr_buffer)
|
||||
mute_buffer = ptr_buffer;
|
||||
ptr_command = argv_eol[3];
|
||||
}
|
||||
else if (string_strcasecmp (argv[1], "-all") == 0)
|
||||
{
|
||||
mute_mode = GUI_CHAT_MUTE_ALL_BUFFERS;
|
||||
mute_buffer = NULL;
|
||||
ptr_command = argv_eol[2];
|
||||
}
|
||||
|
||||
if (ptr_command && ptr_command[0])
|
||||
{
|
||||
gui_chat_mute = mute_mode;
|
||||
gui_chat_mute_buffer = mute_buffer;
|
||||
|
||||
if (ptr_command[0] == '/')
|
||||
{
|
||||
input_exec_command (buffer, 1, NULL, ptr_command);
|
||||
}
|
||||
else
|
||||
{
|
||||
length = strlen (ptr_command) + 2;
|
||||
command = malloc (length);
|
||||
if (command)
|
||||
{
|
||||
snprintf (command, length, "/%s", ptr_command);
|
||||
input_exec_command (buffer, 1, NULL, command);
|
||||
free (command);
|
||||
}
|
||||
}
|
||||
|
||||
gui_chat_mute = GUI_CHAT_MUTE_DISABLED;
|
||||
gui_chat_mute_buffer = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
return WEECHAT_RC_OK;
|
||||
}
|
||||
|
||||
/*
|
||||
* command_plugin_list: list loaded plugins
|
||||
*/
|
||||
@@ -3203,88 +3285,6 @@ command_set (void *data, struct t_gui_buffer *buffer,
|
||||
return WEECHAT_RC_OK;
|
||||
}
|
||||
|
||||
/*
|
||||
* command_silence: execute a command silently
|
||||
*/
|
||||
|
||||
int
|
||||
command_silence (void *data, struct t_gui_buffer *buffer,
|
||||
int argc, char **argv, char **argv_eol)
|
||||
{
|
||||
int length, silent_mode;
|
||||
char *command, *ptr_command, *buffer_name, *pos;
|
||||
struct t_gui_buffer *silent_buffer, *ptr_buffer;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) data;
|
||||
|
||||
if (argc >= 2)
|
||||
{
|
||||
silent_mode = GUI_CHAT_SILENT_BUFFER;
|
||||
silent_buffer = gui_buffer_search_main ();
|
||||
ptr_command = argv_eol[1];
|
||||
|
||||
if (string_strcasecmp (argv[1], "-current") == 0)
|
||||
{
|
||||
silent_buffer = buffer;
|
||||
ptr_command = argv_eol[2];
|
||||
}
|
||||
else if (string_strcasecmp (argv[1], "-buffer") == 0)
|
||||
{
|
||||
ptr_buffer = NULL;
|
||||
if (argc < 3)
|
||||
return WEECHAT_RC_ERROR;
|
||||
buffer_name = strdup (argv[2]);
|
||||
if (!buffer_name)
|
||||
return WEECHAT_RC_ERROR;
|
||||
pos = strchr (buffer_name, '.');
|
||||
if (pos)
|
||||
{
|
||||
pos[0] = '\0';
|
||||
pos++;
|
||||
ptr_buffer = gui_buffer_search_by_name (buffer_name, pos);
|
||||
}
|
||||
free (buffer_name);
|
||||
if (ptr_buffer)
|
||||
silent_buffer = ptr_buffer;
|
||||
ptr_command = argv_eol[3];
|
||||
}
|
||||
else if (string_strcasecmp (argv[1], "-all") == 0)
|
||||
{
|
||||
silent_mode = GUI_CHAT_SILENT_ALL_BUFFERS;
|
||||
silent_buffer = NULL;
|
||||
ptr_command = argv_eol[2];
|
||||
}
|
||||
|
||||
if (ptr_command && ptr_command[0])
|
||||
{
|
||||
gui_chat_silent = silent_mode;
|
||||
gui_chat_silent_buffer = silent_buffer;
|
||||
|
||||
if (ptr_command[0] == '/')
|
||||
{
|
||||
input_exec_command (buffer, 1, NULL, ptr_command);
|
||||
}
|
||||
else
|
||||
{
|
||||
length = strlen (ptr_command) + 2;
|
||||
command = malloc (length);
|
||||
if (command)
|
||||
{
|
||||
snprintf (command, length, "/%s", ptr_command);
|
||||
input_exec_command (buffer, 1, NULL, command);
|
||||
free (command);
|
||||
}
|
||||
}
|
||||
|
||||
gui_chat_silent = GUI_CHAT_SILENT_DISABLED;
|
||||
gui_chat_silent_buffer = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
return WEECHAT_RC_OK;
|
||||
}
|
||||
|
||||
/*
|
||||
* command_unset: unset/reset config options
|
||||
*/
|
||||
@@ -4291,6 +4291,27 @@ command_init ()
|
||||
"Without argument, this command displays saved layout."),
|
||||
"save|apply|reset buffers|windows",
|
||||
&command_layout, NULL);
|
||||
hook_command (NULL, "mute",
|
||||
N_("execute a command silently"),
|
||||
N_("[-current | -buffer name | -all] command"),
|
||||
N_("-current: no output on curent buffer\n"
|
||||
" -buffer: no output on specified buffer\n"
|
||||
" name: full buffer name (examples: "
|
||||
"\"irc.server.freenode\", \"irc.freenode.#weechat\")\n"
|
||||
" -all: no output on ALL buffers\n"
|
||||
" command: command to execute silently (a '/' is "
|
||||
"automatically added if not found at beginning of "
|
||||
"command)\n\n"
|
||||
"If no target is specified (-current, -buffer or -all), "
|
||||
"then default is to mute WeeChat core buffer only.\n\n"
|
||||
"Examples:\n"
|
||||
" config save: /mute save\n"
|
||||
" message to current IRC channel: "
|
||||
"/mute -current msg * hi!\n"
|
||||
" message to #weechat channel: "
|
||||
"/mute -buffer irc.freenode.#weechat msg #weechat hi!"),
|
||||
"-current|-buffer|-all|%(commands) %(commands)|%*",
|
||||
&command_mute, NULL);
|
||||
hook_command (NULL, "plugin",
|
||||
N_("list/load/unload plugins"),
|
||||
N_("[list [name]] | [listfull [name]] | [load filename] | "
|
||||
@@ -4382,27 +4403,6 @@ command_init ()
|
||||
"for some special plugin variables."),
|
||||
"%(config_options) %(config_option_values)",
|
||||
&command_set, NULL);
|
||||
hook_command (NULL, "silence",
|
||||
N_("execute a command silently"),
|
||||
N_("[-current | -buffer name | -all] command"),
|
||||
N_("-current: no output on curent buffer\n"
|
||||
" -buffer: no output on specified buffer\n"
|
||||
" name: full buffer name (examples: "
|
||||
"\"irc.server.freenode\", \"irc.freenode.#weechat\")\n"
|
||||
" -all: no output on ALL buffers\n"
|
||||
" command: command to execute silently (a '/' is "
|
||||
"automatically added if not found at beginning of "
|
||||
"command)\n\n"
|
||||
"If no target is specified (-current, -buffer or -all), "
|
||||
"then default is to silence WeeChat core buffer only.\n\n"
|
||||
"Examples:\n"
|
||||
" config save: /silence save\n"
|
||||
" message to current IRC channel: "
|
||||
"/silence -current msg * hi!\n"
|
||||
" message to #weechat channel: "
|
||||
"/silence -buffer irc.freenode.#weechat msg #weechat hi!"),
|
||||
"-current|-buffer|-all|%(commands) %(commands)|%*",
|
||||
&command_silence, NULL);
|
||||
hook_command (NULL, "unset",
|
||||
N_("unset/reset config options"),
|
||||
N_("[option]"),
|
||||
|
||||
+6
-6
@@ -50,8 +50,8 @@ char *gui_chat_buffer = NULL; /* buffer for printf */
|
||||
char *gui_chat_prefix[GUI_CHAT_NUM_PREFIXES]; /* prefixes */
|
||||
char gui_chat_prefix_empty[] = ""; /* empty prefix */
|
||||
int gui_chat_time_length = 0; /* length of time for each line (in chars) */
|
||||
int gui_chat_silent = GUI_CHAT_SILENT_DISABLED; /* silence mode */
|
||||
struct t_gui_buffer *gui_chat_silent_buffer = NULL; /* buffer for silence */
|
||||
int gui_chat_mute = GUI_CHAT_MUTE_DISABLED; /* mute mode */
|
||||
struct t_gui_buffer *gui_chat_mute_buffer = NULL; /* mute buffer */
|
||||
|
||||
|
||||
/*
|
||||
@@ -455,10 +455,10 @@ gui_chat_printf_date_tags (struct t_gui_buffer *buffer, time_t date,
|
||||
return;
|
||||
}
|
||||
|
||||
/* if silent is enabled for buffer (or all buffers), then just return */
|
||||
if ((gui_chat_silent == GUI_CHAT_SILENT_ALL_BUFFERS)
|
||||
|| ((gui_chat_silent == GUI_CHAT_SILENT_BUFFER)
|
||||
&& (gui_chat_silent_buffer == buffer)))
|
||||
/* if mute is enabled for buffer (or all buffers), then just return */
|
||||
if ((gui_chat_mute == GUI_CHAT_MUTE_ALL_BUFFERS)
|
||||
|| ((gui_chat_mute == GUI_CHAT_MUTE_BUFFER)
|
||||
&& (gui_chat_mute_buffer == buffer)))
|
||||
return;
|
||||
|
||||
if (!gui_chat_buffer)
|
||||
|
||||
+6
-6
@@ -42,18 +42,18 @@ enum t_gui_chat_prefix
|
||||
GUI_CHAT_NUM_PREFIXES,
|
||||
};
|
||||
|
||||
enum t_gui_chat_silent
|
||||
enum t_gui_chat_mute
|
||||
{
|
||||
GUI_CHAT_SILENT_DISABLED = 0,
|
||||
GUI_CHAT_SILENT_BUFFER,
|
||||
GUI_CHAT_SILENT_ALL_BUFFERS,
|
||||
GUI_CHAT_MUTE_DISABLED = 0,
|
||||
GUI_CHAT_MUTE_BUFFER,
|
||||
GUI_CHAT_MUTE_ALL_BUFFERS,
|
||||
};
|
||||
|
||||
extern char *gui_chat_prefix[GUI_CHAT_NUM_PREFIXES];
|
||||
extern char gui_chat_prefix_empty[];
|
||||
extern int gui_chat_time_length;
|
||||
extern int gui_chat_silent;
|
||||
extern struct t_gui_buffer *gui_chat_silent_buffer;
|
||||
extern int gui_chat_mute;
|
||||
extern struct t_gui_buffer *gui_chat_mute_buffer;
|
||||
|
||||
/* chat functions */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user