Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wrapped lua_[gs]etfenv into luaA_[gs]etuservalue 

Lua 5.2 removed lua_[gs]etfenv and introduced
lua_[gs]etuservalue. Not sure though if it provides
the required functionality which awesome is using.
Thus, need some testing.

Signed-off-by: Arvydas Sidorenko <asido4@gmail.com>
This commit is contained in:
Arvydas Sidorenko 2012-06-07 09:15:48 +02:00 committed by Julien Danjou
parent 172d000679
commit 47e21ad3cc
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/luaobject.h
View File

@ -23,6 +23,7 @@
#define AWESOME_COMMON_LUAOBJECT #define AWESOME_COMMON_LUAOBJECT
#include "common/luaclass.h" #include "common/luaclass.h"
#include "luaa.h"
#define LUAA_OBJECT_REGISTRY_KEY "awesome.object.registry" #define LUAA_OBJECT_REGISTRY_KEY "awesome.object.registry"
@ -41,7 +42,7 @@ static inline void *
luaA_object_ref_item(lua_State *L, int ud, int iud) luaA_object_ref_item(lua_State *L, int ud, int iud)
{ {
/* Get the env table from the object */ /* Get the env table from the object */
lua_getfenv(L, ud); luaA_getuservalue(L, ud);
void *pointer = luaA_object_incref(L, -1, iud < 0 ? iud - 1 : iud); void *pointer = luaA_object_incref(L, -1, iud < 0 ? iud - 1 : iud);
/* Remove env table */ /* Remove env table */
lua_pop(L, 1); lua_pop(L, 1);
@ -57,7 +58,7 @@ static inline void
luaA_object_unref_item(lua_State *L, int ud, void *pointer) luaA_object_unref_item(lua_State *L, int ud, void *pointer)
{ {
/* Get the env table from the object */ /* Get the env table from the object */
lua_getfenv(L, ud); luaA_getuservalue(L, ud);
/* Decrement */ /* Decrement */
luaA_object_decref(L, -1, pointer); luaA_object_decref(L, -1, pointer);
/* Remove env table */ /* Remove env table */
@ -74,7 +75,7 @@ static inline int
luaA_object_push_item(lua_State *L, int ud, void *pointer) luaA_object_push_item(lua_State *L, int ud, void *pointer)
{ {
/* Get env table of the object */ /* Get env table of the object */
lua_getfenv(L, ud); luaA_getuservalue(L, ud);
/* Push key */ /* Push key */
lua_pushlightuserdata(L, pointer); lua_pushlightuserdata(L, pointer);
/* Get env.pointer */ /* Get env.pointer */
@ -172,7 +173,7 @@ int luaA_object_emit_signal_simple(lua_State *);
lua_newtable(L); \ lua_newtable(L); \
lua_newtable(L); \ lua_newtable(L); \
lua_setmetatable(L, -2); \ lua_setmetatable(L, -2); \
lua_setfenv(L, -2); \ luaA_setuservalue(L, -2); \
lua_pushvalue(L, -1); \ lua_pushvalue(L, -1); \
/** @todo This is wrong we shouldn't copy the existing signals from */ \ /** @todo This is wrong we shouldn't copy the existing signals from */ \
/* the class, but I'm too lazy for doing this correctly right now. */ \ /* the class, but I'm too lazy for doing this correctly right now. */ \

20
luaa.h
View File

@ -74,6 +74,26 @@ luaA_typerror(lua_State *L, int narg, const char *tname)
return luaL_argerror(L, narg, msg); return luaL_argerror(L, narg, msg);
} }
static inline void
luaA_getuservalue(lua_State *L, int idx)
{
#if LUA_VERSION_NUM >= 502
lua_getuservalue(L, idx);
#else
lua_getfenv(L, idx);
#endif
}
static inline void
luaA_setuservalue(lua_State *L, int idx)
{
#if LUA_VERSION_NUM >= 502
lua_setuservalue(L, idx);
#else
lua_setfenv(L, idx);
#endif
}
static inline bool static inline bool
luaA_checkboolean(lua_State *L, int n) luaA_checkboolean(lua_State *L, int n)
{ {