mirror of
https://github.com/weechat/weechat.git
synced 2026-06-26 04:46:37 +02:00
Added "toggle" value for /set on boolean options, fixed refresh bugs, added option type for infolist "options"
This commit is contained in:
@@ -3013,12 +3013,12 @@ weechat_lua_api_unhook_all (lua_State *L)
|
||||
}
|
||||
|
||||
/*
|
||||
* weechat_lua_api_input_data_cb: callback for input data in a buffer
|
||||
* weechat_lua_api_buffer_input_data_cb: callback for input data in a buffer
|
||||
*/
|
||||
|
||||
int
|
||||
weechat_lua_api_input_data_cb (void *data, struct t_gui_buffer *buffer,
|
||||
char *input_data)
|
||||
weechat_lua_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
|
||||
char *input_data)
|
||||
{
|
||||
struct t_script_callback *script_callback;
|
||||
char *lua_argv[3];
|
||||
@@ -3049,11 +3049,11 @@ weechat_lua_api_input_data_cb (void *data, struct t_gui_buffer *buffer,
|
||||
}
|
||||
|
||||
/*
|
||||
* weechat_lua_api_close_cb: callback for buffer closed
|
||||
* weechat_lua_api_buffer_close_cb: callback for buffer closed
|
||||
*/
|
||||
|
||||
int
|
||||
weechat_lua_api_close_cb (void *data, struct t_gui_buffer *buffer)
|
||||
weechat_lua_api_buffer_close_cb (void *data, struct t_gui_buffer *buffer)
|
||||
{
|
||||
struct t_script_callback *script_callback;
|
||||
char *lua_argv[2];
|
||||
@@ -3124,9 +3124,9 @@ weechat_lua_api_buffer_new (lua_State *L)
|
||||
lua_current_script,
|
||||
(char *)category,
|
||||
(char *)name,
|
||||
&weechat_lua_api_input_data_cb,
|
||||
&weechat_lua_api_buffer_input_data_cb,
|
||||
(char *)function_input,
|
||||
&weechat_lua_api_close_cb,
|
||||
&weechat_lua_api_buffer_close_cb,
|
||||
(char *)function_close));
|
||||
|
||||
LUA_RETURN_STRING_FREE(result);
|
||||
@@ -4121,7 +4121,7 @@ weechat_lua_api_info_get (lua_State *L)
|
||||
static int
|
||||
weechat_lua_api_infolist_get (lua_State *L)
|
||||
{
|
||||
const char *name, *pointer;
|
||||
const char *name, *pointer, *arguments;
|
||||
char *value;
|
||||
int n;
|
||||
|
||||
@@ -4136,20 +4136,23 @@ weechat_lua_api_infolist_get (lua_State *L)
|
||||
|
||||
name = NULL;
|
||||
pointer = NULL;
|
||||
arguments = NULL;
|
||||
|
||||
n = lua_gettop (lua_current_interpreter);
|
||||
|
||||
if (n < 2)
|
||||
if (n < 3)
|
||||
{
|
||||
WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("infolist_get");
|
||||
LUA_RETURN_EMPTY;
|
||||
}
|
||||
|
||||
name = lua_tostring (lua_current_interpreter, -2);
|
||||
pointer = lua_tostring (lua_current_interpreter, -1);
|
||||
name = lua_tostring (lua_current_interpreter, -3);
|
||||
pointer = lua_tostring (lua_current_interpreter, -2);
|
||||
arguments = lua_tostring (lua_current_interpreter, -1);
|
||||
|
||||
value = script_ptr2str (weechat_infolist_get ((char *)name,
|
||||
script_str2ptr ((char *)pointer)));
|
||||
script_str2ptr ((char *)pointer),
|
||||
(char *)arguments));
|
||||
|
||||
LUA_RETURN_STRING_FREE(value);
|
||||
}
|
||||
|
||||
@@ -2517,12 +2517,12 @@ static XS (XS_weechat_unhook_all)
|
||||
}
|
||||
|
||||
/*
|
||||
* weechat_perl_api_input_data_cb: callback for input data in a buffer
|
||||
* weechat_perl_api_buffer_input_data_cb: callback for input data in a buffer
|
||||
*/
|
||||
|
||||
int
|
||||
weechat_perl_api_input_data_cb (void *data, struct t_gui_buffer *buffer,
|
||||
char *input_data)
|
||||
weechat_perl_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
|
||||
char *input_data)
|
||||
{
|
||||
struct t_script_callback *script_callback;
|
||||
char *perl_argv[3];
|
||||
@@ -2552,11 +2552,11 @@ weechat_perl_api_input_data_cb (void *data, struct t_gui_buffer *buffer,
|
||||
}
|
||||
|
||||
/*
|
||||
* weechat_perl_api_close_cb: callback for buffer closed
|
||||
* weechat_perl_api_buffer_close_cb: callback for buffer closed
|
||||
*/
|
||||
|
||||
int
|
||||
weechat_perl_api_close_cb (void *data, struct t_gui_buffer *buffer)
|
||||
weechat_perl_api_buffer_close_cb (void *data, struct t_gui_buffer *buffer)
|
||||
{
|
||||
struct t_script_callback *script_callback;
|
||||
char *perl_argv[2];
|
||||
@@ -2616,9 +2616,9 @@ static XS (XS_weechat_buffer_new)
|
||||
perl_current_script,
|
||||
category,
|
||||
name,
|
||||
&weechat_perl_api_input_data_cb,
|
||||
&weechat_perl_api_buffer_input_data_cb,
|
||||
function_input,
|
||||
&weechat_perl_api_close_cb,
|
||||
&weechat_perl_api_buffer_close_cb,
|
||||
function_close));
|
||||
|
||||
PERL_RETURN_STRING_FREE(result);
|
||||
@@ -3410,7 +3410,7 @@ static XS (XS_weechat_info_get)
|
||||
|
||||
static XS (XS_weechat_infolist_get)
|
||||
{
|
||||
char *value, *name, *pointer;
|
||||
char *value, *name, *pointer, *arguments;
|
||||
dXSARGS;
|
||||
|
||||
/* make C compiler happy */
|
||||
@@ -3422,7 +3422,7 @@ static XS (XS_weechat_infolist_get)
|
||||
PERL_RETURN_EMPTY;
|
||||
}
|
||||
|
||||
if (items < 2)
|
||||
if (items < 3)
|
||||
{
|
||||
WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("infolist_get");
|
||||
PERL_RETURN_EMPTY;
|
||||
@@ -3430,7 +3430,10 @@ static XS (XS_weechat_infolist_get)
|
||||
|
||||
name = SvPV (ST (0), PL_na);
|
||||
pointer = SvPV (ST (1), PL_na);
|
||||
value = script_ptr2str (weechat_infolist_get (name, script_str2ptr (pointer)));
|
||||
arguments = SvPV (ST (2), PL_na);
|
||||
value = script_ptr2str (weechat_infolist_get (name,
|
||||
script_str2ptr (pointer),
|
||||
arguments));
|
||||
|
||||
PERL_RETURN_STRING_FREE(value);
|
||||
}
|
||||
|
||||
@@ -2673,12 +2673,12 @@ weechat_python_api_unhook_all (PyObject *self, PyObject *args)
|
||||
}
|
||||
|
||||
/*
|
||||
* weechat_python_api_input_data_cb: callback for input data in a buffer
|
||||
* weechat_python_api_buffer_input_data_cb: callback for input data in a buffer
|
||||
*/
|
||||
|
||||
int
|
||||
weechat_python_api_input_data_cb (void *data, struct t_gui_buffer *buffer,
|
||||
char *input_data)
|
||||
weechat_python_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
|
||||
char *input_data)
|
||||
{
|
||||
struct t_script_callback *script_callback;
|
||||
char *python_argv[3];
|
||||
@@ -2708,11 +2708,11 @@ weechat_python_api_input_data_cb (void *data, struct t_gui_buffer *buffer,
|
||||
}
|
||||
|
||||
/*
|
||||
* weechat_python_api_close_cb: callback for buffer closed
|
||||
* weechat_python_api_buffer_close_cb: callback for buffer closed
|
||||
*/
|
||||
|
||||
int
|
||||
weechat_python_api_close_cb (void *data, struct t_gui_buffer *buffer)
|
||||
weechat_python_api_buffer_close_cb (void *data, struct t_gui_buffer *buffer)
|
||||
{
|
||||
struct t_script_callback *script_callback;
|
||||
char *python_argv[2];
|
||||
@@ -2775,9 +2775,9 @@ weechat_python_api_buffer_new (PyObject *self, PyObject *args)
|
||||
python_current_script,
|
||||
category,
|
||||
name,
|
||||
&weechat_python_api_input_data_cb,
|
||||
&weechat_python_api_buffer_input_data_cb,
|
||||
function_input,
|
||||
&weechat_python_api_close_cb,
|
||||
&weechat_python_api_buffer_close_cb,
|
||||
function_close));
|
||||
|
||||
PYTHON_RETURN_STRING_FREE(result);
|
||||
@@ -3632,7 +3632,7 @@ weechat_python_api_info_get (PyObject *self, PyObject *args)
|
||||
static PyObject *
|
||||
weechat_python_api_infolist_get (PyObject *self, PyObject *args)
|
||||
{
|
||||
char *name, *pointer, *value;
|
||||
char *name, *pointer, *arguments, *value;
|
||||
PyObject *object;
|
||||
|
||||
/* make C compiler happy */
|
||||
@@ -3646,15 +3646,17 @@ weechat_python_api_infolist_get (PyObject *self, PyObject *args)
|
||||
|
||||
name = NULL;
|
||||
pointer = NULL;
|
||||
arguments = NULL;
|
||||
|
||||
if (!PyArg_ParseTuple (args, "ss", &name, &pointer))
|
||||
if (!PyArg_ParseTuple (args, "sss", &name, &pointer, &arguments))
|
||||
{
|
||||
WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("infolist_get");
|
||||
PYTHON_RETURN_EMPTY;
|
||||
}
|
||||
|
||||
value = script_ptr2str (weechat_infolist_get (name,
|
||||
script_str2ptr (pointer)));
|
||||
script_str2ptr (pointer),
|
||||
arguments));
|
||||
|
||||
PYTHON_RETURN_STRING_FREE(value);
|
||||
}
|
||||
|
||||
@@ -3078,12 +3078,12 @@ weechat_ruby_api_unhook_all (VALUE class)
|
||||
}
|
||||
|
||||
/*
|
||||
* weechat_ruby_api_input_data_cb: callback for input data in a buffer
|
||||
* weechat_ruby_api_buffer_input_data_cb: callback for input data in a buffer
|
||||
*/
|
||||
|
||||
int
|
||||
weechat_ruby_api_input_data_cb (void *data, struct t_gui_buffer *buffer,
|
||||
char *input_data)
|
||||
weechat_ruby_api_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer,
|
||||
char *input_data)
|
||||
{
|
||||
struct t_script_callback *script_callback;
|
||||
char *ruby_argv[3];
|
||||
@@ -3114,11 +3114,11 @@ weechat_ruby_api_input_data_cb (void *data, struct t_gui_buffer *buffer,
|
||||
}
|
||||
|
||||
/*
|
||||
* weechat_ruby_api_close_cb: callback for closed buffer
|
||||
* weechat_ruby_api_buffer_close_cb: callback for closed buffer
|
||||
*/
|
||||
|
||||
int
|
||||
weechat_ruby_api_close_cb (void *data, struct t_gui_buffer *buffer)
|
||||
weechat_ruby_api_buffer_close_cb (void *data, struct t_gui_buffer *buffer)
|
||||
{
|
||||
struct t_script_callback *script_callback;
|
||||
char *ruby_argv[2];
|
||||
@@ -3193,9 +3193,9 @@ weechat_ruby_api_buffer_new (VALUE class, VALUE category, VALUE name,
|
||||
ruby_current_script,
|
||||
c_category,
|
||||
c_name,
|
||||
&weechat_ruby_api_input_data_cb,
|
||||
&weechat_ruby_api_buffer_input_data_cb,
|
||||
c_function_input,
|
||||
&weechat_ruby_api_close_cb,
|
||||
&weechat_ruby_api_buffer_close_cb,
|
||||
c_function_close));
|
||||
|
||||
RUBY_RETURN_STRING_FREE(result);
|
||||
@@ -4177,9 +4177,10 @@ weechat_ruby_api_info_get (VALUE class, VALUE info)
|
||||
*/
|
||||
|
||||
static VALUE
|
||||
weechat_ruby_api_infolist_get (VALUE class, VALUE name, VALUE pointer)
|
||||
weechat_ruby_api_infolist_get (VALUE class, VALUE name, VALUE pointer,
|
||||
VALUE arguments)
|
||||
{
|
||||
char *c_name, *c_pointer, *value;
|
||||
char *c_name, *c_pointer, *c_arguments, *value;
|
||||
VALUE return_value;
|
||||
|
||||
/* make C compiler happy */
|
||||
@@ -4199,11 +4200,15 @@ weechat_ruby_api_infolist_get (VALUE class, VALUE name, VALUE pointer)
|
||||
|
||||
Check_Type (name, T_STRING);
|
||||
Check_Type (pointer, T_STRING);
|
||||
Check_Type (arguments, T_STRING);
|
||||
|
||||
c_name = STR2CSTR (name);
|
||||
c_pointer = STR2CSTR (pointer);
|
||||
c_arguments = STR2CSTR (arguments);
|
||||
|
||||
value = script_ptr2str (weechat_infolist_get (c_name, script_str2ptr (c_pointer)));
|
||||
value = script_ptr2str (weechat_infolist_get (c_name,
|
||||
script_str2ptr (c_pointer),
|
||||
c_arguments));
|
||||
|
||||
RUBY_RETURN_STRING_FREE(value);
|
||||
}
|
||||
@@ -4590,7 +4595,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat)
|
||||
rb_define_module_function (ruby_mWeechat, "bar_remove", &weechat_ruby_api_bar_remove, 1);
|
||||
rb_define_module_function (ruby_mWeechat, "command", &weechat_ruby_api_command, 2);
|
||||
rb_define_module_function (ruby_mWeechat, "info_get", &weechat_ruby_api_info_get, 1);
|
||||
rb_define_module_function (ruby_mWeechat, "infolist_get", &weechat_ruby_api_infolist_get, 2);
|
||||
rb_define_module_function (ruby_mWeechat, "infolist_get", &weechat_ruby_api_infolist_get, 3);
|
||||
rb_define_module_function (ruby_mWeechat, "infolist_next", &weechat_ruby_api_infolist_next, 1);
|
||||
rb_define_module_function (ruby_mWeechat, "infolist_prev", &weechat_ruby_api_infolist_prev, 1);
|
||||
rb_define_module_function (ruby_mWeechat, "infolist_fields", &weechat_ruby_api_infolist_fields, 1);
|
||||
|
||||
Reference in New Issue
Block a user