awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tag_client: Add explicit lua_State argument 

tag_client() said that it refers to the tag ontop of the lua stack. However, it
implicitly used globalconf.L as its stack. So if you tagged a client with a tag
from a coroutine, thinks would Go Wrong (tm). Fix this by adding an explicit
lua_State* argument.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2014-12-06 11:14:59 +01:00
parent d668268591
commit da15317ac2
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
objects/client.c
View File

@ -1384,7 +1384,7 @@ luaA_client_tags(lua_State *L)
} }
lua_pushnil(L); lua_pushnil(L);
while(lua_next(L, 2)) while(lua_next(L, 2))
tag_client(c); tag_client(L, c);
lua_pop(L, 1); lua_pop(L, 1);
} }

11
objects/tag.c
View File

@ -95,17 +95,18 @@ tag_client_emit_signal(lua_State *L, tag_t *t, client_t *c, const char *signame)
} }
/** Tag a client with the tag on top of the stack. /** Tag a client with the tag on top of the stack.
* \param L The Lua VM state.
* \param c the client to tag * \param c the client to tag
*/ */
void void
tag_client(client_t *c) tag_client(lua_State *L, client_t *c)
{ {
tag_t *t = luaA_object_ref_class(globalconf.L, -1, &tag_class); tag_t *t = luaA_object_ref_class(L, -1, &tag_class);
/* don't tag twice */ /* don't tag twice */
if(is_client_tagged(c, t)) if(is_client_tagged(c, t))
{ {
luaA_object_unref(globalconf.L, t); luaA_object_unref(L, t);
return; return;
} }
@ -113,7 +114,7 @@ tag_client(client_t *c)
ewmh_client_update_desktop(c); ewmh_client_update_desktop(c);
banning_need_update(); banning_need_update();
tag_client_emit_signal(globalconf.L, t, c, "tagged"); tag_client_emit_signal(L, t, c, "tagged");
} }
/** Untag a client with specified tag. /** Untag a client with specified tag.
@ -218,7 +219,7 @@ luaA_tag_clients(lua_State *L)
client_t *c = luaA_checkudata(L, -1, &client_class); client_t *c = luaA_checkudata(L, -1, &client_class);
/* push tag on top of the stack */ /* push tag on top of the stack */
lua_pushvalue(L, 1); lua_pushvalue(L, 1);
tag_client(c); tag_client(L, c);
lua_pop(L, 1); lua_pop(L, 1);
} }
} }

2
objects/tag.h
View File

@ -25,7 +25,7 @@
#include "client.h" #include "client.h"
int tags_get_first_selected_index(void); int tags_get_first_selected_index(void);
void tag_client(client_t *); void tag_client(lua_State *, client_t *);
void untag_client(client_t *, tag_t *); void untag_client(client_t *, tag_t *);
bool is_client_tagged(client_t *, tag_t *); bool is_client_tagged(client_t *, tag_t *);
void tag_unref_simplified(tag_t **); void tag_unref_simplified(tag_t **);