pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 23:36:37 +02:00
Code Activity

Add new option weechat.look.highlight_regex and function string_has_highlight_regex in plugin API (task #10321)

Browse Source
This commit is contained in:
Sebastien Helleu
2010-11-25 21:28:14 +01:00
parent 8b9abab711
commit e92079cfe9
32 changed files with 578 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/CMakeLists.txt
-3
View File
@@ -45,9 +45,6 @@ irc-server.c irc-server.h
irc-upgrade.c irc-upgrade.h)
SET_TARGET_PROPERTIES(irc PROPERTIES PREFIX "")
CHECK_INCLUDE_FILES("regex.h" HAVE_REGEX_H)
CHECK_FUNCTION_EXISTS(regexec HAVE_REGEXEC)
SET (LINK_LIBS)
IF(GNUTLS_FOUND)
src/plugins/plugin.c
+1
View File
@@ -465,6 +465,7 @@ plugin_load (const char *filename)
new_plugin->string_remove_quotes = &string_remove_quotes;
new_plugin->string_strip = &string_strip;
new_plugin->string_has_highlight = &string_has_highlight;
new_plugin->string_has_highlight_regex = &string_has_highlight_regex;
new_plugin->string_mask_to_regex = &string_mask_to_regex;
new_plugin->string_split = &string_split;
new_plugin->string_free_split = &string_free_split;
src/plugins/scripts/lua/weechat-lua-api.c
+40
View File
@@ -422,6 +422,45 @@ weechat_lua_api_string_has_highlight (lua_State *L)
LUA_RETURN_INT(value);
}
/*
* weechat_lua_api_string_has_highlight_regex: return 1 if string contains a
* highlight (using regular
* expression)
* return 0 if no highlight is
* found in string
*/
static int
weechat_lua_api_string_has_highlight_regex (lua_State *L)
{
const char *string, *regex;
int n, value;
/* make C compiler happy */
(void) L;
if (!lua_current_script || !lua_current_script->name)
{
WEECHAT_SCRIPT_MSG_NOT_INIT(LUA_CURRENT_SCRIPT_NAME, "string_has_highlight_regex");
LUA_RETURN_INT(0);
}
n = lua_gettop (lua_current_interpreter);
if (n < 2)
{
WEECHAT_SCRIPT_MSG_WRONG_ARGS(LUA_CURRENT_SCRIPT_NAME, "string_has_highlight_regex");
LUA_RETURN_INT(0);
}
string = lua_tostring (lua_current_interpreter, -2);
regex = lua_tostring (lua_current_interpreter, -1);
value = weechat_string_has_highlight_regex (string, regex);
LUA_RETURN_INT(value);
}
/*
* weechat_lua_api_string_mask_to_regex: convert a mask (string with only
* "*" as wildcard) to a regex, paying
@@ -7562,6 +7601,7 @@ const struct luaL_reg weechat_lua_api_funcs[] = {
{ "ngettext", &weechat_lua_api_ngettext },
{ "string_match", &weechat_lua_api_string_match },
{ "string_has_highlight", &weechat_lua_api_string_has_highlight },
{ "string_has_highlight_regex", &weechat_lua_api_string_has_highlight_regex },
{ "string_mask_to_regex", &weechat_lua_api_string_mask_to_regex },
{ "string_remove_color", &weechat_lua_api_string_remove_color },
{ "string_is_command_char", &weechat_lua_api_string_is_command_char },
src/plugins/scripts/perl/weechat-perl-api.c
+34
View File
@@ -387,6 +387,39 @@ XS (XS_weechat_api_string_has_highlight)
PERL_RETURN_INT(value);
}
/*
* weechat::string_has_highlight_regex: return 1 if string contains a highlight
* (using regular expression)
* return 0 if no highlight is found in
* string
*/
XS (XS_weechat_api_string_has_highlight_regex)
{
int value;
dXSARGS;
/* make C compiler happy */
(void) cv;
if (!perl_current_script || !perl_current_script->name)
{
WEECHAT_SCRIPT_MSG_NOT_INIT(PERL_CURRENT_SCRIPT_NAME, "string_has_highlight_regex");
PERL_RETURN_INT(0);
}
if (items < 2)
{
WEECHAT_SCRIPT_MSG_WRONG_ARGS(PERL_CURRENT_SCRIPT_NAME, "string_has_highlight_regex");
PERL_RETURN_INT(0);
}
value = weechat_string_has_highlight_regex (SvPV (ST (0), PL_na), /* string */
SvPV (ST (1), PL_na)); /* regex */
PERL_RETURN_INT(value);
}
/*
* weechat::string_mask_to_regex: convert a mask (string with only "*" as
* wildcard) to a regex, paying attention to
@@ -6509,6 +6542,7 @@ weechat_perl_api_init (pTHX)
newXS ("weechat::ngettext", XS_weechat_api_ngettext, "weechat");
newXS ("weechat::string_match", XS_weechat_api_string_match, "weechat");
newXS ("weechat::string_has_highlight", XS_weechat_api_string_has_highlight, "weechat");
newXS ("weechat::string_has_highlight_regex", XS_weechat_api_string_has_highlight_regex, "weechat");
newXS ("weechat::string_mask_to_regex", XS_weechat_api_string_mask_to_regex, "weechat");
newXS ("weechat::string_remove_color", XS_weechat_api_string_remove_color, "weechat");
newXS ("weechat::string_is_command_char", XS_weechat_api_string_is_command_char, "weechat");
src/plugins/scripts/python/weechat-python-api.c
+38
View File
@@ -395,6 +395,43 @@ weechat_python_api_string_has_highlight (PyObject *self, PyObject *args)
PYTHON_RETURN_INT(value);
}
/*
* weechat_python_api_string_has_highlight_regex: return 1 if string contains a
* highlight (using regular
* expression)
* return 0 if no highlight is
* found in string
*/
static PyObject *
weechat_python_api_string_has_highlight_regex (PyObject *self, PyObject *args)
{
char *string, *regex;
int value;
/* make C compiler happy */
(void) self;
if (!python_current_script || !python_current_script->name)
{
WEECHAT_SCRIPT_MSG_NOT_INIT(PYTHON_CURRENT_SCRIPT_NAME, "string_has_highlight_regex");
PYTHON_RETURN_INT(0);
}
string = NULL;
regex = NULL;
if (!PyArg_ParseTuple (args, "ss", &string, &regex))
{
WEECHAT_SCRIPT_MSG_WRONG_ARGS(PYTHON_CURRENT_SCRIPT_NAME, "string_has_highlight_regex");
PYTHON_RETURN_INT(0);
}
value = weechat_string_has_highlight_regex (string, regex);
PYTHON_RETURN_INT(value);
}
/*
* weechat_python_api_string_mask_to_regex: convert a mask (string with only
* "*" as wildcard) to a regex, paying
@@ -6838,6 +6875,7 @@ PyMethodDef weechat_python_funcs[] =
{ "ngettext", &weechat_python_api_ngettext, METH_VARARGS, "" },
{ "string_match", &weechat_python_api_string_match, METH_VARARGS, "" },
{ "string_has_highlight", &weechat_python_api_string_has_highlight, METH_VARARGS, "" },
{ "string_has_highlight_regex", &weechat_python_api_string_has_highlight_regex, METH_VARARGS, "" },
{ "string_mask_to_regex", &weechat_python_api_string_mask_to_regex, METH_VARARGS, "" },
{ "string_remove_color", &weechat_python_api_string_remove_color, METH_VARARGS, "" },
{ "string_is_command_char", &weechat_python_api_string_is_command_char, METH_VARARGS, "" },
src/plugins/scripts/ruby/weechat-ruby-api.c
+42
View File
@@ -430,6 +430,47 @@ weechat_ruby_api_string_has_highlight (VALUE class, VALUE string,
RUBY_RETURN_INT(value);
}
/*
* weechat_ruby_api_string_has_highlight_regex: return 1 if string contains a
* highlight (using regular
* expression)
* return 0 if no highlight is
* found in string
*/
static VALUE
weechat_ruby_api_string_has_highlight_regex (VALUE class, VALUE string,
VALUE regex)
{
char *c_string, *c_regex;
int value;
/* make C compiler happy */
(void) class;
if (!ruby_current_script || !ruby_current_script->name)
{
WEECHAT_SCRIPT_MSG_NOT_INIT(RUBY_CURRENT_SCRIPT_NAME, "string_has_highlight_regex");
RUBY_RETURN_INT(0);
}
if (NIL_P (string) || NIL_P (regex))
{
WEECHAT_SCRIPT_MSG_WRONG_ARGS(RUBY_CURRENT_SCRIPT_NAME, "string_has_highlight_regex");
RUBY_RETURN_INT(0);
}
Check_Type (string, T_STRING);
Check_Type (regex, T_STRING);
c_string = StringValuePtr (string);
c_regex = StringValuePtr (regex);
value = weechat_string_has_highlight_regex (c_string, c_regex);
RUBY_RETURN_INT(value);
}
/*
* weechat_ruby_api_string_mask_to_regex: convert a mask (string with only
* "*" as wildcard) to a regex, paying
@@ -7494,6 +7535,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat)
rb_define_module_function (ruby_mWeechat, "ngettext", &weechat_ruby_api_ngettext, 3);
rb_define_module_function (ruby_mWeechat, "string_match", &weechat_ruby_api_string_match, 3);
rb_define_module_function (ruby_mWeechat, "string_has_highlight", &weechat_ruby_api_string_has_highlight, 2);
rb_define_module_function (ruby_mWeechat, "string_has_highlight_regex", &weechat_ruby_api_string_has_highlight_regex, 2);
rb_define_module_function (ruby_mWeechat, "string_mask_to_regex", &weechat_ruby_api_string_mask_to_regex, 1);
rb_define_module_function (ruby_mWeechat, "string_remove_color", &weechat_ruby_api_string_remove_color, 2);
rb_define_module_function (ruby_mWeechat, "string_is_command_char", &weechat_ruby_api_string_is_command_char, 1);
src/plugins/scripts/tcl/weechat-tcl-api.c
+42
View File
@@ -530,6 +530,46 @@ weechat_tcl_api_string_has_highlight (ClientData clientData,
TCL_RETURN_INT(result);
}
/*
* weechat_tcl_api_string_has_highlight_regex: return 1 if string contains a
* highlight (using a regular
* expression)
* return 0 if no highlight is
* found in string
*/
static int
weechat_tcl_api_string_has_highlight_regex (ClientData clientData,
Tcl_Interp *interp,
int objc, Tcl_Obj *CONST objv[])
{
Tcl_Obj* objp;
char *string, *regex;
int result, i;
/* make C compiler happy */
(void) clientData;
if (!tcl_current_script || !tcl_current_script->name)
{
WEECHAT_SCRIPT_MSG_NOT_INIT(TCL_CURRENT_SCRIPT_NAME, "string_has_highlight_regex");
TCL_RETURN_INT(0);
}
if (objc < 3)
{
WEECHAT_SCRIPT_MSG_WRONG_ARGS(TCL_CURRENT_SCRIPT_NAME, "string_has_highlight_regex");
TCL_RETURN_INT(0);
}
string = Tcl_GetStringFromObj (objv[1], &i);
regex = Tcl_GetStringFromObj (objv[2], &i);
result = weechat_string_has_highlight_regex (string, regex);
TCL_RETURN_INT(result);
}
/*
* weechat_tcl_api_string_mask_to_regex: convert a mask (string with only
* "*" as wildcard) to a regex, paying
@@ -7343,6 +7383,8 @@ void weechat_tcl_api_init (Tcl_Interp *interp)
weechat_tcl_api_string_match, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
Tcl_CreateObjCommand (interp, "weechat::string_has_highlight",
weechat_tcl_api_string_has_highlight, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
Tcl_CreateObjCommand (interp, "weechat::string_has_highlight_regex",
weechat_tcl_api_string_has_highlight_regex, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
Tcl_CreateObjCommand (interp, "weechat::string_mask_to_regex",
weechat_tcl_api_string_mask_to_regex, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
Tcl_CreateObjCommand (interp, "weechat::string_remove_color",
src/plugins/weechat-plugin.h
+4 -1
View File
@@ -45,7 +45,7 @@ struct timeval;
*/
/* API version (used to check that plugin has same API and can be loaded) */
#define WEECHAT_PLUGIN_API_VERSION "20101110-01"
#define WEECHAT_PLUGIN_API_VERSION "20101125-01"
/* macros for defining plugin infos */
#define WEECHAT_PLUGIN_NAME(__name) \
@@ -180,6 +180,7 @@ struct t_weechat_plugin
const char *chars);
int (*string_has_highlight) (const char *string,
const char *highlight_words);
int (*string_has_highlight_regex) (const char *string, const char *regex);
char *(*string_mask_to_regex) (const char *mask);
char **(*string_split) (const char *string, const char *separators,
int keep_eol, int num_items_max, int *num_items);
@@ -800,6 +801,8 @@ extern int weechat_plugin_end (struct t_weechat_plugin *plugin);
weechat_plugin->string_strip(__string, __left, __right, __chars)
#define weechat_string_has_highlight(__string, __highlight_words) \
weechat_plugin->string_has_highlight(__string, __highlight_words)
#define weechat_string_has_highlight_regex(__string, __regex) \
weechat_plugin->string_has_highlight_regex(__string, __regex)
#define weechat_string_mask_to_regex(__mask) \
weechat_plugin->string_mask_to_regex(__mask)
#define weechat_string_split(__string, __separator, __eol, __max, \