diff options
Diffstat (limited to 'src/plugins/scripts')
-rw-r--r-- | src/plugins/scripts/lua/weechat-lua-api.c | 422 | ||||
-rw-r--r-- | src/plugins/scripts/perl/weechat-perl-api.c | 405 | ||||
-rw-r--r-- | src/plugins/scripts/python/weechat-python-api.c | 396 | ||||
-rw-r--r-- | src/plugins/scripts/ruby/weechat-ruby-api.c | 435 | ||||
-rw-r--r-- | src/plugins/scripts/tcl/weechat-tcl-api.c | 670 |
5 files changed, 2147 insertions, 181 deletions
diff --git a/src/plugins/scripts/lua/weechat-lua-api.c b/src/plugins/scripts/lua/weechat-lua-api.c index 50a505b39..9bb680dc6 100644 --- a/src/plugins/scripts/lua/weechat-lua-api.c +++ b/src/plugins/scripts/lua/weechat-lua-api.c @@ -40,21 +40,24 @@ #define LUA_RETURN_OK return 1 #define LUA_RETURN_ERROR return 0 -#define LUA_RETURN_EMPTY \ - lua_pushstring (lua_current_interpreter, ""); \ +#define LUA_RETURN_EMPTY \ + lua_pushstring (lua_current_interpreter, ""); \ return 0 -#define LUA_RETURN_STRING(__string) \ - lua_pushstring (lua_current_interpreter, \ - (__string) ? __string : ""); \ +#define LUA_RETURN_STRING(__string) \ + lua_pushstring (lua_current_interpreter, \ + (__string) ? __string : ""); \ return 1; -#define LUA_RETURN_STRING_FREE(__string) \ - lua_pushstring (lua_current_interpreter, \ - (__string) ? __string : ""); \ - if (__string) \ - free (__string); \ +#define LUA_RETURN_STRING_FREE(__string) \ + lua_pushstring (lua_current_interpreter, \ + (__string) ? __string : ""); \ + if (__string) \ + free (__string); \ return 1; -#define LUA_RETURN_INT(__int) \ - lua_pushnumber (lua_current_interpreter, __int); \ +#define LUA_RETURN_INT(__int) \ + lua_pushnumber (lua_current_interpreter, __int); \ + return 1; +#define LUA_RETURN_LONG(__long) \ + lua_pushnumber (lua_current_interpreter, __long); \ return 1; @@ -7187,7 +7190,390 @@ weechat_lua_api_infolist_free (lua_State *L) } /* - * weechat_lua_api_config_new: create a new configuration file + * weechat_lua_api_hdata_get: get hdata + */ + +static int +weechat_lua_api_hdata_get (lua_State *L) +{ + const char *name; + char *result; + int n; + + /* make C compiler happy */ + (void) L; + + if (!lua_current_script || !lua_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(LUA_CURRENT_SCRIPT_NAME, "hdata_get"); + LUA_RETURN_EMPTY; + } + + n = lua_gettop (lua_current_interpreter); + + if (n < 1) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(LUA_CURRENT_SCRIPT_NAME, "hdata_get"); + LUA_RETURN_EMPTY; + } + + name = lua_tostring (lua_current_interpreter, -1); + + result = script_ptr2str (weechat_hdata_get (name)); + + LUA_RETURN_STRING_FREE(result); +} + +/* + * weechat_lua_api_hdata_get_var_type_string: get type of variable as string in + * hdata + */ + +static int +weechat_lua_api_hdata_get_var_type_string (lua_State *L) +{ + const char *hdata, *name, *result; + int n; + + /* make C compiler happy */ + (void) L; + + if (!lua_current_script || !lua_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(LUA_CURRENT_SCRIPT_NAME, "hdata_get_var_type_string"); + LUA_RETURN_EMPTY; + } + + n = lua_gettop (lua_current_interpreter); + + if (n < 2) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(LUA_CURRENT_SCRIPT_NAME, "hdata_get_var_type_string"); + LUA_RETURN_EMPTY; + } + + hdata = lua_tostring (lua_current_interpreter, -2); + name = lua_tostring (lua_current_interpreter, -1); + + result = weechat_hdata_get_var_type_string (script_str2ptr (hdata), name); + + LUA_RETURN_STRING(result); +} + +/* + * weechat_lua_api_hdata_get_list: get list pointer in hdata + */ + +static int +weechat_lua_api_hdata_get_list (lua_State *L) +{ + const char *hdata, *name; + char *result; + int n; + + /* make C compiler happy */ + (void) L; + + if (!lua_current_script || !lua_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(LUA_CURRENT_SCRIPT_NAME, "hdata_get_list"); + LUA_RETURN_EMPTY; + } + + n = lua_gettop (lua_current_interpreter); + + if (n < 2) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(LUA_CURRENT_SCRIPT_NAME, "hdata_get_list"); + LUA_RETURN_EMPTY; + } + + hdata = lua_tostring (lua_current_interpreter, -2); + name = lua_tostring (lua_current_interpreter, -1); + + result = script_ptr2str (weechat_hdata_get_list (script_str2ptr (hdata), + name)); + + LUA_RETURN_STRING_FREE(result); +} + +/* + * weechat_lua_api_hdata_move: move pointer to another element in list + */ + +static int +weechat_lua_api_hdata_move (lua_State *L) +{ + const char *hdata, *pointer; + char *result; + int count, n; + + /* make C compiler happy */ + (void) L; + + if (!lua_current_script || !lua_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(LUA_CURRENT_SCRIPT_NAME, "hdata_move"); + LUA_RETURN_EMPTY; + } + + n = lua_gettop (lua_current_interpreter); + + if (n < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(LUA_CURRENT_SCRIPT_NAME, "hdata_move"); + LUA_RETURN_EMPTY; + } + + hdata = lua_tostring (lua_current_interpreter, -3); + pointer = lua_tostring (lua_current_interpreter, -2); + count = lua_tonumber (lua_current_interpreter, -1); + + result = script_ptr2str (weechat_hdata_move (script_str2ptr (hdata), + script_str2ptr (pointer), + count)); + + LUA_RETURN_STRING_FREE(result); +} + +/* + * weechat_lua_api_hdata_integer: get integer value of a variable in structure + * using hdata + */ + +static int +weechat_lua_api_hdata_integer (lua_State *L) +{ + const char *hdata, *pointer, *name; + 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, "hdata_integer"); + LUA_RETURN_INT(0); + } + + n = lua_gettop (lua_current_interpreter); + + if (n < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(LUA_CURRENT_SCRIPT_NAME, "hdata_integer"); + LUA_RETURN_INT(0); + } + + hdata = lua_tostring (lua_current_interpreter, -3); + pointer = lua_tostring (lua_current_interpreter, -2); + name = lua_tostring (lua_current_interpreter, -1); + + value = weechat_hdata_integer (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + + LUA_RETURN_INT(value); +} + +/* + * weechat_lua_api_hdata_long: get long value of a variable in structure using + * hdata + */ + +static int +weechat_lua_api_hdata_long (lua_State *L) +{ + const char *hdata, *pointer, *name; + long value; + int n; + + /* make C compiler happy */ + (void) L; + + if (!lua_current_script || !lua_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(LUA_CURRENT_SCRIPT_NAME, "hdata_long"); + LUA_RETURN_LONG(0); + } + + n = lua_gettop (lua_current_interpreter); + + if (n < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(LUA_CURRENT_SCRIPT_NAME, "hdata_long"); + LUA_RETURN_LONG(0); + } + + hdata = lua_tostring (lua_current_interpreter, -3); + pointer = lua_tostring (lua_current_interpreter, -2); + name = lua_tostring (lua_current_interpreter, -1); + + value = weechat_hdata_long (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + + LUA_RETURN_LONG(value); +} + +/* + * weechat_lua_api_hdata_string: get string value of a variable in structure + * using hdata + */ + +static int +weechat_lua_api_hdata_string (lua_State *L) +{ + const char *hdata, *pointer, *name, *result; + int n; + + /* make C compiler happy */ + (void) L; + + if (!lua_current_script || !lua_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(LUA_CURRENT_SCRIPT_NAME, "hdata_string"); + LUA_RETURN_EMPTY; + } + + n = lua_gettop (lua_current_interpreter); + + if (n < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(LUA_CURRENT_SCRIPT_NAME, "hdata_string"); + LUA_RETURN_EMPTY; + } + + hdata = lua_tostring (lua_current_interpreter, -3); + pointer = lua_tostring (lua_current_interpreter, -2); + name = lua_tostring (lua_current_interpreter, -1); + + result = weechat_hdata_string (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + + LUA_RETURN_STRING(result); +} + +/* + * weechat_lua_api_hdata_pointer: get pointer value of a variable in structure + * using hdata + */ + +static int +weechat_lua_api_hdata_pointer (lua_State *L) +{ + const char *hdata, *pointer, *name; + char *result; + int n; + + /* make C compiler happy */ + (void) L; + + if (!lua_current_script || !lua_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(LUA_CURRENT_SCRIPT_NAME, "hdata_pointer"); + LUA_RETURN_EMPTY; + } + + n = lua_gettop (lua_current_interpreter); + + if (n < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(LUA_CURRENT_SCRIPT_NAME, "hdata_pointer"); + LUA_RETURN_EMPTY; + } + + hdata = lua_tostring (lua_current_interpreter, -3); + pointer = lua_tostring (lua_current_interpreter, -2); + name = lua_tostring (lua_current_interpreter, -1); + + result = script_ptr2str (weechat_hdata_pointer (script_str2ptr (hdata), + script_str2ptr (pointer), + name)); + + LUA_RETURN_STRING_FREE(result); +} + +/* + * weechat_lua_api_hdata_time: get time value of a variable in structure using + * hdata + */ + +static int +weechat_lua_api_hdata_time (lua_State *L) +{ + const char *hdata, *pointer, *name; + time_t time; + char timebuffer[64], *result; + int n; + + /* make C compiler happy */ + (void) L; + + if (!lua_current_script || !lua_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(LUA_CURRENT_SCRIPT_NAME, "hdata_time"); + LUA_RETURN_EMPTY; + } + + n = lua_gettop (lua_current_interpreter); + + if (n < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(LUA_CURRENT_SCRIPT_NAME, "hdata_time"); + LUA_RETURN_EMPTY; + } + + hdata = lua_tostring (lua_current_interpreter, -3); + pointer = lua_tostring (lua_current_interpreter, -2); + name = lua_tostring (lua_current_interpreter, -1); + + time = weechat_hdata_time (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + strftime (timebuffer, sizeof (timebuffer), "%F %T", localtime (&time)); + result = strdup (timebuffer); + + LUA_RETURN_STRING_FREE(result); +} + +/* + * weechat_lua_api_hdata_get_string: get hdata property as string + */ + +static int +weechat_lua_api_hdata_get_string (lua_State *L) +{ + const char *hdata, *property, *result; + int n; + + /* make C compiler happy */ + (void) L; + + if (!lua_current_script || !lua_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(LUA_CURRENT_SCRIPT_NAME, "hdata_get_string"); + LUA_RETURN_EMPTY; + } + + n = lua_gettop (lua_current_interpreter); + + if (n < 2) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(LUA_CURRENT_SCRIPT_NAME, "hdata_get_string"); + LUA_RETURN_EMPTY; + } + + hdata = lua_tostring (lua_current_interpreter, -2); + property = lua_tostring (lua_current_interpreter, -1); + + result = weechat_hdata_get_string (script_str2ptr (hdata), property); + + LUA_RETURN_STRING(result); +} + +/* + * weechat_lua_api_upgrade_new: create an upgrade file */ static int @@ -7931,6 +8317,16 @@ const struct luaL_reg weechat_lua_api_funcs[] = { { "infolist_pointer", &weechat_lua_api_infolist_pointer }, { "infolist_time", &weechat_lua_api_infolist_time }, { "infolist_free", &weechat_lua_api_infolist_free }, + { "hdata_get", &weechat_lua_api_hdata_get }, + { "hdata_get_var_type_string", &weechat_lua_api_hdata_get_var_type_string }, + { "hdata_get_list", &weechat_lua_api_hdata_get_list }, + { "hdata_move", &weechat_lua_api_hdata_move }, + { "hdata_integer", &weechat_lua_api_hdata_integer }, + { "hdata_long", &weechat_lua_api_hdata_long }, + { "hdata_string", &weechat_lua_api_hdata_string }, + { "hdata_pointer", &weechat_lua_api_hdata_pointer }, + { "hdata_time", &weechat_lua_api_hdata_time }, + { "hdata_get_string", &weechat_lua_api_hdata_get_string }, { "upgrade_new", &weechat_lua_api_upgrade_new }, { "upgrade_write_object", &weechat_lua_api_upgrade_write_object }, { "upgrade_read", &weechat_lua_api_upgrade_read }, diff --git a/src/plugins/scripts/perl/weechat-perl-api.c b/src/plugins/scripts/perl/weechat-perl-api.c index 3847d945a..30b82d5b7 100644 --- a/src/plugins/scripts/perl/weechat-perl-api.c +++ b/src/plugins/scripts/perl/weechat-perl-api.c @@ -39,29 +39,32 @@ #define PERL_RETURN_OK XSRETURN_YES #define PERL_RETURN_ERROR XSRETURN_NO #define PERL_RETURN_EMPTY XSRETURN_EMPTY -#define PERL_RETURN_STRING(__string) \ - if (__string) \ - { \ - XST_mPV (0, __string); \ - XSRETURN (1); \ - } \ - XST_mPV (0, ""); \ +#define PERL_RETURN_STRING(__string) \ + if (__string) \ + { \ + XST_mPV (0, __string); \ + XSRETURN (1); \ + } \ + XST_mPV (0, ""); \ XSRETURN (1) -#define PERL_RETURN_STRING_FREE(__string) \ - if (__string) \ - { \ - XST_mPV (0, __string); \ - free (__string); \ - XSRETURN (1); \ - } \ - XST_mPV (0, ""); \ +#define PERL_RETURN_STRING_FREE(__string) \ + if (__string) \ + { \ + XST_mPV (0, __string); \ + free (__string); \ + XSRETURN (1); \ + } \ + XST_mPV (0, ""); \ XSRETURN (1) -#define PERL_RETURN_INT(__int) \ - XST_mIV (0, __int); \ +#define PERL_RETURN_INT(__int) \ + XST_mIV (0, __int); \ XSRETURN (1); -#define PERL_RETURN_OBJ(__obj) \ - ST (0) = newRV_inc((SV *)__obj); \ - if (SvREFCNT(ST(0))) sv_2mortal(ST(0)); \ +#define PERL_RETURN_LONG(__long) \ + XST_mIV (0, __long); \ + XSRETURN (1); +#define PERL_RETURN_OBJ(__obj) \ + ST (0) = newRV_inc((SV *)__obj); \ + if (SvREFCNT(ST(0))) sv_2mortal(ST(0)); \ XSRETURN (1); @@ -6502,6 +6505,358 @@ XS (XS_weechat_api_infolist_free) } /* + * weechat::hdata_get: get hdata + */ + +XS (XS_weechat_api_hdata_get) +{ + char *result, *name; + dXSARGS; + + /* make C compiler happy */ + (void) cv; + + if (!perl_current_script || !perl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PERL_CURRENT_SCRIPT_NAME, "hdata_get"); + PERL_RETURN_EMPTY; + } + + if (items < 1) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PERL_CURRENT_SCRIPT_NAME, "hdata_get"); + PERL_RETURN_EMPTY; + } + + name = SvPV (ST (0), PL_na); + + result = script_ptr2str (weechat_hdata_get (name)); + + PERL_RETURN_STRING_FREE(result); +} + +/* + * weechat::hdata_get_var_type_string: get type of variable as string in hdata + */ + +XS (XS_weechat_api_hdata_get_var_type_string) +{ + const char *result; + char *hdata, *name; + dXSARGS; + + /* make C compiler happy */ + (void) cv; + + if (!perl_current_script || !perl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PERL_CURRENT_SCRIPT_NAME, "hdata_get_var_type_string"); + PERL_RETURN_EMPTY; + } + + if (items < 2) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PERL_CURRENT_SCRIPT_NAME, "hdata_get_var_type_string"); + PERL_RETURN_EMPTY; + } + + hdata = SvPV (ST (0), PL_na); + name = SvPV (ST (1), PL_na); + + result = weechat_hdata_get_var_type_string (script_str2ptr (hdata), name); + + PERL_RETURN_STRING(result); +} + +/* + * weechat::hdata_get_list: get list pointer in hdata + */ + +XS (XS_weechat_api_hdata_get_list) +{ + char *hdata, *name; + char *result; + dXSARGS; + + /* make C compiler happy */ + (void) cv; + + if (!perl_current_script || !perl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PERL_CURRENT_SCRIPT_NAME, "hdata_get_list"); + PERL_RETURN_EMPTY; + } + + if (items < 2) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PERL_CURRENT_SCRIPT_NAME, "hdata_get_list"); + PERL_RETURN_EMPTY; + } + + hdata = SvPV (ST (0), PL_na); + name = SvPV (ST (1), PL_na); + + result = script_ptr2str (weechat_hdata_get_list (script_str2ptr (hdata), + name)); + + PERL_RETURN_STRING_FREE(result); +} + +/* + * weechat::hdata_move: move pointer to another element in list + */ + +XS (XS_weechat_api_hdata_move) +{ + char *result, *hdata, *pointer; + int count; + dXSARGS; + + /* make C compiler happy */ + (void) cv; + + if (!perl_current_script || !perl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PERL_CURRENT_SCRIPT_NAME, "hdata_move"); + PERL_RETURN_EMPTY; + } + + if (items < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PERL_CURRENT_SCRIPT_NAME, "hdata_move"); + PERL_RETURN_EMPTY; + } + + hdata = SvPV (ST (0), PL_na); + pointer = SvPV (ST (1), PL_na); + count = SvIV(ST (2)); + + result = script_ptr2str (weechat_hdata_move (script_str2ptr (hdata), + script_str2ptr (pointer), + count)); + + PERL_RETURN_STRING_FREE(result); +} + +/* + * weechat::hdata_integer: get integer value of a variable in structure using + * hdata + */ + +XS (XS_weechat_api_hdata_integer) +{ + char *hdata, *pointer, *name; + 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, "hdata_integer"); + PERL_RETURN_INT(0); + } + + if (items < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PERL_CURRENT_SCRIPT_NAME, "hdata_integer"); + PERL_RETURN_INT(0); + } + + hdata = SvPV (ST (0), PL_na); + pointer = SvPV (ST (1), PL_na); + name = SvPV (ST (2), PL_na); + + value = weechat_hdata_integer (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + + PERL_RETURN_INT(value); +} + +/* + * weechat::hdata_long: get long value of a variable in structure using hdata + */ + +XS (XS_weechat_api_hdata_long) +{ + char *hdata, *pointer, *name; + long 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, "hdata_long"); + PERL_RETURN_LONG(0); + } + + if (items < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PERL_CURRENT_SCRIPT_NAME, "hdata_long"); + PERL_RETURN_LONG(0); + } + + hdata = SvPV (ST (0), PL_na); + pointer = SvPV (ST (1), PL_na); + name = SvPV (ST (2), PL_na); + + value = weechat_hdata_long (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + + PERL_RETURN_LONG(value); +} + +/* + * weechat::hdata_string: get string value of a variable in structure using + * hdata + */ + +XS (XS_weechat_api_hdata_string) +{ + char *hdata, *pointer, *name; + const char *result; + dXSARGS; + + /* make C compiler happy */ + (void) cv; + + if (!perl_current_script || !perl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PERL_CURRENT_SCRIPT_NAME, "hdata_string"); + PERL_RETURN_EMPTY; + } + + if (items < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PERL_CURRENT_SCRIPT_NAME, "hdata_string"); + PERL_RETURN_EMPTY; + } + + hdata = SvPV (ST (0), PL_na); + pointer = SvPV (ST (1), PL_na); + name = SvPV (ST (2), PL_na); + + result = weechat_hdata_string (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + + PERL_RETURN_STRING(result); +} + +/* + * weechat::hdata_pointer: get pointer value of a variable in structure using + * hdata + */ + +XS (XS_weechat_api_hdata_pointer) +{ + char *hdata, *pointer, *name; + char *result; + dXSARGS; + + /* make C compiler happy */ + (void) cv; + + if (!perl_current_script || !perl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PERL_CURRENT_SCRIPT_NAME, "hdata_pointer"); + PERL_RETURN_EMPTY; + } + + if (items < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PERL_CURRENT_SCRIPT_NAME, "hdata_pointer"); + PERL_RETURN_EMPTY; + } + + hdata = SvPV (ST (0), PL_na); + pointer = SvPV (ST (1), PL_na); + name = SvPV (ST (2), PL_na); + + result = script_ptr2str (weechat_hdata_pointer (script_str2ptr (hdata), + script_str2ptr (pointer), + name)); + + PERL_RETURN_STRING_FREE(result); +} + +/* + * weechat::hdata_time: get time value of a variable in structure using hdata + */ + +XS (XS_weechat_api_hdata_time) +{ + time_t time; + char timebuffer[64], *result, *hdata, *pointer, *name; + dXSARGS; + + /* make C compiler happy */ + (void) cv; + + if (!perl_current_script || !perl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PERL_CURRENT_SCRIPT_NAME, "hdata_time"); + PERL_RETURN_EMPTY; + } + + if (items < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PERL_CURRENT_SCRIPT_NAME, "hdata_time"); + PERL_RETURN_EMPTY; + } + + hdata = SvPV (ST (0), PL_na); + pointer = SvPV (ST (1), PL_na); + name = SvPV (ST (2), PL_na); + + time = weechat_hdata_time (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + strftime (timebuffer, sizeof (timebuffer), "%F %T", localtime (&time)); + result = strdup (timebuffer); + + PERL_RETURN_STRING_FREE(result); +} + +/* + * weechat::hdata_get_string: get hdata property as string + */ + +XS (XS_weechat_api_hdata_get_string) +{ + char *hdata, *property; + const char *result; + dXSARGS; + + /* make C compiler happy */ + (void) cv; + + if (!perl_current_script || !perl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PERL_CURRENT_SCRIPT_NAME, "hdata_get_string"); + PERL_RETURN_EMPTY; + } + + if (items < 2) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PERL_CURRENT_SCRIPT_NAME, "hdata_get_string"); + PERL_RETURN_EMPTY; + } + + hdata = SvPV (ST (0), PL_na); + property = SvPV (ST (1), PL_na); + + result = weechat_hdata_get_string (script_str2ptr (hdata), property); + + PERL_RETURN_STRING(result); +} + +/* * weechat::upgrade_new: create an upgrade file */ @@ -6857,6 +7212,16 @@ weechat_perl_api_init (pTHX) newXS ("weechat::infolist_pointer", XS_weechat_api_infolist_pointer, "weechat"); newXS ("weechat::infolist_time", XS_weechat_api_infolist_time, "weechat"); newXS ("weechat::infolist_free", XS_weechat_api_infolist_free, "weechat"); + newXS ("weechat::hdata_get", XS_weechat_api_hdata_get, "weechat"); + newXS ("weechat::hdata_get_var_type_string", XS_weechat_api_hdata_get_var_type_string, "weechat"); + newXS ("weechat::hdata_get_list", XS_weechat_api_hdata_get_list, "weechat"); + newXS ("weechat::hdata_move", XS_weechat_api_hdata_move, "weechat"); + newXS ("weechat::hdata_integer", XS_weechat_api_hdata_integer, "weechat"); + newXS ("weechat::hdata_long", XS_weechat_api_hdata_long, "weechat"); + newXS ("weechat::hdata_string", XS_weechat_api_hdata_string, "weechat"); + newXS ("weechat::hdata_pointer", XS_weechat_api_hdata_pointer, "weechat"); + newXS ("weechat::hdata_time", XS_weechat_api_hdata_time, "weechat"); + newXS ("weechat::hdata_get_string", XS_weechat_api_hdata_get_string, "weechat"); newXS ("weechat::upgrade_new", XS_weechat_api_upgrade_new, "weechat"); newXS ("weechat::upgrade_write_object", XS_weechat_api_upgrade_write_object, "weechat"); newXS ("weechat::upgrade_read", XS_weechat_api_upgrade_read, "weechat"); diff --git a/src/plugins/scripts/python/weechat-python-api.c b/src/plugins/scripts/python/weechat-python-api.c index 12b74ed7e..8a9ccfcab 100644 --- a/src/plugins/scripts/python/weechat-python-api.c +++ b/src/plugins/scripts/python/weechat-python-api.c @@ -36,23 +36,25 @@ #define PYTHON_RETURN_OK return Py_BuildValue ("i", 1); #define PYTHON_RETURN_ERROR return Py_BuildValue ("i", 0); -#define PYTHON_RETURN_EMPTY \ - Py_INCREF(Py_None); \ +#define PYTHON_RETURN_EMPTY \ + Py_INCREF(Py_None); \ return Py_None; -#define PYTHON_RETURN_STRING(__string) \ - if (__string) \ - return Py_BuildValue ("s", __string); \ +#define PYTHON_RETURN_STRING(__string) \ + if (__string) \ + return Py_BuildValue ("s", __string); \ return Py_BuildValue ("s", "") -#define PYTHON_RETURN_STRING_FREE(__string) \ - if (__string) \ - { \ - object = Py_BuildValue ("s", __string); \ - free (__string); \ - return object; \ - } \ +#define PYTHON_RETURN_STRING_FREE(__string) \ + if (__string) \ + { \ + object = Py_BuildValue ("s", __string); \ + free (__string); \ + return object; \ + } \ return Py_BuildValue ("s", "") -#define PYTHON_RETURN_INT(__int) \ +#define PYTHON_RETURN_INT(__int) \ return Py_BuildValue("i", __int); +#define PYTHON_RETURN_LONG(__long) \ + return Py_BuildValue("l", __long); /* @@ -6842,6 +6844,364 @@ weechat_python_api_infolist_free (PyObject *self, PyObject *args) } /* + * weechat_python_api_hdata_get: get hdata + */ + +static PyObject * +weechat_python_api_hdata_get (PyObject *self, PyObject *args) +{ + char *name, *result; + PyObject *object; + + /* make C compiler happy */ + (void) self; + + if (!python_current_script || !python_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PYTHON_CURRENT_SCRIPT_NAME, "hdata_get"); + PYTHON_RETURN_EMPTY; + } + + name = NULL; + + if (!PyArg_ParseTuple (args, "s", &name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PYTHON_CURRENT_SCRIPT_NAME, "hdata_get"); + PYTHON_RETURN_EMPTY; + } + + result = script_ptr2str (weechat_hdata_get (name)); + + PYTHON_RETURN_STRING_FREE(result); +} + +/* + * weechat_python_api_hdata_get_var_type_string: get type of variable as string + * in hdata + */ + +static PyObject * +weechat_python_api_hdata_get_var_type_string (PyObject *self, PyObject *args) +{ + char *hdata, *name; + const char *result; + + /* make C compiler happy */ + (void) self; + + if (!python_current_script || !python_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PYTHON_CURRENT_SCRIPT_NAME, "hdata_get_var_type_string"); + PYTHON_RETURN_EMPTY; + } + + hdata = NULL; + name = NULL; + + if (!PyArg_ParseTuple (args, "ss", &hdata, &name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PYTHON_CURRENT_SCRIPT_NAME, "hdata_get_var_type_string"); + PYTHON_RETURN_EMPTY; + } + + result = weechat_hdata_get_var_type_string (script_str2ptr (hdata), name); + + PYTHON_RETURN_STRING(result); +} + +/* + * weechat_python_api_hdata_get_list: get list pointer in hdata + */ + +static PyObject * +weechat_python_api_hdata_get_list (PyObject *self, PyObject *args) +{ + char *hdata, *name, *result; + PyObject *object; + + /* make C compiler happy */ + (void) self; + + if (!python_current_script || !python_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PYTHON_CURRENT_SCRIPT_NAME, "hdata_get_list"); + PYTHON_RETURN_EMPTY; + } + + hdata = NULL; + name = NULL; + + if (!PyArg_ParseTuple (args, "ss", &hdata, &name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PYTHON_CURRENT_SCRIPT_NAME, "hdata_get_list"); + PYTHON_RETURN_EMPTY; + } + + result = script_ptr2str (weechat_hdata_get_list (script_str2ptr (hdata), + name)); + + PYTHON_RETURN_STRING_FREE(result); +} + +/* + * weechat_python_api_hdata_move: move pointer to another element in list + */ + +static PyObject * +weechat_python_api_hdata_move (PyObject *self, PyObject *args) +{ + char *result, *hdata, *pointer; + int count; + PyObject *object; + + /* make C compiler happy */ + (void) self; + + if (!python_current_script || !python_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PYTHON_CURRENT_SCRIPT_NAME, "hdata_move"); + PYTHON_RETURN_EMPTY; + } + + hdata = NULL; + pointer = NULL; + count = 0; + + if (!PyArg_ParseTuple (args, "ssi", &hdata, &pointer, &count)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PYTHON_CURRENT_SCRIPT_NAME, "hdata_move"); + PYTHON_RETURN_EMPTY; + } + + result = script_ptr2str (weechat_hdata_move (script_str2ptr (hdata), + script_str2ptr (pointer), + count)); + + PYTHON_RETURN_STRING_FREE(result); +} + +/* + * weechat_python_api_hdata_integer: get integer value of a variable in + * structure using hdata + */ + +static PyObject * +weechat_python_api_hdata_integer (PyObject *self, PyObject *args) +{ + char *hdata, *pointer, *name; + 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, "hdata_integer"); + PYTHON_RETURN_INT(0); + } + + hdata = NULL; + pointer = NULL; + name = NULL; + + if (!PyArg_ParseTuple (args, "sss", &hdata, &pointer, &name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PYTHON_CURRENT_SCRIPT_NAME, "hdata_integer"); + PYTHON_RETURN_INT(0); + } + + value = weechat_hdata_integer (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + + PYTHON_RETURN_INT(value); +} + +/* + * weechat_python_api_hdata_long: get long value of a variable in structure + * using hdata + */ + +static PyObject * +weechat_python_api_hdata_long (PyObject *self, PyObject *args) +{ + char *hdata, *pointer, *name; + long value; + + /* make C compiler happy */ + (void) self; + + if (!python_current_script || !python_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PYTHON_CURRENT_SCRIPT_NAME, "hdata_long"); + PYTHON_RETURN_LONG(0); + } + + hdata = NULL; + pointer = NULL; + name = NULL; + + if (!PyArg_ParseTuple (args, "sss", &hdata, &pointer, &name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PYTHON_CURRENT_SCRIPT_NAME, "hdata_long"); + PYTHON_RETURN_LONG(0); + } + + value = weechat_hdata_long (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + + PYTHON_RETURN_LONG(value); +} + +/* + * weechat_python_api_hdata_string: get string value of a variable in structure + * using hdata + */ + +static PyObject * +weechat_python_api_hdata_string (PyObject *self, PyObject *args) +{ + char *hdata, *pointer, *name; + const char *result; + + /* make C compiler happy */ + (void) self; + + if (!python_current_script || !python_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PYTHON_CURRENT_SCRIPT_NAME, "hdata_string"); + PYTHON_RETURN_EMPTY; + } + + hdata = NULL; + pointer = NULL; + name = NULL; + + if (!PyArg_ParseTuple (args, "sss", &hdata, &pointer, &name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PYTHON_CURRENT_SCRIPT_NAME, "hdata_string"); + PYTHON_RETURN_EMPTY; + } + + result = weechat_hdata_string (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + + PYTHON_RETURN_STRING(result); +} + +/* + * weechat_python_api_hdata_pointer: get pointer value of a variable in + * structure using hdata + */ + +static PyObject * +weechat_python_api_hdata_pointer (PyObject *self, PyObject *args) +{ + char *hdata, *pointer, *name, *result; + PyObject *object; + + /* make C compiler happy */ + (void) self; + + if (!python_current_script || !python_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PYTHON_CURRENT_SCRIPT_NAME, "hdata_pointer"); + PYTHON_RETURN_EMPTY; + } + + hdata = NULL; + pointer = NULL; + name = NULL; + + if (!PyArg_ParseTuple (args, "sss", &hdata, &pointer, &name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PYTHON_CURRENT_SCRIPT_NAME, "hdata_pointer"); + PYTHON_RETURN_EMPTY; + } + + result = script_ptr2str (weechat_hdata_pointer (script_str2ptr (hdata), + script_str2ptr (pointer), + name)); + + PYTHON_RETURN_STRING_FREE(result); +} + +/* + * weechat_python_api_hdata_time: get time value of a variable in structure + * using hdata + */ + +static PyObject * +weechat_python_api_hdata_time (PyObject *self, PyObject *args) +{ + char *hdata, *pointer, *name, timebuffer[64], *result; + time_t time; + PyObject *object; + + /* make C compiler happy */ + (void) self; + + if (!python_current_script || !python_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PYTHON_CURRENT_SCRIPT_NAME, "hdata_time"); + PYTHON_RETURN_EMPTY; + } + + hdata = NULL; + pointer = NULL; + name = NULL; + + if (!PyArg_ParseTuple (args, "sss", &hdata, &pointer, &name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PYTHON_CURRENT_SCRIPT_NAME, "hdata_time"); + PYTHON_RETURN_EMPTY; + } + + time = weechat_hdata_time (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + strftime (timebuffer, sizeof (timebuffer), "%F %T", localtime (&time)); + result = strdup (timebuffer); + + PYTHON_RETURN_STRING_FREE(result); +} + +/* + * weechat_python_api_hdata_get_string: get hdata property as string + */ + +static PyObject * +weechat_python_api_hdata_get_string (PyObject *self, PyObject *args) +{ + char *hdata, *property; + const char *result; + + /* make C compiler happy */ + (void) self; + + if (!python_current_script || !python_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(PYTHON_CURRENT_SCRIPT_NAME, "hdata_get_string"); + PYTHON_RETURN_EMPTY; + } + + hdata = NULL; + property = NULL; + + if (!PyArg_ParseTuple (args, "ss", &hdata, &property)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(PYTHON_CURRENT_SCRIPT_NAME, "hdata_get_string"); + PYTHON_RETURN_EMPTY; + } + + result = weechat_hdata_get_string (script_str2ptr (hdata), property); + + PYTHON_RETURN_STRING(result); +} + +/* * weechat_python_api_upgrade_new: create an upgrade file */ @@ -7194,6 +7554,16 @@ PyMethodDef weechat_python_funcs[] = { "infolist_pointer", &weechat_python_api_infolist_pointer, METH_VARARGS, "" }, { "infolist_time", &weechat_python_api_infolist_time, METH_VARARGS, "" }, { "infolist_free", &weechat_python_api_infolist_free, METH_VARARGS, "" }, + { "hdata_get", &weechat_python_api_hdata_get, METH_VARARGS, "" }, + { "hdata_get_var_type_string", &weechat_python_api_hdata_get_var_type_string, METH_VARARGS, "" }, + { "hdata_get_list", &weechat_python_api_hdata_get_list, METH_VARARGS, "" }, + { "hdata_move", &weechat_python_api_hdata_move, METH_VARARGS, "" }, + { "hdata_integer", &weechat_python_api_hdata_integer, METH_VARARGS, "" }, + { "hdata_long", &weechat_python_api_hdata_long, METH_VARARGS, "" }, + { "hdata_string", &weechat_python_api_hdata_string, METH_VARARGS, "" }, + { "hdata_pointer", &weechat_python_api_hdata_pointer, METH_VARARGS, "" }, + { "hdata_time", &weechat_python_api_hdata_time, METH_VARARGS, "" }, + { "hdata_get_string", &weechat_python_api_hdata_get_string, METH_VARARGS, "" }, { "upgrade_new", &weechat_python_api_upgrade_new, METH_VARARGS, "" }, { "upgrade_write_object", &weechat_python_api_upgrade_write_object, METH_VARARGS, "" }, { "upgrade_read", &weechat_python_api_upgrade_read, METH_VARARGS, "" }, diff --git a/src/plugins/scripts/ruby/weechat-ruby-api.c b/src/plugins/scripts/ruby/weechat-ruby-api.c index 17e0476d3..6674b222b 100644 --- a/src/plugins/scripts/ruby/weechat-ruby-api.c +++ b/src/plugins/scripts/ruby/weechat-ruby-api.c @@ -36,20 +36,22 @@ #define RUBY_RETURN_OK return INT2FIX (1); #define RUBY_RETURN_ERROR return INT2FIX (0); #define RUBY_RETURN_EMPTY return Qnil; -#define RUBY_RETURN_STRING(__string) \ - if (__string) \ - return rb_str_new2 (__string); \ +#define RUBY_RETURN_STRING(__string) \ + if (__string) \ + return rb_str_new2 (__string); \ return rb_str_new2 ("") -#define RUBY_RETURN_STRING_FREE(__string) \ - if (__string) \ - { \ - return_value = rb_str_new2 (__string); \ - free (__string); \ - return return_value; \ - } \ +#define RUBY_RETURN_STRING_FREE(__string) \ + if (__string) \ + { \ + return_value = rb_str_new2 (__string); \ + free (__string); \ + return return_value; \ + } \ return rb_str_new2 ("") -#define RUBY_RETURN_INT(__int) \ +#define RUBY_RETURN_INT(__int) \ return INT2FIX(__int); +#define RUBY_RETURN_LONG(__long) \ + return LONG2FIX(__long); /* @@ -7455,6 +7457,407 @@ weechat_ruby_api_infolist_free (VALUE class, VALUE infolist) } /* + * weechat_ruby_api_hdata_get: get hdata + */ + +static VALUE +weechat_ruby_api_hdata_get (VALUE class, VALUE name) +{ + char *c_name, *result; + VALUE return_value; + + /* make C compiler happy */ + (void) class; + + if (!ruby_current_script || !ruby_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(RUBY_CURRENT_SCRIPT_NAME, "hdata_get"); + RUBY_RETURN_EMPTY; + } + + if (NIL_P (name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(RUBY_CURRENT_SCRIPT_NAME, "hdata_get"); + RUBY_RETURN_EMPTY; + } + + Check_Type (name, T_STRING); + + c_name = StringValuePtr (name); + + result = script_ptr2str (weechat_hdata_get (c_name)); + + RUBY_RETURN_STRING_FREE(result); +} + +/* + * weechat_ruby_api_hdata_get_var_type_string: get type of variable as string + * in hdata + */ + +static VALUE +weechat_ruby_api_hdata_get_var_type_string (VALUE class, VALUE hdata, + VALUE name) +{ + char *c_hdata, *c_name; + const char *result; + + /* make C compiler happy */ + (void) class; + + if (!ruby_current_script || !ruby_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(RUBY_CURRENT_SCRIPT_NAME, "hdata_get_var_type_string"); + RUBY_RETURN_EMPTY; + } + + if (NIL_P (hdata) || NIL_P (name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(RUBY_CURRENT_SCRIPT_NAME, "hdata_get_var_type_string"); + RUBY_RETURN_EMPTY; + } + + Check_Type (hdata, T_STRING); + Check_Type (name, T_STRING); + + c_hdata = StringValuePtr (hdata); + c_name = StringValuePtr (name); + + result = weechat_hdata_get_var_type_string (script_str2ptr (c_hdata), c_name); + + RUBY_RETURN_STRING(result); +} + +/* + * weechat_ruby_api_hdata_get_list: get list pointer in hdata + */ + +static VALUE +weechat_ruby_api_hdata_get_list (VALUE class, VALUE hdata, VALUE name) +{ + char *c_hdata, *c_name, *result; + VALUE return_value; + + /* make C compiler happy */ + (void) class; + + if (!ruby_current_script || !ruby_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(RUBY_CURRENT_SCRIPT_NAME, "hdata_get_list"); + RUBY_RETURN_EMPTY; + } + + if (NIL_P (hdata) || NIL_P (name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(RUBY_CURRENT_SCRIPT_NAME, "hdata_get_list"); + RUBY_RETURN_EMPTY; + } + + Check_Type (hdata, T_STRING); + Check_Type (name, T_STRING); + + c_hdata = StringValuePtr (hdata); + c_name = StringValuePtr (name); + + result = script_ptr2str (weechat_hdata_get_list (script_str2ptr (c_hdata), + c_name)); + + RUBY_RETURN_STRING_FREE(result); +} + +/* + * weechat_ruby_api_hdata_move: move pointer to another element in list + */ + +static VALUE +weechat_ruby_api_hdata_move (VALUE class, VALUE hdata, VALUE pointer, + VALUE count) +{ + char *c_hdata, *c_pointer, *result; + int c_count; + VALUE return_value; + + /* make C compiler happy */ + (void) class; + + if (!ruby_current_script || !ruby_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(RUBY_CURRENT_SCRIPT_NAME, "hdata_move"); + RUBY_RETURN_EMPTY; + } + + if (NIL_P (hdata) || NIL_P (pointer) || NIL_P (count)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(RUBY_CURRENT_SCRIPT_NAME, "hdata_move"); + RUBY_RETURN_EMPTY; + } + + Check_Type (hdata, T_STRING); + Check_Type (pointer, T_STRING); + Check_Type (count, T_FIXNUM); + + c_hdata = StringValuePtr (hdata); + c_pointer = StringValuePtr (pointer); + c_count = FIX2INT (count); + + result = weechat_hdata_move (script_str2ptr (c_hdata), + script_str2ptr (c_pointer), + c_count); + + RUBY_RETURN_STRING_FREE(result); +} + +/* + * weechat_ruby_api_hdata_integer: get integer value of a variable in structure + * using hdata + */ + +static VALUE +weechat_ruby_api_hdata_integer (VALUE class, VALUE hdata, VALUE pointer, + VALUE name) +{ + char *c_hdata, *c_pointer, *c_name; + 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, "hdata_integer"); + RUBY_RETURN_INT(0); + } + + if (NIL_P (hdata) || NIL_P (pointer) || NIL_P (name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(RUBY_CURRENT_SCRIPT_NAME, "hdata_integer"); + RUBY_RETURN_INT(0); + } + + Check_Type (hdata, T_STRING); + Check_Type (pointer, T_STRING); + Check_Type (name, T_STRING); + + c_hdata = StringValuePtr (hdata); + c_pointer = StringValuePtr (pointer); + c_name = StringValuePtr (name); + + value = weechat_hdata_integer (script_str2ptr (c_hdata), + script_str2ptr (c_pointer), + c_name); + + RUBY_RETURN_INT(value); +} + +/* + * weechat_ruby_api_hdata_long: get long value of a variable in structure using + * hdata + */ + +static VALUE +weechat_ruby_api_hdata_long (VALUE class, VALUE hdata, VALUE pointer, + VALUE name) +{ + char *c_hdata, *c_pointer, *c_name; + long value; + + /* make C compiler happy */ + (void) class; + + if (!ruby_current_script || !ruby_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(RUBY_CURRENT_SCRIPT_NAME, "hdata_long"); + RUBY_RETURN_LONG(0); + } + + if (NIL_P (hdata) || NIL_P (pointer) || NIL_P (name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(RUBY_CURRENT_SCRIPT_NAME, "hdata_long"); + RUBY_RETURN_LONG(0); + } + + Check_Type (hdata, T_STRING); + Check_Type (pointer, T_STRING); + Check_Type (name, T_STRING); + + c_hdata = StringValuePtr (hdata); + c_pointer = StringValuePtr (pointer); + c_name = StringValuePtr (name); + + value = weechat_hdata_long (script_str2ptr (c_hdata), + script_str2ptr (c_pointer), + c_name); + + RUBY_RETURN_LONG(value); +} + +/* + * weechat_ruby_api_hdata_string: get string value of a variable in structure + * using hdata + */ + +static VALUE +weechat_ruby_api_hdata_string (VALUE class, VALUE hdata, VALUE pointer, + VALUE name) +{ + char *c_hdata, *c_pointer, *c_name; + const char *result; + + /* make C compiler happy */ + (void) class; + + if (!ruby_current_script || !ruby_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(RUBY_CURRENT_SCRIPT_NAME, "hdata_string"); + RUBY_RETURN_EMPTY; + } + + if (NIL_P (hdata) || NIL_P (pointer) || NIL_P (name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(RUBY_CURRENT_SCRIPT_NAME, "hdata_string"); + RUBY_RETURN_EMPTY; + } + + Check_Type (hdata, T_STRING); + Check_Type (pointer, T_STRING); + Check_Type (name, T_STRING); + + c_hdata = StringValuePtr (hdata); + c_pointer = StringValuePtr (pointer); + c_name = StringValuePtr (name); + + result = weechat_hdata_string (script_str2ptr (c_hdata), + script_str2ptr (c_pointer), + c_name); + + RUBY_RETURN_STRING(result); +} + +/* + * weechat_ruby_api_hdata_pointer: get pointer value of a variable in structure + * using hdata + */ + +static VALUE +weechat_ruby_api_hdata_pointer (VALUE class, VALUE hdata, VALUE pointer, + VALUE name) +{ + char *c_hdata, *c_pointer, *c_name, *result; + VALUE return_value; + + /* make C compiler happy */ + (void) class; + + if (!ruby_current_script || !ruby_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(RUBY_CURRENT_SCRIPT_NAME, "hdata_pointer"); + RUBY_RETURN_EMPTY; + } + + if (NIL_P (hdata) || NIL_P (pointer) || NIL_P (name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(RUBY_CURRENT_SCRIPT_NAME, "hdata_pointer"); + RUBY_RETURN_EMPTY; + } + + Check_Type (hdata, T_STRING); + Check_Type (pointer, T_STRING); + Check_Type (name, T_STRING); + + c_hdata = StringValuePtr (hdata); + c_pointer = StringValuePtr (pointer); + c_name = StringValuePtr (name); + + result = script_ptr2str (weechat_hdata_pointer (script_str2ptr (c_hdata), + script_str2ptr (c_pointer), + c_name)); + + RUBY_RETURN_STRING_FREE(result); +} + +/* + * weechat_ruby_api_hdata_time: get time value of a variable in structure using + * hdata + */ + +static VALUE +weechat_ruby_api_hdata_time (VALUE class, VALUE hdata, VALUE pointer, + VALUE name) +{ + char *c_hdata, *c_pointer, *c_name, timebuffer[64], *result; + time_t time; + VALUE return_value; + + /* make C compiler happy */ + (void) class; + + if (!ruby_current_script || !ruby_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(RUBY_CURRENT_SCRIPT_NAME, "hdata_time"); + RUBY_RETURN_EMPTY; + } + + if (NIL_P (hdata) || NIL_P (pointer) || NIL_P (name)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(RUBY_CURRENT_SCRIPT_NAME, "hdata_time"); + RUBY_RETURN_EMPTY; + } + + Check_Type (hdata, T_STRING); + Check_Type (pointer, T_STRING); + Check_Type (name, T_STRING); + + c_hdata = StringValuePtr (hdata); + c_pointer = StringValuePtr (pointer); + c_name = StringValuePtr (name); + + time = weechat_hdata_time (script_str2ptr (c_hdata), + script_str2ptr (c_pointer), + c_name); + strftime (timebuffer, sizeof (timebuffer), "%F %T", localtime (&time)); + result = strdup (timebuffer); + + RUBY_RETURN_STRING_FREE(result); +} + +/* + * weechat_ruby_api_hdata_get_string: get hdata property as string + */ + +static VALUE +weechat_ruby_api_hdata_get_string (VALUE class, VALUE hdata, VALUE property) +{ + char *c_hdata, *c_property; + const char *result; + + /* make C compiler happy */ + (void) class; + + if (!ruby_current_script || !ruby_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(RUBY_CURRENT_SCRIPT_NAME, "hdata_get_string"); + RUBY_RETURN_EMPTY; + } + + if (NIL_P (hdata) || NIL_P (property)) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(RUBY_CURRENT_SCRIPT_NAME, "hdata_get_string"); + RUBY_RETURN_EMPTY; + } + + Check_Type (hdata, T_STRING); + Check_Type (property, T_STRING); + + c_hdata = StringValuePtr (hdata); + c_property = StringValuePtr (property); + + result = weechat_hdata_get_var_type_string (script_str2ptr (c_hdata), + c_property); + + RUBY_RETURN_STRING(result); +} + +/* * weechat_ruby_api_upgrade_new: create an upgrade file */ @@ -7869,6 +8272,16 @@ weechat_ruby_api_init (VALUE ruby_mWeechat) rb_define_module_function (ruby_mWeechat, "infolist_pointer", &weechat_ruby_api_infolist_pointer, 2); rb_define_module_function (ruby_mWeechat, "infolist_time", &weechat_ruby_api_infolist_time, 2); rb_define_module_function (ruby_mWeechat, "infolist_free", &weechat_ruby_api_infolist_free, 1); + rb_define_module_function (ruby_mWeechat, "hdata_get", &weechat_ruby_api_hdata_get, 1); + rb_define_module_function (ruby_mWeechat, "hdata_get_var_type_string", &weechat_ruby_api_hdata_get_var_type_string, 2); + rb_define_module_function (ruby_mWeechat, "hdata_get_list", &weechat_ruby_api_hdata_get_list, 2); + rb_define_module_function (ruby_mWeechat, "hdata_move", &weechat_ruby_api_hdata_move, 3); + rb_define_module_function (ruby_mWeechat, "hdata_integer", &weechat_ruby_api_hdata_integer, 3); + rb_define_module_function (ruby_mWeechat, "hdata_long", &weechat_ruby_api_hdata_long, 3); + rb_define_module_function (ruby_mWeechat, "hdata_string", &weechat_ruby_api_hdata_string, 3); + rb_define_module_function (ruby_mWeechat, "hdata_pointer", &weechat_ruby_api_hdata_pointer, 3); + rb_define_module_function (ruby_mWeechat, "hdata_time", &weechat_ruby_api_hdata_time, 3); + rb_define_module_function (ruby_mWeechat, "hdata_get_string", &weechat_ruby_api_hdata_get_string, 2); rb_define_module_function (ruby_mWeechat, "upgrade_new", &weechat_ruby_api_upgrade_new, 2); rb_define_module_function (ruby_mWeechat, "upgrade_write_object", &weechat_ruby_api_upgrade_write_object, 3); rb_define_module_function (ruby_mWeechat, "upgrade_read", &weechat_ruby_api_upgrade_read, 3); diff --git a/src/plugins/scripts/tcl/weechat-tcl-api.c b/src/plugins/scripts/tcl/weechat-tcl-api.c index bb5b5d250..e0e3705c8 100644 --- a/src/plugins/scripts/tcl/weechat-tcl-api.c +++ b/src/plugins/scripts/tcl/weechat-tcl-api.c @@ -36,130 +36,145 @@ #include "../script-callback.h" #include "weechat-tcl.h" -#define TCL_RETURN_OK \ - { \ - objp = Tcl_GetObjResult (interp); \ - if (Tcl_IsShared (objp)) \ - { \ - objp = Tcl_DuplicateObj (objp); \ - Tcl_IncrRefCount (objp); \ - Tcl_SetIntObj (objp, 1); \ - Tcl_SetObjResult (interp, objp); \ - Tcl_DecrRefCount (objp); \ - } \ - else \ - Tcl_SetIntObj (objp, 1); \ - return TCL_OK; \ - } -#define TCL_RETURN_ERROR \ - { \ - objp = Tcl_GetObjResult (interp); \ - if (Tcl_IsShared (objp)) \ - { \ - objp = Tcl_DuplicateObj (objp); \ - Tcl_IncrRefCount (objp); \ - Tcl_SetIntObj (objp, 0); \ - Tcl_SetObjResult (interp, objp); \ - Tcl_DecrRefCount (objp); \ - } \ - else \ - Tcl_SetIntObj (objp, 0); \ - return TCL_ERROR; \ - } -#define TCL_RETURN_EMPTY \ - { \ - objp = Tcl_GetObjResult (interp); \ - if (Tcl_IsShared (objp)) \ - { \ - objp = Tcl_DuplicateObj (objp); \ - Tcl_IncrRefCount (objp); \ - Tcl_SetStringObj (objp, "", -1); \ - Tcl_SetObjResult (interp, objp); \ - Tcl_DecrRefCount (objp); \ - } \ - else \ - Tcl_SetStringObj (objp, "", -1); \ - return TCL_OK; \ - } -#define TCL_RETURN_STRING(__string) \ - { \ - objp = Tcl_GetObjResult (interp); \ - if (Tcl_IsShared (objp)) \ - { \ - objp = Tcl_DuplicateObj (objp); \ - Tcl_IncrRefCount (objp); \ - if (__string) \ - { \ - Tcl_SetStringObj (objp, __string, -1); \ - Tcl_SetObjResult (interp, objp); \ - Tcl_DecrRefCount (objp); \ - return TCL_OK; \ - } \ - Tcl_SetStringObj (objp, "", -1); \ - Tcl_SetObjResult (interp, objp); \ - Tcl_DecrRefCount (objp); \ - } \ - else \ - { \ - if (__string) \ - { \ - Tcl_SetStringObj (objp, __string, -1); \ - return TCL_OK; \ - } \ - Tcl_SetStringObj (objp, "", -1); \ - } \ - return TCL_OK; \ - } -#define TCL_RETURN_STRING_FREE(__string) \ - { \ - objp = Tcl_GetObjResult (interp); \ - if (Tcl_IsShared (objp)) \ - { \ - objp = Tcl_DuplicateObj (objp); \ - Tcl_IncrRefCount (objp); \ - if (__string) \ - { \ - Tcl_SetStringObj (objp, __string, -1); \ - Tcl_SetObjResult (interp, objp); \ - Tcl_DecrRefCount (objp); \ - free (__string); \ - return TCL_OK; \ - } \ - Tcl_SetStringObj (objp, "", -1); \ - Tcl_SetObjResult (interp, objp); \ - Tcl_DecrRefCount (objp); \ - } \ - else \ - { \ - if (__string) \ - { \ - Tcl_SetStringObj (objp, __string, -1); \ - free (__string); \ - return TCL_OK; \ - } \ - Tcl_SetStringObj (objp, "", -1); \ - } \ - return TCL_OK; \ - } -#define TCL_RETURN_INT(__int) \ - { \ - objp = Tcl_GetObjResult (interp); \ - if (Tcl_IsShared (objp)) \ - { \ - objp = Tcl_DuplicateObj (objp); \ - Tcl_IncrRefCount (objp); \ - Tcl_SetIntObj (objp, __int); \ - Tcl_SetObjResult (interp, objp); \ - Tcl_DecrRefCount (objp); \ - } \ - else \ - Tcl_SetIntObj (objp, __int); \ - return TCL_OK; \ - } -#define TCL_RETURN_OBJ(__obj) \ - { \ - Tcl_SetObjResult (interp, __obj); \ - return TCL_OK; \ +#define TCL_RETURN_OK \ + { \ + objp = Tcl_GetObjResult (interp); \ + if (Tcl_IsShared (objp)) \ + { \ + objp = Tcl_DuplicateObj (objp); \ + Tcl_IncrRefCount (objp); \ + Tcl_SetIntObj (objp, 1); \ + Tcl_SetObjResult (interp, objp); \ + Tcl_DecrRefCount (objp); \ + } \ + else \ + Tcl_SetIntObj (objp, 1); \ + return TCL_OK; \ + } +#define TCL_RETURN_ERROR \ + { \ + objp = Tcl_GetObjResult (interp); \ + if (Tcl_IsShared (objp)) \ + { \ + objp = Tcl_DuplicateObj (objp); \ + Tcl_IncrRefCount (objp); \ + Tcl_SetIntObj (objp, 0); \ + Tcl_SetObjResult (interp, objp); \ + Tcl_DecrRefCount (objp); \ + } \ + else \ + Tcl_SetIntObj (objp, 0); \ + return TCL_ERROR; \ + } +#define TCL_RETURN_EMPTY \ + { \ + objp = Tcl_GetObjResult (interp); \ + if (Tcl_IsShared (objp)) \ + { \ + objp = Tcl_DuplicateObj (objp); \ + Tcl_IncrRefCount (objp); \ + Tcl_SetStringObj (objp, "", -1); \ + Tcl_SetObjResult (interp, objp); \ + Tcl_DecrRefCount (objp); \ + } \ + else \ + Tcl_SetStringObj (objp, "", -1); \ + return TCL_OK; \ + } +#define TCL_RETURN_STRING(__string) \ + { \ + objp = Tcl_GetObjResult (interp); \ + if (Tcl_IsShared (objp)) \ + { \ + objp = Tcl_DuplicateObj (objp); \ + Tcl_IncrRefCount (objp); \ + if (__string) \ + { \ + Tcl_SetStringObj (objp, __string, -1); \ + Tcl_SetObjResult (interp, objp); \ + Tcl_DecrRefCount (objp); \ + return TCL_OK; \ + } \ + Tcl_SetStringObj (objp, "", -1); \ + Tcl_SetObjResult (interp, objp); \ + Tcl_DecrRefCount (objp); \ + } \ + else \ + { \ + if (__string) \ + { \ + Tcl_SetStringObj (objp, __string, -1); \ + return TCL_OK; \ + } \ + Tcl_SetStringObj (objp, "", -1); \ + } \ + return TCL_OK; \ + } +#define TCL_RETURN_STRING_FREE(__string) \ + { \ + objp = Tcl_GetObjResult (interp); \ + if (Tcl_IsShared (objp)) \ + { \ + objp = Tcl_DuplicateObj (objp); \ + Tcl_IncrRefCount (objp); \ + if (__string) \ + { \ + Tcl_SetStringObj (objp, __string, -1); \ + Tcl_SetObjResult (interp, objp); \ + Tcl_DecrRefCount (objp); \ + free (__string); \ + return TCL_OK; \ + } \ + Tcl_SetStringObj (objp, "", -1); \ + Tcl_SetObjResult (interp, objp); \ + Tcl_DecrRefCount (objp); \ + } \ + else \ + { \ + if (__string) \ + { \ + Tcl_SetStringObj (objp, __string, -1); \ + free (__string); \ + return TCL_OK; \ + } \ + Tcl_SetStringObj (objp, "", -1); \ + } \ + return TCL_OK; \ + } +#define TCL_RETURN_INT(__int) \ + { \ + objp = Tcl_GetObjResult (interp); \ + if (Tcl_IsShared (objp)) \ + { \ + objp = Tcl_DuplicateObj (objp); \ + Tcl_IncrRefCount (objp); \ + Tcl_SetIntObj (objp, __int); \ + Tcl_SetObjResult (interp, objp); \ + Tcl_DecrRefCount (objp); \ + } \ + else \ + Tcl_SetIntObj (objp, __int); \ + return TCL_OK; \ + } +#define TCL_RETURN_LONG(__long) \ + { \ + objp = Tcl_GetObjResult (interp); \ + if (Tcl_IsShared (objp)) \ + { \ + objp = Tcl_DuplicateObj (objp); \ + Tcl_IncrRefCount (objp); \ + Tcl_SetLongObj (objp, __long); \ + Tcl_SetObjResult (interp, objp); \ + Tcl_DecrRefCount (objp); \ + } \ + else \ + Tcl_SetLongObj (objp, __long); \ + return TCL_OK; \ + } +#define TCL_RETURN_OBJ(__obj) \ + { \ + Tcl_SetObjResult (interp, __obj); \ + return TCL_OK; \ } @@ -7235,6 +7250,393 @@ weechat_tcl_api_infolist_free (ClientData clientData, Tcl_Interp *interp, } /* + * weechat_tcl_api_hdata_get: get hdata + */ + +static int +weechat_tcl_api_hdata_get (ClientData clientData, Tcl_Interp *interp, + int objc, Tcl_Obj *CONST objv[]) +{ + Tcl_Obj *objp; + char *result, *name; + int i; + + /* make C compiler happy */ + (void) clientData; + + if (!tcl_current_script || !tcl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(TCL_CURRENT_SCRIPT_NAME, "hdata_get"); + TCL_RETURN_EMPTY; + } + + if (objc < 2) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(TCL_CURRENT_SCRIPT_NAME, "hdata_get"); + TCL_RETURN_EMPTY; + } + + name = Tcl_GetStringFromObj (objv[1], &i); + + result = script_ptr2str (weechat_hdata_get (name)); + + TCL_RETURN_STRING_FREE(result); +} + +/* + * weechat_tcl_api_hdata_get_var_type_string: get type of variable as string in + * hdata + */ + +static int +weechat_tcl_api_hdata_get_var_type_string (ClientData clientData, + Tcl_Interp *interp, + int objc, Tcl_Obj *CONST objv[]) +{ + Tcl_Obj *objp; + char *hdata, *name; + const char *result; + int i; + + /* make C compiler happy */ + (void) clientData; + + if (!tcl_current_script || !tcl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(TCL_CURRENT_SCRIPT_NAME, "hdata_get_var_type_string"); + TCL_RETURN_EMPTY; + } + + if (objc < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(TCL_CURRENT_SCRIPT_NAME, "hdata_get_var_type_string"); + TCL_RETURN_EMPTY; + } + + hdata = Tcl_GetStringFromObj (objv[1], &i); + name = Tcl_GetStringFromObj (objv[2], &i); + + result = weechat_hdata_get_var_type_string (script_str2ptr (hdata), name); + + TCL_RETURN_STRING(result); +} + +/* + * weechat_tcl_api_hdata_get_list: get list pointer in hdata + */ + +static int +weechat_tcl_api_hdata_get_list (ClientData clientData, Tcl_Interp *interp, + int objc, Tcl_Obj *CONST objv[]) +{ + Tcl_Obj *objp; + char *hdata, *name, *result; + int i; + + /* make C compiler happy */ + (void) clientData; + + if (!tcl_current_script || !tcl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(TCL_CURRENT_SCRIPT_NAME, "hdata_get_list"); + TCL_RETURN_EMPTY; + } + + if (objc < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(TCL_CURRENT_SCRIPT_NAME, "hdata_get_list"); + TCL_RETURN_EMPTY; + } + + hdata = Tcl_GetStringFromObj (objv[1], &i); + name = Tcl_GetStringFromObj (objv[2], &i); + + result = script_ptr2str (weechat_hdata_get_list (script_str2ptr (hdata), + name)); + + TCL_RETURN_STRING_FREE(result); +} + +/* + * weechat_tcl_api_hdata_move: move pointer to another element in list + */ + +static int +weechat_tcl_api_hdata_move (ClientData clientData, Tcl_Interp *interp, + int objc, Tcl_Obj *CONST objv[]) +{ + Tcl_Obj *objp; + char *hdata, *pointer, *result; + int i, count; + + /* make C compiler happy */ + (void) clientData; + + if (!tcl_current_script || !tcl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(TCL_CURRENT_SCRIPT_NAME, "hdata_move"); + TCL_RETURN_EMPTY; + } + + if (objc < 4) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(TCL_CURRENT_SCRIPT_NAME, "hdata_move"); + TCL_RETURN_EMPTY; + } + + hdata = Tcl_GetStringFromObj (objv[1], &i); + pointer = Tcl_GetStringFromObj (objv[2], &i); + + if (Tcl_GetIntFromObj (interp, objv[3], &count) != TCL_OK) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(TCL_CURRENT_SCRIPT_NAME, "hdata_move"); + TCL_RETURN_EMPTY; + } + + result = script_ptr2str (weechat_hdata_move (script_str2ptr (hdata), + script_str2ptr (pointer), + count)); + + TCL_RETURN_STRING_FREE(result); +} + +/* + * weechat_tcl_api_hdata_integer: get integer value of a variable in structure + * using hdata + */ + +static int +weechat_tcl_api_hdata_integer (ClientData clientData, Tcl_Interp *interp, + int objc, Tcl_Obj *CONST objv[]) +{ + Tcl_Obj *objp; + char *hdata, *pointer, *name; + 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, "hdata_integer"); + TCL_RETURN_INT(0); + } + + if (objc < 4) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(TCL_CURRENT_SCRIPT_NAME, "hdata_integer"); + TCL_RETURN_INT(0); + } + + hdata = Tcl_GetStringFromObj (objv[1], &i); + pointer = Tcl_GetStringFromObj (objv[2], &i); + name = Tcl_GetStringFromObj (objv[3], &i); + + result = weechat_hdata_integer (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + + TCL_RETURN_INT(result); +} + +/* + * weechat_tcl_api_hdata_long: get long value of a variable in structure using + * hdata + */ + +static int +weechat_tcl_api_hdata_long (ClientData clientData, Tcl_Interp *interp, + int objc, Tcl_Obj *CONST objv[]) +{ + Tcl_Obj *objp; + char *hdata, *pointer, *name; + 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, "hdata_long"); + TCL_RETURN_LONG(0); + } + + if (objc < 4) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(TCL_CURRENT_SCRIPT_NAME, "hdata_long"); + TCL_RETURN_LONG(0); + } + + hdata = Tcl_GetStringFromObj (objv[1], &i); + pointer = Tcl_GetStringFromObj (objv[2], &i); + name = Tcl_GetStringFromObj (objv[3], &i); + + result = weechat_hdata_long (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + + TCL_RETURN_LONG(result); +} + +/* + * weechat_tcl_api_hdata_string: get string value of a variable in structure + * using hdata + */ + +static int +weechat_tcl_api_hdata_string (ClientData clientData, Tcl_Interp *interp, + int objc, Tcl_Obj *CONST objv[]) +{ + Tcl_Obj *objp; + char *hdata, *pointer, *name; + const char *result; + int i; + + /* make C compiler happy */ + (void) clientData; + + if (!tcl_current_script || !tcl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(TCL_CURRENT_SCRIPT_NAME, "hdata_string"); + TCL_RETURN_EMPTY; + } + + if (objc < 4) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(TCL_CURRENT_SCRIPT_NAME, "hdata_string"); + TCL_RETURN_EMPTY; + } + + hdata = Tcl_GetStringFromObj (objv[1], &i); + pointer = Tcl_GetStringFromObj (objv[2], &i); + name = Tcl_GetStringFromObj (objv[3], &i); + + result = weechat_hdata_string (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + + TCL_RETURN_STRING(result); +} + +/* + * weechat_tcl_api_hdata_pointer: get pointer value of a variable in structure + * using hdata + */ + +static int +weechat_tcl_api_hdata_pointer (ClientData clientData, Tcl_Interp *interp, + int objc, Tcl_Obj *CONST objv[]) +{ + Tcl_Obj *objp; + char *hdata, *pointer, *name, *result; + int i; + + /* make C compiler happy */ + (void) clientData; + + if (!tcl_current_script || !tcl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(TCL_CURRENT_SCRIPT_NAME, "hdata_pointer"); + TCL_RETURN_EMPTY; + } + + if (objc < 4) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(TCL_CURRENT_SCRIPT_NAME, "hdata_pointer"); + TCL_RETURN_EMPTY; + } + + hdata = Tcl_GetStringFromObj (objv[1], &i); + pointer = Tcl_GetStringFromObj (objv[2], &i); + name = Tcl_GetStringFromObj (objv[3], &i); + + result = script_ptr2str (weechat_hdata_pointer (script_str2ptr (hdata), + script_str2ptr (pointer), + name)); + + TCL_RETURN_STRING_FREE(result); +} + +/* + * weechat_tcl_api_hdata_time: get time value of a variable in structure using + * hdata + */ + +static int +weechat_tcl_api_hdata_time (ClientData clientData, Tcl_Interp *interp, + int objc, Tcl_Obj *CONST objv[]) +{ + Tcl_Obj *objp; + time_t time; + char timebuffer[64], *result, *hdata, *pointer, *name; + int i; + + /* make C compiler happy */ + (void) clientData; + + if (!tcl_current_script || !tcl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(TCL_CURRENT_SCRIPT_NAME, "hdata_time"); + TCL_RETURN_EMPTY; + } + + if (objc < 4) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(TCL_CURRENT_SCRIPT_NAME, "hdata_time"); + TCL_RETURN_EMPTY; + } + + hdata = Tcl_GetStringFromObj (objv[1], &i); + pointer = Tcl_GetStringFromObj (objv[2], &i); + name = Tcl_GetStringFromObj (objv[3], &i); + + time = weechat_hdata_time (script_str2ptr (hdata), + script_str2ptr (pointer), + name); + strftime (timebuffer, sizeof (timebuffer), "%F %T", localtime (&time)); + + result = strdup (timebuffer); + + TCL_RETURN_STRING_FREE(result); +} + +/* + * weechat_tcl_api_hdata_get_string: get hdata property as string + */ + +static int +weechat_tcl_api_hdata_get_string (ClientData clientData, Tcl_Interp *interp, + int objc, Tcl_Obj *CONST objv[]) +{ + Tcl_Obj *objp; + char *hdata, *property; + const char *result; + int i; + + /* make C compiler happy */ + (void) clientData; + + if (!tcl_current_script || !tcl_current_script->name) + { + WEECHAT_SCRIPT_MSG_NOT_INIT(TCL_CURRENT_SCRIPT_NAME, "hdata_get_string"); + TCL_RETURN_EMPTY; + } + + if (objc < 3) + { + WEECHAT_SCRIPT_MSG_WRONG_ARGS(TCL_CURRENT_SCRIPT_NAME, "hdata_get_string"); + TCL_RETURN_EMPTY; + } + + hdata = Tcl_GetStringFromObj (objv[1], &i); + property = Tcl_GetStringFromObj (objv[2], &i); + + result = weechat_hdata_get_string (script_str2ptr (hdata), property); + + TCL_RETURN_STRING(result); +} + +/* * weechat_tcl_api_upgrade_new: create an upgrade file */ @@ -7862,6 +8264,26 @@ void weechat_tcl_api_init (Tcl_Interp *interp) weechat_tcl_api_infolist_time, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); Tcl_CreateObjCommand (interp, "weechat::infolist_free", weechat_tcl_api_infolist_free, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); + Tcl_CreateObjCommand (interp, "weechat::hdata_get", + weechat_tcl_api_hdata_get, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); + Tcl_CreateObjCommand (interp, "weechat::hdata_get_var_type_string", + weechat_tcl_api_hdata_get_var_type_string, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); + Tcl_CreateObjCommand (interp, "weechat::hdata_get_list", + weechat_tcl_api_hdata_get_list, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); + Tcl_CreateObjCommand (interp, "weechat::hdata_move", + weechat_tcl_api_hdata_move, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); + Tcl_CreateObjCommand (interp, "weechat::hdata_integer", + weechat_tcl_api_hdata_integer, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); + Tcl_CreateObjCommand (interp, "weechat::hdata_long", + weechat_tcl_api_hdata_long, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); + Tcl_CreateObjCommand (interp, "weechat::hdata_string", + weechat_tcl_api_hdata_string, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); + Tcl_CreateObjCommand (interp, "weechat::hdata_pointer", + weechat_tcl_api_hdata_pointer, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); + Tcl_CreateObjCommand (interp, "weechat::hdata_time", + weechat_tcl_api_hdata_time, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); + Tcl_CreateObjCommand (interp, "weechat::hdata_get_string", + weechat_tcl_api_hdata_get_string, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); Tcl_CreateObjCommand (interp, "weechat::upgrade_new", weechat_tcl_api_upgrade_new, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); Tcl_CreateObjCommand (interp, "weechat::upgrade_write_object", |