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

New plugin "notify", new option for debug messages in plugins

Browse Source
This commit is contained in:
Sebastien Helleu
2008-06-17 16:01:09 +02:00
parent 860842240b
commit af87798455
35 changed files with 1736 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-command.c
+14 -85
View File
@@ -437,87 +437,20 @@ command_buffer (void *data, struct t_gui_buffer *buffer,
/* display/change buffer notify */
if (string_strcasecmp (argv[1], "notify") == 0)
{
if (argc < 3)
/* display notify level for all buffers */
gui_chat_printf (NULL, "");
gui_chat_printf (NULL, _("Notify levels:"));
for (ptr_buffer = gui_buffers; ptr_buffer;
ptr_buffer = ptr_buffer->next_buffer)
{
/* display notify level for all buffers */
gui_chat_printf (NULL, "");
gui_chat_printf (NULL, _("Notify levels:"));
for (ptr_buffer = gui_buffers; ptr_buffer;
ptr_buffer = ptr_buffer->next_buffer)
{
gui_chat_printf (NULL,
" %d.%s: %d",
ptr_buffer->number,
ptr_buffer->name,
ptr_buffer->notify_level);
}
gui_chat_printf (NULL, "");
}
else
{
/* set notify level for buffer */
error = NULL;
number = strtol (argv[2], &error, 10);
if (error && !error[0])
{
if ((number < GUI_BUFFER_NOTIFY_LEVEL_MIN)
|| (number > GUI_BUFFER_NOTIFY_LEVEL_MAX))
{
/* invalid highlight level */
gui_chat_printf (NULL,
_("%sError: incorrect notify level "
"(must be between %d and %d)"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
GUI_BUFFER_NOTIFY_LEVEL_MIN,
GUI_BUFFER_NOTIFY_LEVEL_MAX);
return WEECHAT_RC_ERROR;
}
gui_chat_printf (NULL,
_("New notify level for %s%s%s: "
"%d %s"),
GUI_COLOR(GUI_COLOR_CHAT_BUFFER),
buffer->name,
GUI_COLOR(GUI_COLOR_CHAT),
number,
GUI_COLOR(GUI_COLOR_CHAT));
switch (number)
{
case GUI_HOTLIST_LOW:
gui_chat_printf (NULL,
_("(hotlist: never)"));
break;
case GUI_HOTLIST_MESSAGE:
gui_chat_printf (NULL,
_("(hotlist: highlights)"));
break;
case GUI_HOTLIST_PRIVATE:
gui_chat_printf (NULL,
_("(hotlist: highlights + "
"messages)"));
break;
case GUI_HOTLIST_HIGHLIGHT:
gui_chat_printf (NULL,
_("(hotlist: highlights + "
"messages + join/part "
"(all))"));
break;
default:
gui_chat_printf (NULL, "");
break;
}
}
else
{
/* invalid number */
gui_chat_printf (NULL,
_("%sError: incorrect notify level (must "
"be between %d and %d)"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
GUI_BUFFER_NOTIFY_LEVEL_MIN,
GUI_BUFFER_NOTIFY_LEVEL_MAX);
return WEECHAT_RC_ERROR;
}
gui_chat_printf (NULL,
" %d.%s: %d (%s)",
ptr_buffer->number,
ptr_buffer->name,
ptr_buffer->notify,
gui_buffer_notify_string[ptr_buffer->notify]);
}
gui_chat_printf (NULL, "");
return WEECHAT_RC_OK;
}
@@ -2645,10 +2578,7 @@ command_init ()
"example -1)\n"
" close: close buffer\n"
" list: list buffers (no parameter implies this list)\n"
" notify: set notify level for buffer (0=never, "
"1=highlight, 2=1+msg, 3=2+join/part)\n"
" (when executed on server buffer, this sets "
"default notify level for whole server)\n"
" notify: display notify levels for all open buffers\n"
" scroll: scroll in history (may be relative, and may "
"end by a letter: s=sec, m=min, h=hour, d=day, M=month, "
"y=year); if there is only letter, then scroll to "
@@ -2661,9 +2591,8 @@ command_init ()
" clear all buffers: /buffer clear -all\n"
" move buffer: /buffer move 5\n"
" close buffer: /buffer close this is part msg\n"
" set notify: /buffer notify 2\n"
" scroll 1 day up: /buffer scroll 1d == /buffer "
" scroll -1d == /buffer scroll -24h\n"
"scroll -1d == /buffer scroll -24h\n"
" scroll to beginning\n"
" of this day: /buffer scroll d\n"
" scroll 15 min down: /buffer scroll +15m\n"
src/core/wee-config-file.c
+39 -18
View File
@@ -484,6 +484,31 @@ config_file_new_option (struct t_config_file *config_file,
return new_option;
}
/*
* config_file_option_full_name: build full name for an option
*/
char *
config_file_option_full_name (struct t_config_option *option)
{
int length_option;
char *option_full_name;
length_option = strlen (option->config_file->name) + 1 +
strlen (option->section->name) + 1 + strlen (option->name) + 1;
option_full_name = malloc (length_option);
if (option_full_name)
{
snprintf (option_full_name, length_option,
"%s.%s.%s",
option->config_file->name,
option->section->name,
option->name);
}
return option_full_name;
}
/*
* config_file_search_option: search an option in a config or section
*/
@@ -748,7 +773,7 @@ config_file_string_to_boolean (const char *text)
int
config_file_option_reset (struct t_config_option *option, int run_callback)
{
int rc, length_option;
int rc;
char value[256], *option_full_name;
if (!option)
@@ -830,16 +855,9 @@ config_file_option_reset (struct t_config_option *option, int run_callback)
{
if (option->config_file && option->section)
{
length_option = strlen (option->config_file->name) + 1 +
strlen (option->section->name) + 1 + strlen (option->name) + 1;
option_full_name = malloc (length_option);
option_full_name = config_file_option_full_name (option);
if (option_full_name)
{
snprintf (option_full_name, length_option,
"%s.%s.%s",
option->config_file->name,
option->section->name,
option->name);
hook_config_exec (option_full_name, value);
free (option_full_name);
}
@@ -862,7 +880,7 @@ int
config_file_option_set (struct t_config_option *option, const char *value,
int run_callback)
{
int value_int, i, rc, length_option, new_value_ok;
int value_int, i, rc, new_value_ok;
long number;
char *error, *option_full_name;
@@ -1079,16 +1097,9 @@ config_file_option_set (struct t_config_option *option, const char *value,
{
if (option->config_file && option->section)
{
length_option = strlen (option->config_file->name) + 1 +
strlen (option->section->name) + 1 + strlen (option->name) + 1;
option_full_name = malloc (length_option);
option_full_name = config_file_option_full_name (option);
if (option_full_name)
{
snprintf (option_full_name, length_option,
"%s.%s.%s",
option->config_file->name,
option->section->name,
option->name);
hook_config_exec (option_full_name, value);
free (option_full_name);
}
@@ -1111,6 +1122,7 @@ int
config_file_option_unset (struct t_config_option *option)
{
int rc;
char *option_full_name;
rc = WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET;
@@ -1123,8 +1135,17 @@ config_file_option_unset (struct t_config_option *option)
(option->callback_delete_data,
option);
}
option_full_name = config_file_option_full_name (option);
config_file_option_free (option);
rc = WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED;
if (option_full_name)
{
hook_config_exec (option_full_name, NULL);
free (option_full_name);
}
}
else
{
src/core/wee-config.c
+24 -8
View File
@@ -68,6 +68,7 @@ struct t_config_option *config_startup_weechat_slogan;
/* config, look & feel section */
struct t_config_option *config_look_buffer_notify_default;
struct t_config_option *config_look_buffer_time_format;
struct t_config_option *config_look_color_nicks_number;
struct t_config_option *config_look_color_real_white;
@@ -184,9 +185,10 @@ struct t_config_option *config_proxy_password;
/* config, plugin section */
struct t_config_option *config_plugin_path;
struct t_config_option *config_plugin_autoload;
struct t_config_option *config_plugin_debug;
struct t_config_option *config_plugin_extension;
struct t_config_option *config_plugin_path;
struct t_config_option *config_plugin_save_config_on_unload;
/* hooks */
@@ -779,7 +781,15 @@ config_weechat_init ()
config_file_free (weechat_config_file);
return 0;
}
config_look_buffer_notify_default = config_file_new_option (
weechat_config_file, ptr_section,
"buffer_notify_default", "integer",
N_("default notify level for buffers (used to tell WeeChat if buffer "
"must be displayed in hotlist or not, according to importance "
"of message)"),
"none|highlight|message|all", 0, 0, "all",
NULL, NULL, NULL, NULL, NULL, NULL);
config_look_buffer_time_format = config_file_new_option (
weechat_config_file, ptr_section,
"buffer_time_format", "string",
@@ -1533,12 +1543,6 @@ config_weechat_init ()
return 0;
}
config_plugin_path = config_file_new_option (
weechat_config_file, ptr_section,
"path", "string",
N_("path for searching plugins ('%h' will be replaced by "
"WeeChat home, ~/.weechat by default)"),
NULL, 0, 0, "%h/plugins", NULL, NULL, NULL, NULL, NULL, NULL);
config_plugin_autoload = config_file_new_option (
weechat_config_file, ptr_section,
"autoload", "string",
@@ -1547,6 +1551,12 @@ config_weechat_init ()
"be partial, for example \"perl\" is ok for "
"\"perl.so\")"),
NULL, 0, 0, "*", NULL, NULL, NULL, NULL, NULL, NULL);
config_plugin_debug = config_file_new_option (
weechat_config_file, ptr_section,
"debug", "boolean",
N_("enable debug messages by default in all plugins (option disabled "
"by default, which is highly recommended)"),
NULL, 0, 0, "off", NULL, NULL, NULL, NULL, NULL, NULL);
config_plugin_extension = config_file_new_option (
weechat_config_file, ptr_section,
"extension", "string",
@@ -1559,6 +1569,12 @@ config_weechat_init ()
".so",
#endif
NULL, NULL, NULL, NULL, NULL, NULL);
config_plugin_path = config_file_new_option (
weechat_config_file, ptr_section,
"path", "string",
N_("path for searching plugins ('%h' will be replaced by "
"WeeChat home, ~/.weechat by default)"),
NULL, 0, 0, "%h/plugins", NULL, NULL, NULL, NULL, NULL, NULL);
config_plugin_save_config_on_unload = config_file_new_option (
weechat_config_file, ptr_section,
"save_config_on_unload", "boolean",
src/core/wee-config.h
+4 -1
View File
@@ -54,6 +54,7 @@ extern struct t_config_option *config_startup_display_logo;
extern struct t_config_option *config_startup_display_version;
extern struct t_config_option *config_startup_weechat_slogan;
extern struct t_config_option *config_look_buffer_notify_default;
extern struct t_config_option *config_look_buffer_time_format;
extern struct t_config_option *config_look_color_nicks_number;
extern struct t_config_option *config_look_color_real_white;
@@ -162,11 +163,13 @@ extern struct t_config_option *config_proxy_port;
extern struct t_config_option *config_proxy_username;
extern struct t_config_option *config_proxy_password;
extern struct t_config_option *config_plugin_path;
extern struct t_config_option *config_plugin_autoload;
extern struct t_config_option *config_plugin_debug;
extern struct t_config_option *config_plugin_extension;
extern struct t_config_option *config_plugin_path;
extern struct t_config_option *config_plugin_save_config_on_unload;
extern int config_weechat_init ();
extern int config_weechat_read ();
extern int config_weechat_reload ();
src/gui/gui-buffer.c
+33 -9
View File
@@ -57,6 +57,9 @@ struct t_gui_buffer *gui_buffers = NULL; /* first buffer */
struct t_gui_buffer *last_gui_buffer = NULL; /* last buffer */
struct t_gui_buffer *gui_previous_buffer = NULL; /* previous buffer */
char *gui_buffer_notify_string[GUI_BUFFER_NUM_NOTIFY] =
{ "none", "highlight", "message", "all" };
/*
* gui_buffer_new: create a new buffer in current window
@@ -99,7 +102,7 @@ gui_buffer_new (struct t_weechat_plugin *plugin,
new_buffer->category = (category) ? strdup (category) : NULL;
new_buffer->name = strdup (name);
new_buffer->type = GUI_BUFFER_TYPE_FORMATED;
new_buffer->notify_level = GUI_BUFFER_NOTIFY_LEVEL_DEFAULT;
new_buffer->notify = CONFIG_INTEGER(config_look_buffer_notify_default);
new_buffer->num_displayed = 0;
/* close callback */
@@ -230,6 +233,21 @@ gui_buffer_valid (struct t_gui_buffer *buffer)
return 0;
}
/*
* gui_buffer_get_integer: get a buffer property as integer
*/
int
gui_buffer_get_integer (struct t_gui_buffer *buffer, const char *property)
{
if (string_strcasecmp (property, "notify") == 0)
return buffer->notify;
else if (string_strcasecmp (property, "lines_hidden") == 0)
return buffer->lines_hidden;
return 0;
}
/*
* gui_buffer_get_string: get a buffer property as string
*/
@@ -237,8 +255,6 @@ gui_buffer_valid (struct t_gui_buffer *buffer)
char *
gui_buffer_get_string (struct t_gui_buffer *buffer, const char *property)
{
static char value[32];
if (string_strcasecmp (property, "plugin") == 0)
return (buffer->plugin) ? buffer->plugin->name : NULL;
else if (string_strcasecmp (property, "category") == 0)
@@ -249,11 +265,6 @@ gui_buffer_get_string (struct t_gui_buffer *buffer, const char *property)
return buffer->title;
else if (string_strcasecmp (property, "nick") == 0)
return buffer->input_nick;
else if (string_strcasecmp (property, "lines_hidden") == 0)
{
snprintf (value, sizeof (value), "%d", buffer->lines_hidden);
return value;
}
return NULL;
}
@@ -504,6 +515,19 @@ gui_buffer_set (struct t_gui_buffer *buffer, const char *property,
else if (string_strcasecmp (value, "free") == 0)
gui_buffer_set_type (buffer, GUI_BUFFER_TYPE_FREE);
}
else if (string_strcasecmp (property, "notify") == 0)
{
error = NULL;
number = strtol (value, &error, 10);
if (error && !error[0]
&& (number < GUI_BUFFER_NUM_NOTIFY))
{
if (number < 0)
buffer->notify = CONFIG_INTEGER(config_look_buffer_notify_default);
else
buffer->notify = number;
}
}
else if (string_strcasecmp (property, "title") == 0)
{
gui_buffer_set_title (buffer, value);
@@ -1147,7 +1171,7 @@ gui_buffer_print_log ()
log_printf (" category . . . . . . . : '%s'", ptr_buffer->category);
log_printf (" name . . . . . . . . . : '%s'", ptr_buffer->name);
log_printf (" type . . . . . . . . . : %d", ptr_buffer->type);
log_printf (" notify_level . . . . . : %d", ptr_buffer->notify_level);
log_printf (" notify . . . . . . . . : %d", ptr_buffer->notify);
log_printf (" num_displayed. . . . . : %d", ptr_buffer->num_displayed);
log_printf (" title. . . . . . . . . : '%s'", ptr_buffer->title);
log_printf (" lines. . . . . . . . . : 0x%x", ptr_buffer->lines);
src/gui/gui-buffer.h
+13 -4
View File
@@ -28,9 +28,15 @@ enum t_gui_buffer_type
GUI_BUFFER_NUM_TYPES,
};
#define GUI_BUFFER_NOTIFY_LEVEL_MIN 0
#define GUI_BUFFER_NOTIFY_LEVEL_MAX 3
#define GUI_BUFFER_NOTIFY_LEVEL_DEFAULT GUI_BUFFER_NOTIFY_LEVEL_MAX
enum t_gui_buffer_notify
{
GUI_BUFFER_NOTIFY_NONE = 0,
GUI_BUFFER_NOTIFY_HIGHLIGHT,
GUI_BUFFER_NOTIFY_MESSAGE,
GUI_BUFFER_NOTIFY_ALL,
/* number of buffer notify */
GUI_BUFFER_NUM_NOTIFY,
};
#define GUI_TEXT_SEARCH_DISABLED 0
#define GUI_TEXT_SEARCH_BACKWARD 1
@@ -66,7 +72,7 @@ struct t_gui_buffer
char *category; /* category name */
char *name; /* buffer name */
enum t_gui_buffer_type type; /* buffer type (formated, free, ..) */
int notify_level; /* 0 = never */
int notify; /* 0 = never */
/* 1 = highlight only */
/* 2 = highlight + msg */
/* 3 = highlight + msg + join/part */
@@ -152,6 +158,7 @@ struct t_gui_buffer
extern struct t_gui_buffer *gui_buffers;
extern struct t_gui_buffer *last_gui_buffer;
extern struct t_gui_buffer *gui_previous_buffer;
extern char *gui_buffer_notify_string[];
/* buffer functions */
@@ -165,6 +172,8 @@ extern struct t_gui_buffer *gui_buffer_new (struct t_weechat_plugin *plugin,
struct t_gui_buffer *buffer),
void *close_callback_data);
extern int gui_buffer_valid (struct t_gui_buffer *buffer);
extern int gui_buffer_get_integer (struct t_gui_buffer *buffer,
const char *property);
extern char *gui_buffer_get_string (struct t_gui_buffer *buffer,
const char *property);
extern void *gui_buffer_get_pointer (struct t_gui_buffer *buffer,
src/gui/gui-hotlist.c
+28
View File
@@ -64,6 +64,30 @@ gui_hotlist_search (struct t_gui_hotlist *hotlist, struct t_gui_buffer *buffer)
return NULL;
}
/*
* gui_hotlist_check_buffer_notify: return: 1 if buffer notify is ok according
* to priority (buffer will be added
* to hotlist)
* 0 if buffer will not be added to
* hotlist
*/
int
gui_hotlist_check_buffer_notify (struct t_gui_buffer *buffer, int priority)
{
switch (priority)
{
case GUI_HOTLIST_LOW:
return (buffer->notify >= 3);
case GUI_HOTLIST_MESSAGE:
case GUI_HOTLIST_PRIVATE:
return (buffer->notify >= 2);
case GUI_HOTLIST_HIGHLIGHT:
return (buffer->notify >= 1);
}
return 1;
}
/*
* gui_hotlist_find_pos: find position for a inserting in hotlist
* (for sorting hotlist)
@@ -208,6 +232,10 @@ gui_hotlist_add (struct t_gui_buffer *buffer, int priority,
else if (priority > GUI_HOTLIST_MAX)
priority = GUI_HOTLIST_MAX;
/* check if priority is ok according to buffer notify level value */
if (!gui_hotlist_check_buffer_notify (buffer, priority))
return;
if ((ptr_hotlist = gui_hotlist_search (gui_hotlist, buffer)))
{
/* return if priority is greater or equal than the one to add */
src/plugins/CMakeLists.txt
+4
View File
@@ -64,6 +64,10 @@ IF(NOT DISABLE_LOGGER)
ADD_SUBDIRECTORY( logger )
ENDIF(NOT DISABLE_LOGGER)
IF(NOT DISABLE_NOTIFY)
ADD_SUBDIRECTORY( notify )
ENDIF(NOT DISABLE_NOTIFY)
IF(NOT DISABLE_SCRIPTS AND NOT DISABLE_PERL AND NOT DISABLE_PYTHON AND NOT DISABLE_RUBY AND NOT DISABLE_LUA)
ADD_SUBDIRECTORY( scripts )
ENDIF(NOT DISABLE_SCRIPTS AND NOT DISABLE_PERL AND NOT DISABLE_PYTHON AND NOT DISABLE_RUBY AND NOT DISABLE_LUA)
src/plugins/Makefile.am
+6 -2
View File
@@ -60,6 +60,10 @@ if PLUGIN_LOGGER
logger_dir = logger
endif
if PLUGIN_NOTIFY
notify_dir = notify
endif
if PLUGIN_PERL
script_dir = scripts
endif
@@ -85,5 +89,5 @@ xfer_dir = xfer
endif
SUBDIRS = . $(alias_dir) $(aspell_dir) $(charset_dir) $(debug_dir) \
$(demo_dir) $(fifo_dir) $(irc_dir) $(logger_dir) $(script_dir) \
$(trigger_dir) $(xfer_dir)
$(demo_dir) $(fifo_dir) $(irc_dir) $(logger_dir) $(notify_dir) \
$(script_dir) $(trigger_dir) $(xfer_dir)
src/plugins/charset/charset.c
+3 -1
View File
@@ -99,7 +99,7 @@ charset_config_reload (void *data, struct t_config_file *config_file)
}
/*
* charset_config_set_option: set a charset
* charset_config_create_option: set a charset
*/
int
@@ -523,6 +523,8 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
weechat_plugin = plugin;
charset_debug = weechat_config_boolean (weechat_config_get ("weechat.plugin.debug"));
/* get terminal & internal charsets */
charset_terminal = weechat_info_get ("charset_terminal");
charset_internal = weechat_info_get ("charset_internal");
src/plugins/demo/demo.c
+2
View File
@@ -411,6 +411,8 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
weechat_plugin = plugin;
demo_debug = weechat_config_boolean (weechat_config_get ("weechat.plugin.debug"));
weechat_hook_command ("demo_printf",
_("print some messages on current ubffer"),
_("[text]"),
src/plugins/irc/irc-debug.c
+1
View File
@@ -156,6 +156,7 @@ irc_debug_signal_debug_dump_cb (void *data, const char *signal,
void
irc_debug_init ()
{
irc_debug = weechat_config_boolean (weechat_config_get ("weechat.plugin.debug"));
weechat_hook_signal ("debug", &irc_debug_signal_debug_cb, NULL);
weechat_hook_signal ("debug_dump", &irc_debug_signal_debug_dump_cb, NULL);
}
src/plugins/notify/CMakeLists.txt
+22
View File
@@ -0,0 +1,22 @@
# Copyright (c) 2003-2008 FlashCode <flashcode@flashtux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
ADD_LIBRARY(notify MODULE notify.c)
SET_TARGET_PROPERTIES(notify PROPERTIES PREFIX "")
TARGET_LINK_LIBRARIES(notify)
INSTALL(TARGETS notify LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins)
src/plugins/notify/Makefile.am
+25
View File
@@ -0,0 +1,25 @@
# Copyright (c) 2003-2008 FlashCode <flashcode@flashtux.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(NOTIFY_CFLAGS)
libdir = ${weechat_libdir}/plugins
lib_LTLIBRARIES = notify.la
notify_la_SOURCES = notify.c
notify_la_LDFLAGS = -module
notify_la_LIBADD = $(NOTIFY_LFLAGS)
src/plugins/notify/notify.c
+540
View File
@@ -0,0 +1,540 @@
/*
* Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org>
* See README for License detail, AUTHORS for developers list.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* notify.c: Notify plugin for WeeChat: set/save buffer notify levels */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <iconv.h>
#include "../weechat-plugin.h"
WEECHAT_PLUGIN_NAME("notify");
WEECHAT_PLUGIN_DESCRIPTION("Notify plugin for WeeChat (set/save buffer notify levels)");
WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode@flashtux.org>");
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
WEECHAT_PLUGIN_WEECHAT_VERSION(WEECHAT_VERSION);
WEECHAT_PLUGIN_LICENSE("GPL3");
#define NOTIFY_CONFIG_NAME "notify"
struct t_weechat_plugin *weechat_notify_plugin = NULL;
#define weechat_plugin weechat_notify_plugin
struct t_config_file *notify_config_file = NULL;
struct t_config_section *notify_config_section_buffer = NULL;
#define NOTIFY_NUM_LEVELS 4
char *notify_string[NOTIFY_NUM_LEVELS] =
{ "none", "highlight", "message", "all" };
int notify_debug = 0;
/*
* notify_search: search a notify level by name
*/
int
notify_search (const char *notify_name)
{
int i;
for (i = 0; i < NOTIFY_NUM_LEVELS; i++)
{
if (weechat_strcasecmp (notify_name, notify_string[i]) == 0)
return i;
}
/* notify level not found */
return -1;
}
/*
* notify_build_option_name: build option name for a buffer
*/
char *
notify_build_option_name (struct t_gui_buffer *buffer)
{
char *option_name, *plugin_name, *category, *name;
int length;
plugin_name = weechat_buffer_get_string (buffer, "plugin");
category = weechat_buffer_get_string (buffer, "category");
name = weechat_buffer_get_string (buffer, "name");
length = ((plugin_name) ? strlen (plugin_name) : 0) + 1 +
strlen (category) + 1 + strlen (name) + 1;
option_name = malloc (length);
if (!option_name)
return NULL;
snprintf (option_name, length, "%s%s%s.%s",
(plugin_name) ? plugin_name : "",
(plugin_name) ? "." : "",
category,
name);
return option_name;
}
/*
* notify_debug_cb: callback for "debug" signal
*/
int
notify_debug_cb (void *data, const char *signal, const char *type_data,
void *signal_data)
{
/* make C compiler happy */
(void) data;
(void) signal;
if (strcmp (type_data, WEECHAT_HOOK_SIGNAL_STRING) == 0)
{
if (weechat_strcasecmp ((char *)signal_data, "notify") == 0)
{
notify_debug ^= 1;
if (notify_debug)
weechat_printf (NULL, _("%s: debug enabled"), "notify");
else
weechat_printf (NULL, _("%s: debug disabled"), "notify");
}
}
return WEECHAT_RC_OK;
}
/*
* notify_get: read a notify level in config file
* we first try with all arguments, then remove one by one
* to find notify level (from specific to general notify)
*/
int
notify_get (const char *name)
{
char *option_name, *ptr_end;
struct t_config_option *ptr_option;
option_name = strdup (name);
if (option_name)
{
ptr_end = option_name + strlen (option_name);
while (ptr_end >= option_name)
{
ptr_option = weechat_config_search_option (notify_config_file,
notify_config_section_buffer,
option_name);
if (ptr_option)
{
free (option_name);
return weechat_config_integer (ptr_option);
}
ptr_end--;
while ((ptr_end >= option_name) && (ptr_end[0] != '.'))
{
ptr_end--;
}
if ((ptr_end >= option_name) && (ptr_end[0] == '.'))
ptr_end[0] = '\0';
}
ptr_option = weechat_config_search_option (notify_config_file,
notify_config_section_buffer,
option_name);
free (option_name);
if (ptr_option)
return weechat_config_integer (ptr_option);
}
/* notify level not found */
return -1;
}
/*
* notify_set_buffer: set notify for a buffer
*/
void
notify_set_buffer (struct t_gui_buffer *buffer)
{
char *option_name, notify_str[16];
int notify;
option_name = notify_build_option_name (buffer);
if (option_name)
{
notify = notify_get (option_name);
if (notify_debug)
{
weechat_printf (NULL,
_("notify: debug: set notify for buffer %s to "
"%d (%s)"),
option_name, notify,
(notify < 0) ? "reset" : notify_string[notify]);
}
/* set notify for buffer */
snprintf (notify_str, sizeof (notify_str), "%d", notify);
weechat_buffer_set (buffer, "notify", notify_str);
free (option_name);
}
}
/*
* notify_set_buffer_all: set notify for all open buffers
*/
void
notify_set_buffer_all ()
{
struct t_plugin_infolist *ptr_infolist;
ptr_infolist = weechat_infolist_get ("buffer", NULL, NULL);
if (ptr_infolist)
{
while (weechat_infolist_next (ptr_infolist))
{
notify_set_buffer (weechat_infolist_pointer (ptr_infolist,
"pointer"));
}
weechat_infolist_free (ptr_infolist);
}
}
/*
* notify_config_cb: callback for config hook
*/
int
notify_config_cb (void *data, const char *option, const char *value)
{
/* make C compiler happy */
(void) data;
(void) option;
(void) value;
notify_set_buffer_all ();
return WEECHAT_RC_OK;
}
/*
* notify_config_reaload: reload notify configuration file
*/
int
notify_config_reload (void *data, struct t_config_file *config_file)
{
/* make C compiler happy */
(void) data;
/* free all notify levels */
weechat_config_section_free_options (notify_config_section_buffer);
return weechat_config_reload (config_file);
}
/*
* notify_config_create_option: set a notify level
*/
int
notify_config_create_option (void *data, struct t_config_file *config_file,
struct t_config_section *section,
const char *option_name, const char *value)
{
struct t_config_option *ptr_option;
int rc;
/* make C compiler happy */
(void) data;
rc = WEECHAT_CONFIG_OPTION_SET_ERROR;
if (option_name)
{
ptr_option = weechat_config_search_option (config_file, section,
option_name);
if (ptr_option)
{
if (value && value[0])
rc = weechat_config_option_set (ptr_option, value, 1);
else
{
weechat_config_option_free (ptr_option);
rc = WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE;
}
}
else
{
if (value && value[0])
{
ptr_option = weechat_config_new_option (
config_file, section,
option_name, "integer", NULL,
"none|highlight|message|all",
0, 0, value, NULL, NULL, NULL, NULL, NULL, NULL);
rc = (ptr_option) ?
WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE : WEECHAT_CONFIG_OPTION_SET_ERROR;
}
else
rc = WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE;
}
}
if (rc == WEECHAT_CONFIG_OPTION_SET_ERROR)
{
weechat_printf (NULL,
_("%s%s: unable to set notify level \"%s\" => \"%s\""),
weechat_prefix ("error"), "notify",
option_name, value);
}
return rc;
}
/*
* notify_config_init: init notify configuration file
* return: 1 if ok, 0 if error
*/
int
notify_config_init ()
{
struct t_config_section *ptr_section;
notify_config_file = weechat_config_new (NOTIFY_CONFIG_NAME,
&notify_config_reload, NULL);
if (!notify_config_file)
return 0;
ptr_section = weechat_config_new_section (notify_config_file, "buffer",
1, 1,
NULL, NULL,
NULL, NULL,
NULL, NULL,
&notify_config_create_option, NULL);
if (!ptr_section)
{
weechat_config_free (notify_config_file);
return 0;
}
notify_config_section_buffer = ptr_section;
return 1;
}
/*
* notify_config_read: read notify configuration file
*/
int
notify_config_read ()
{
return weechat_config_read (notify_config_file);
}
/*
* notify_config_write: write notify configuration file
*/
int
notify_config_write ()
{
return weechat_config_write (notify_config_file);
}
/*
* notify_buffer_open_signal_cb: callback for "buffer_open" signal
*/
int
notify_buffer_open_signal_cb (void *data, const char *signal,
const char *type_data, void *signal_data)
{
/* make C compiler happy */
(void) data;
(void) signal;
(void) type_data;
notify_set_buffer (signal_data);
return WEECHAT_RC_OK;
}
/*
* notify_set: set a notify level for a buffer
*/
void
notify_set (struct t_gui_buffer *buffer, const char *name, int value)
{
char notify_str[16];
/* create/update option */
if (notify_config_create_option (NULL,
notify_config_file,
notify_config_section_buffer,
name,
(value < 0) ?
NULL : notify_string[value]) > 0)
{
/* set notify for buffer */
snprintf (notify_str, sizeof (notify_str), "%d", value);
weechat_buffer_set (buffer, "notify", notify_str);
/* display message */
if (value >= 0)
weechat_printf (NULL, _("Notify level: %s => %s"),
name, notify_string[value]);
else
weechat_printf (NULL, _("Notify level: %s: removed"), name);
}
}
/*
* notify_command_cb: callback for /notify command
*/
int
notify_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
int notify_level;
char *option_name;
/* make C compiler happy */
(void) data;
/* check arguments */
if (argc < 2)
{
weechat_printf (NULL,
_("%s%s: missing parameters"),
weechat_prefix ("error"), "notify");
return WEECHAT_RC_ERROR;
}
/* check if notify level exists */
if (weechat_strcasecmp (argv[1], "reset") == 0)
notify_level = -1;
else
{
notify_level = notify_search (argv_eol[1]);
if (notify_level < 0)
{
weechat_printf (NULL,
_("%s%s: unknown notify level \"%s\""),
weechat_prefix ("error"), "notify",
argv_eol[1]);
return WEECHAT_RC_ERROR;
}
}
/* set buffer notify level */
option_name = notify_build_option_name (buffer);
if (option_name)
{
notify_set (buffer, option_name, notify_level);
free (option_name);
}
else
return WEECHAT_RC_ERROR;
return WEECHAT_RC_OK;
}
/*
* weechat_plugin_init: init notify plugin
*/
int
weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
{
/* make C compiler happy */
(void) argc;
(void) argv;
weechat_plugin = plugin;
notify_debug = weechat_config_boolean (weechat_config_get ("weechat.plugin.debug"));
if (!notify_config_init ())
{
weechat_printf (NULL,
_("%s%s: error creating configuration file"),
weechat_prefix("error"), "notify");
return WEECHAT_RC_ERROR;
}
notify_config_read ();
/* /notify command */
weechat_hook_command ("notify",
_("change notify level for current buffer"),
_("[reset | none | highlight | message | all]"),
_(" reset: reset notify level to default value\n"
" none: buffer will never be in hotlist\n"
"highlight: buffer will be in hotlist for "
"highlights only\n"
" message: buffer will be in hotlist for "
"highlights and user messages only\n"
" all: buffer will be in hotlist for "
"any text printed"),
"reset|none|highlight|message|all",
&notify_command_cb, NULL);
/* callback when a buffer is open */
weechat_hook_signal ("buffer_open", &notify_buffer_open_signal_cb, NULL);
/* callback when a config option is changed */
weechat_hook_config ("notify.buffer.*", &notify_config_cb, NULL);
/* callback for debug */
weechat_hook_signal ("debug", &notify_debug_cb, NULL);
/* set notify for open buffers */
notify_set_buffer_all ();
return WEECHAT_RC_OK;
}
/*
* weechat_plugin_end: end notify plugin
*/
int
weechat_plugin_end (struct t_weechat_plugin *plugin)
{
/* make C compiler happy */
(void) plugin;
notify_config_write ();
weechat_config_free (notify_config_file);
return WEECHAT_RC_OK;
}
src/plugins/plugin-api.c
+1 -1
View File
@@ -498,7 +498,7 @@ plugin_api_infolist_get_add_buffer (struct t_plugin_infolist *infolist,
return 0;
if (!plugin_infolist_new_var_integer (ptr_item, "type", buffer->type))
return 0;
if (!plugin_infolist_new_var_integer (ptr_item, "notify_level", buffer->notify_level))
if (!plugin_infolist_new_var_integer (ptr_item, "notify", buffer->notify))
return 0;
if (!plugin_infolist_new_var_integer (ptr_item, "num_displayed", buffer->num_displayed))
return 0;
src/plugins/plugin.c
+1
View File
@@ -389,6 +389,7 @@ plugin_load (const char *filename)
new_plugin->buffer_search = &gui_buffer_search_by_category_name;
new_plugin->buffer_clear = &gui_buffer_clear;
new_plugin->buffer_close = &gui_buffer_close;
new_plugin->buffer_get_integer = &gui_buffer_get_integer;
new_plugin->buffer_get_string = &gui_buffer_get_string;
new_plugin->buffer_get_pointer = &gui_buffer_get_pointer;
new_plugin->buffer_set = &gui_buffer_set;
src/plugins/scripts/lua/weechat-lua-api.c
+40
View File
@@ -3365,6 +3365,45 @@ weechat_lua_api_buffer_close (lua_State *L)
LUA_RETURN_OK;
}
/*
* weechat_lua_api_buffer_get_integer: get a buffer property as integer
*/
static int
weechat_lua_api_buffer_get_integer (lua_State *L)
{
const char *buffer, *property;
int n, value;
/* make C compiler happy */
(void) L;
if (!lua_current_script)
{
WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("buffer_get_integer");
LUA_RETURN_INT(-1);
}
buffer = NULL;
property = NULL;
n = lua_gettop (lua_current_interpreter);
if (n < 2)
{
WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("buffer_get_integer");
LUA_RETURN_INT(-1);
}
buffer = lua_tostring (lua_current_interpreter, -2);
property = lua_tostring (lua_current_interpreter, -1);
value = weechat_buffer_get_integer (script_str2ptr (buffer),
property);
LUA_RETURN_INT(value);
}
/*
* weechat_lua_api_buffer_get_string: get a buffer property as string
*/
@@ -4968,6 +5007,7 @@ const struct luaL_reg weechat_lua_api_funcs[] = {
{ "buffer_search", &weechat_lua_api_buffer_search },
{ "buffer_clear", &weechat_lua_api_buffer_clear },
{ "buffer_close", &weechat_lua_api_buffer_close },
{ "buffer_get_integer", &weechat_lua_api_buffer_get_integer },
{ "buffer_get_string", &weechat_lua_api_buffer_get_string },
{ "buffer_get_pointer", &weechat_lua_api_buffer_get_pointer },
{ "buffer_set", &weechat_lua_api_buffer_set },
src/plugins/scripts/perl/weechat-perl-api.c
+33
View File
@@ -2810,6 +2810,38 @@ static XS (XS_weechat_buffer_close)
PERL_RETURN_OK;
}
/*
* weechat::buffer_get_integer: get a buffer property as integer
*/
static XS (XS_weechat_buffer_get_integer)
{
char *buffer, *property;
int value;
dXSARGS;
/* make C compiler happy */
(void) cv;
if (!perl_current_script)
{
WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("buffer_get_integer");
PERL_RETURN_INT(-1);
}
if (items < 2)
{
WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("buffer_get_integer");
PERL_RETURN_INT(-1);
}
buffer = SvPV (ST (0), PL_na);
property = SvPV (ST (1), PL_na);
value = weechat_buffer_get_integer (script_str2ptr (buffer), property);
PERL_RETURN_INT(value);
}
/*
* weechat::buffer_get_string: get a buffer property as string
*/
@@ -3898,6 +3930,7 @@ weechat_perl_api_init (pTHX)
newXS ("weechat::buffer_search", XS_weechat_buffer_search, "weechat");
newXS ("weechat::buffer_clear", XS_weechat_buffer_clear, "weechat");
newXS ("weechat::buffer_close", XS_weechat_buffer_close, "weechat");
newXS ("weechat::buffer_get_integer", XS_weechat_buffer_get_integer, "weechat");
newXS ("weechat::buffer_get_string", XS_weechat_buffer_get_string, "weechat");
newXS ("weechat::buffer_get_pointer", XS_weechat_buffer_get_pointer, "weechat");
newXS ("weechat::buffer_set", XS_weechat_buffer_set, "weechat");
src/plugins/scripts/python/weechat-python-api.c
+34
View File
@@ -2986,6 +2986,39 @@ weechat_python_api_buffer_close (PyObject *self, PyObject *args)
PYTHON_RETURN_OK;
}
/*
* weechat_python_api_buffer_get_integer get a buffer property as integer
*/
static PyObject *
weechat_python_api_buffer_get_integer (PyObject *self, PyObject *args)
{
char *buffer, *property;
int value;
/* make C compiler happy */
(void) self;
if (!python_current_script)
{
WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("buffer_get_integer");
PYTHON_RETURN_INT(-1);
}
buffer = NULL;
property = NULL;
if (!PyArg_ParseTuple (args, "ss", &buffer, &property))
{
WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("buffer_get_integer");
PYTHON_RETURN_INT(-1);
}
value = weechat_buffer_get_integer (script_str2ptr (buffer), property);
PYTHON_RETURN_INT(value);
}
/*
* weechat_python_api_buffer_get_string: get a buffer property as string
*/
@@ -4144,6 +4177,7 @@ PyMethodDef weechat_python_funcs[] =
{ "buffer_search", &weechat_python_api_buffer_search, METH_VARARGS, "" },
{ "buffer_clear", &weechat_python_api_buffer_clear, METH_VARARGS, "" },
{ "buffer_close", &weechat_python_api_buffer_close, METH_VARARGS, "" },
{ "buffer_get_integer", &weechat_python_api_buffer_get_integer, METH_VARARGS, "" },
{ "buffer_get_string", &weechat_python_api_buffer_get_string, METH_VARARGS, "" },
{ "buffer_get_pointer", &weechat_python_api_buffer_get_pointer, METH_VARARGS, "" },
{ "buffer_set", &weechat_python_api_buffer_set, METH_VARARGS, "" },
src/plugins/scripts/ruby/weechat-ruby-api.c
+38
View File
@@ -3427,6 +3427,43 @@ weechat_ruby_api_buffer_close (VALUE class, VALUE buffer,
RUBY_RETURN_OK;
}
/*
* weechat_ruby_api_buffer_get_integer: get a buffer property as integer
*/
static VALUE
weechat_ruby_api_buffer_get_integer (VALUE class, VALUE buffer, VALUE property)
{
char *c_buffer, *c_property;
int value;
/* make C compiler happy */
(void) class;
if (!ruby_current_script)
{
WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("buffer_get_integer");
RUBY_RETURN_INT(-1);
}
if (NIL_P (buffer) || NIL_P (property))
{
WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("buffer_get_integer");
RUBY_RETURN_INT(-1);
}
Check_Type (buffer, T_STRING);
Check_Type (property, T_STRING);
c_buffer = STR2CSTR (buffer);
c_property = STR2CSTR (property);
value = weechat_buffer_get_integer (script_str2ptr (c_buffer),
c_property);
RUBY_RETURN_INT(value);
}
/*
* weechat_ruby_api_buffer_get_string: get a buffer property as string
*/
@@ -4771,6 +4808,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat)
rb_define_module_function (ruby_mWeechat, "buffer_search", &weechat_ruby_api_buffer_search, 2);
rb_define_module_function (ruby_mWeechat, "buffer_clear", &weechat_ruby_api_buffer_clear, 1);
rb_define_module_function (ruby_mWeechat, "buffer_close", &weechat_ruby_api_buffer_close, 1);
rb_define_module_function (ruby_mWeechat, "buffer_get_integer", &weechat_ruby_api_buffer_get_integer, 2);
rb_define_module_function (ruby_mWeechat, "buffer_get_string", &weechat_ruby_api_buffer_get_string, 2);
rb_define_module_function (ruby_mWeechat, "buffer_get_pointer", &weechat_ruby_api_buffer_get_pointer, 2);
rb_define_module_function (ruby_mWeechat, "buffer_set", &weechat_ruby_api_buffer_set, 3);
src/plugins/weechat-plugin.h
+3
View File
@@ -381,6 +381,7 @@ struct t_weechat_plugin
struct t_gui_buffer *(*buffer_search) (const char *category, const char *name);
void (*buffer_clear) (struct t_gui_buffer *buffer);
void (*buffer_close) (struct t_gui_buffer *buffer, int switch_to_another);
int (*buffer_get_integer) (struct t_gui_buffer *buffer, const char *property);
char *(*buffer_get_string) (struct t_gui_buffer *buffer, const char *property);
void *(*buffer_get_pointer) (struct t_gui_buffer *buffer, const char *property);
void (*buffer_set) (struct t_gui_buffer *buffer, const char *property,
@@ -807,6 +808,8 @@ extern int weechat_plugin_end (struct t_weechat_plugin *plugin);
weechat_plugin->buffer_clear(__buffer)
#define weechat_buffer_close(__buffer, __switch_to_another) \
weechat_plugin->buffer_close(__buffer, __switch_to_another)
#define weechat_buffer_get_integer(__buffer, __property) \
weechat_plugin->buffer_get_integer(__buffer, __property)
#define weechat_buffer_get_string(__buffer, __property) \
weechat_plugin->buffer_get_string(__buffer, __property)
#define weechat_buffer_get_pointer(__buffer, __property) \
src/plugins/xfer/xfer.c
+2
View File
@@ -1204,6 +1204,8 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
(void) argv;
weechat_plugin = plugin;
xfer_debug = weechat_config_boolean (weechat_config_get ("weechat.plugin.debug"));
if (!xfer_config_init ())
return WEECHAT_RC_ERROR;