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

textbox: Stop using tokens for wrap and ellipsize 

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2010-09-01 15:52:39 +02:00
parent eae3e5b9c4
commit dc883f7cef
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
objects/widgets/textbox.c
View File

@ -428,38 +428,26 @@ luaA_textbox_newindex(lua_State *L, awesome_token_t token)
d->height = luaL_checknumber(L, 3);
break;
case A_TK_WRAP:
if((buf = luaL_checklstring(L, 3, &len)))
switch(a_tokenize(buf, len))
{
case A_TK_WORD:
if((buf = luaL_checkstring(L, 3)))
{
if(a_strcmp(buf, "word") == 0)
d->wrap = PANGO_WRAP_WORD;
break;
case A_TK_CHAR:
else if(a_strcmp(buf, "char") == 0)
d->wrap = PANGO_WRAP_CHAR;
break;
case A_TK_WORD_CHAR:
else if(a_strcmp(buf, "word_char") == 0)
d->wrap = PANGO_WRAP_WORD_CHAR;
break;
default:
break;
}
}
break;
case A_TK_ELLIPSIZE:
if((buf = luaL_checklstring(L, 3, &len)))
switch(a_tokenize(buf, len))
{
case A_TK_START:
if((buf = luaL_checkstring(L, 3)))
{
if(a_strcmp(buf, "start") == 0)
d->ellip = PANGO_ELLIPSIZE_START;
break;
case A_TK_MIDDLE:
else if(a_strcmp(buf, "middle") == 0)
d->ellip = PANGO_ELLIPSIZE_MIDDLE;
break;
case A_TK_END:
else if(a_strcmp(buf, "end") == 0)
d->ellip = PANGO_ELLIPSIZE_END;
break;
default:
break;
}
}
break;
default:
return 0;