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

Implement per screen configuration for statusbar. 

Others will come later.
This commit is contained in:
Julien Danjou 2007-11-09 14:45:43 +01:00
parent f8c885aac5
commit 6fae35349a
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awesomerc
View File

@ -21,10 +21,13 @@ colors
tab_border = "#ff0000" tab_border = "#ff0000"
} }
screen 0
{
statusbar statusbar
{ {
position = "top" position = "top"
} }
}
tags tags
{ {

21
config.c
View File

@ -201,6 +201,10 @@ parse_config(const char *confpatharg, awesome_config *awesomeconf)
CFG_INT((char *) "ncol", 1, CFGF_NONE), CFG_INT((char *) "ncol", 1, CFGF_NONE),
CFG_END() CFG_END()
}; };
static cfg_opt_t screen_opts[] =
{
CFG_SEC((char *) "statusbar", statusbar_opts, CFGF_NONE),
};
static cfg_opt_t rule_opts[] = static cfg_opt_t rule_opts[] =
{ {
CFG_STR((char *) "name", (char *) "", CFGF_NONE), CFG_STR((char *) "name", (char *) "", CFGF_NONE),
@ -231,19 +235,19 @@ parse_config(const char *confpatharg, awesome_config *awesomeconf)
{ {
CFG_SEC((char *) "general", general_opts, CFGF_NONE), CFG_SEC((char *) "general", general_opts, CFGF_NONE),
CFG_SEC((char *) "colors", colors_opts, CFGF_NONE), CFG_SEC((char *) "colors", colors_opts, CFGF_NONE),
CFG_SEC((char *) "statusbar", statusbar_opts, CFGF_NONE), CFG_SEC((char *) "screen", screen_opts, CFGF_TITLE | CFGF_MULTI),
CFG_SEC((char *) "tags", tags_opts, CFGF_NONE), CFG_SEC((char *) "tags", tags_opts, CFGF_NONE),
CFG_SEC((char *) "layouts", layouts_opts, CFGF_NONE), CFG_SEC((char *) "layouts", layouts_opts, CFGF_NONE),
CFG_SEC((char *) "rules", rules_opts, CFGF_NONE), CFG_SEC((char *) "rules", rules_opts, CFGF_NONE),
CFG_SEC((char *) "keys", keys_opts, CFGF_NONE), CFG_SEC((char *) "keys", keys_opts, CFGF_NONE),
CFG_END() CFG_END()
}; };
cfg_t *cfg, *cfg_general, *cfg_colors, *cfg_statusbar, cfg_t *cfg, *cfg_general, *cfg_colors, *cfg_screen, *cfg_statusbar,
*cfg_tags, *cfg_layouts, *cfg_rules, *cfg_keys, *cfgsectmp; *cfg_tags, *cfg_layouts, *cfg_rules, *cfg_keys, *cfgsectmp;
int i = 0, k = 0, ret; int i = 0, k = 0, ret;
unsigned int j = 0; unsigned int j = 0;
const char *tmp, *homedir; const char *tmp, *homedir;
char *confpath; char *confpath, buf[2];
KeySym tmp_key; KeySym tmp_key;
ssize_t confpath_len; ssize_t confpath_len;
@ -273,9 +277,18 @@ parse_config(const char *confpatharg, awesome_config *awesomeconf)
else if(ret == CFG_PARSE_ERROR) else if(ret == CFG_PARSE_ERROR)
cfg_error(cfg, "awesome: parsing configuration file %s failed.\n", confpath); cfg_error(cfg, "awesome: parsing configuration file %s failed.\n", confpath);
/* get the right screen section */
snprintf(buf, sizeof(buf), "%d", awesomeconf->screen);
cfg_screen = cfg_gettsec(cfg, "screen", buf);
if(!cfg_screen)
cfg_screen = cfg_getsec(cfg, "screen");
/* get screen specific sections */
cfg_statusbar = cfg_getsec(cfg_screen, "statusbar");
/* get general sections */
cfg_general = cfg_getsec(cfg, "general"); cfg_general = cfg_getsec(cfg, "general");
cfg_colors = cfg_getsec(cfg, "colors"); cfg_colors = cfg_getsec(cfg, "colors");
cfg_statusbar = cfg_getsec(cfg, "statusbar");
cfg_tags = cfg_getsec(cfg, "tags"); cfg_tags = cfg_getsec(cfg, "tags");
cfg_layouts = cfg_getsec(cfg, "layouts"); cfg_layouts = cfg_getsec(cfg, "layouts");
cfg_rules = cfg_getsec(cfg, "rules"); cfg_rules = cfg_getsec(cfg, "rules");