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

Use WidgetList for lookups, rather than recreating the data.

This commit is contained in:
Aldo Cortesi 2007-12-17 18:08:06 +11:00 committed by Julien Danjou
parent 86521c57a6
commit ff84907b38
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
config.c
View File

@ -271,30 +271,22 @@ cmp_widget_cfg(const void *a, const void *b)
static void static void
create_widgets(cfg_t* cfg_statusbar, Statusbar *statusbar) create_widgets(cfg_t* cfg_statusbar, Statusbar *statusbar)
{ {
static const char *widget_names[] =
{
"focustitle",
"layoutinfo",
"taglist",
"textbox",
};
cfg_t* widgets, *wptr; cfg_t* widgets, *wptr;
Widget *widget = NULL; Widget *widget = NULL;
unsigned int i, j, numnames, numwidgets = 0; unsigned int i, j, numwidgets = 0;
WidgetConstructor *widget_new; WidgetConstructor *widget_new;
numnames = sizeof(widget_names)/sizeof(widget_names[0]); for(i = 0; WidgetList[i].name; i++)
for (i = 0; i < numnames; i++) numwidgets += cfg_size(cfg_statusbar, WidgetList[i].name);
numwidgets += cfg_size(cfg_statusbar, widget_names[i]);
widgets = p_new(cfg_t, numwidgets); widgets = p_new(cfg_t, numwidgets);
wptr = widgets; wptr = widgets;
for (i = 0; i < numnames; i++) for(i = 0; WidgetList[i].name; i++)
for (j = 0; j < cfg_size(cfg_statusbar, widget_names[i]); j++) for (j = 0; j < cfg_size(cfg_statusbar, WidgetList[i].name); j++)
{ {
memcpy(wptr, memcpy(wptr,
cfg_getnsec(cfg_statusbar, widget_names[i], j), cfg_getnsec(cfg_statusbar, WidgetList[i].name, j),
sizeof(cfg_t)); sizeof(cfg_t));
wptr++; wptr++;
} }
@ -352,10 +344,15 @@ config_parse(const char *confpatharg)
{ {
CFG_END() CFG_END()
}; };
static cfg_opt_t widget_textbox_opts[] =
{
CFG_STR((char *) "default", (char *) NULL, CFGF_NONE),
CFG_END()
};
static cfg_opt_t statusbar_opts[] = static cfg_opt_t statusbar_opts[] =
{ {
CFG_STR((char *) "position", (char *) "top", CFGF_NONE), CFG_STR((char *) "position", (char *) "top", CFGF_NONE),
CFG_SEC((char *) "textbox", widget_opts, CFGF_TITLE | CFGF_MULTI), CFG_SEC((char *) "textbox", widget_textbox_opts, CFGF_TITLE | CFGF_MULTI),
CFG_SEC((char *) "taglist", widget_opts, CFGF_TITLE | CFGF_MULTI), CFG_SEC((char *) "taglist", widget_opts, CFGF_TITLE | CFGF_MULTI),
CFG_SEC((char *) "focustitle", widget_opts, CFGF_TITLE | CFGF_MULTI), CFG_SEC((char *) "focustitle", widget_opts, CFGF_TITLE | CFGF_MULTI),
CFG_SEC((char *) "layoutinfo", widget_opts, CFGF_TITLE | CFGF_MULTI), CFG_SEC((char *) "layoutinfo", widget_opts, CFGF_TITLE | CFGF_MULTI),