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

[statusbar] Use new userdata fct 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-06-08 18:05:32 +02:00
parent 59c04890fc
commit 8078d45da1
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
statusbar.c
View File

@ -429,46 +429,42 @@ luaA_statusbar_remove(lua_State *L)
static int static int
luaA_statusbar_new(lua_State *L) luaA_statusbar_new(lua_State *L)
{ {
statusbar_t **sb = lua_newuserdata(L, sizeof(statusbar_t *)); statusbar_t *sb;
int objpos = lua_gettop(L);
const char *color; const char *color;
luaA_checktable(L, 1); luaA_checktable(L, 1);
*sb = p_new(statusbar_t, 1); sb = p_new(statusbar_t, 1);
(*sb)->name = luaA_name_init(L); sb->name = luaA_name_init(L);
lua_getfield(L, 1, "fg"); lua_getfield(L, 1, "fg");
if((color = luaL_optstring(L, -1, NULL))) if((color = luaL_optstring(L, -1, NULL)))
xcolor_new(globalconf.connection, globalconf.default_screen, xcolor_new(globalconf.connection, globalconf.default_screen,
color, &(*sb)->colors.fg); color, &sb->colors.fg);
else else
(*sb)->colors.fg = globalconf.colors.fg; sb->colors.fg = globalconf.colors.fg;
lua_getfield(L, 1, "bg"); lua_getfield(L, 1, "bg");
if((color = luaL_optstring(L, -1, NULL))) if((color = luaL_optstring(L, -1, NULL)))
xcolor_new(globalconf.connection, globalconf.default_screen, xcolor_new(globalconf.connection, globalconf.default_screen,
color, &(*sb)->colors.bg); color, &sb->colors.bg);
else else
(*sb)->colors.bg = globalconf.colors.bg; sb->colors.bg = globalconf.colors.bg;
(*sb)->align = draw_align_get_from_str(luaA_getopt_string(L, 1, "align", "left")); sb->align = draw_align_get_from_str(luaA_getopt_string(L, 1, "align", "left"));
(*sb)->width = luaA_getopt_number(L, 1, "width", 0); sb->width = luaA_getopt_number(L, 1, "width", 0);
if((*sb)->width > 0) if(sb->width > 0)
(*sb)->width_user = true; sb->width_user = true;
(*sb)->height = luaA_getopt_number(L, 1, "height", 0); sb->height = luaA_getopt_number(L, 1, "height", 0);
if((*sb)->height <= 0) if(sb->height <= 0)
/* 1.5 as default factor, it fits nice but no one knows why */ /* 1.5 as default factor, it fits nice but no one knows why */
(*sb)->height = 1.5 * globalconf.font->height; sb->height = 1.5 * globalconf.font->height;
(*sb)->position = position_get_from_str(luaA_getopt_string(L, 1, "position", "top")); sb->position = position_get_from_str(luaA_getopt_string(L, 1, "position", "top"));
statusbar_ref(sb); return luaA_statusbar_userdata_new(sb);
lua_pushvalue(L, objpos);
return luaA_settype(L, "statusbar");
} }
/** Create a new statusbar userdata. /** Create a new statusbar userdata.