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

tag: use index for name 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-07-01 14:31:47 +02:00
parent e012a4ba49
commit 282dc95042
2 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/tokenize.gperf
View File

@ -24,6 +24,7 @@ line
mwfact mwfact
ncol ncol
nmaster nmaster
name
on on
plot_data_add plot_data_add
plot_properties_set plot_properties_set

46
tag.c
View File

@ -338,38 +338,6 @@ luaA_tag_new(lua_State *L)
return luaA_tag_userdata_new(L, tag); return luaA_tag_userdata_new(L, tag);
} }
/** Get the tag name.
* \param L The Lua VM state.
*
* \luastack
* \lvalue A tag.
* \lreturn The tag name.
*/
static int
luaA_tag_name_get(lua_State *L)
{
tag_t **tag = luaA_checkudata(L, 1, "tag");
lua_pushstring(L, (*tag)->name);
return 1;
}
/** Set the tag name.
* \param L The Lua VM state.
*
* \luastack
* \lvalue A tag.
* \lparam A string with the new tag name.
*/
static int
luaA_tag_name_set(lua_State *L)
{
tag_t **tag = luaA_checkudata(L, 1, "tag");
const char *name = luaL_checkstring(L, 2);
p_delete(&(*tag)->name);
a_iso2utf8(name, &(*tag)->name);
return 0;
}
/** Get the layout of the tag. /** Get the layout of the tag.
* \param L The Lua VM state. * \param L The Lua VM state.
* *
@ -437,6 +405,9 @@ luaA_tag_index(lua_State *L)
switch(a_tokenize(attr, len)) switch(a_tokenize(attr, len))
{ {
case A_TK_NAME:
lua_pushstring(L, (*tag)->name);
break;
case A_TK_SELECTED: case A_TK_SELECTED:
lua_pushboolean(L, (*tag)->selected); lua_pushboolean(L, (*tag)->selected);
break; break;
@ -465,12 +436,19 @@ luaA_tag_newindex(lua_State *L)
{ {
size_t len; size_t len;
tag_t **tag = luaA_checkudata(L, 1, "tag"); tag_t **tag = luaA_checkudata(L, 1, "tag");
const char *attr = luaL_checklstring(L, 2, &len); const char *buf, *attr = luaL_checklstring(L, 2, &len);
double d; double d;
int i; int i;
switch(a_tokenize(attr, len)) switch(a_tokenize(attr, len))
{ {
case A_TK_NAME:
buf = luaL_checkstring(L, 3);
p_delete(&(*tag)->name);
a_iso2utf8(buf, &(*tag)->name);
if((*tag)->screen != TAG_SCREEN_UNDEF)
widget_invalidate_cache((*tag)->screen, WIDGET_CACHE_TAGS);
return 0;
case A_TK_SELECTED: case A_TK_SELECTED:
tag_view(*tag, luaA_checkboolean(L, 3)); tag_view(*tag, luaA_checkboolean(L, 3));
return 0; return 0;
@ -516,8 +494,6 @@ const struct luaL_reg awesome_tag_methods[] =
const struct luaL_reg awesome_tag_meta[] = const struct luaL_reg awesome_tag_meta[] =
{ {
{ "add", luaA_tag_add }, { "add", luaA_tag_add },
{ "name_get", luaA_tag_name_get },
{ "name_set", luaA_tag_name_set },
{ "layout_get", luaA_tag_layout_get }, { "layout_get", luaA_tag_layout_get },
{ "layout_set", luaA_tag_layout_set }, { "layout_set", luaA_tag_layout_set },
{ "__index", luaA_tag_index }, { "__index", luaA_tag_index },