general options are now configurable per screen

This commit is contained in:
Julien Danjou 2007-11-11 12:02:16 +01:00
parent 9d6a985a02
commit 1c9c2b9309
2 changed files with 11 additions and 12 deletions

View File

@ -1,17 +1,16 @@
# Configuration file for awesome # Configuration file for awesome
general
{
border = 1
snap = 8
resize_hints = true
opacity_unfocused = 100
focus_move_pointer = false
font = "fixed-12"
}
screen 0 screen 0
{ {
general
{
border = 1
snap = 8
resize_hints = true
opacity_unfocused = 100
focus_move_pointer = false
font = "fixed-12"
}
colors colors
{ {
normal_border = "#111111" normal_border = "#111111"

View File

@ -197,6 +197,7 @@ parse_config(const char *confpatharg, awesome_config *awesomeconf)
}; };
static cfg_opt_t screen_opts[] = static cfg_opt_t screen_opts[] =
{ {
CFG_SEC((char *) "general", general_opts, CFGF_NONE),
CFG_SEC((char *) "statusbar", statusbar_opts, CFGF_NONE), CFG_SEC((char *) "statusbar", statusbar_opts, CFGF_NONE),
CFG_SEC((char *) "tags", tags_opts, CFGF_NONE), CFG_SEC((char *) "tags", tags_opts, CFGF_NONE),
CFG_SEC((char *) "colors", colors_opts, CFGF_NONE), CFG_SEC((char *) "colors", colors_opts, CFGF_NONE),
@ -229,7 +230,6 @@ parse_config(const char *confpatharg, awesome_config *awesomeconf)
}; };
static cfg_opt_t opts[] = static cfg_opt_t opts[] =
{ {
CFG_SEC((char *) "general", general_opts, CFGF_NONE),
CFG_SEC((char *) "screen", screen_opts, CFGF_TITLE | CFGF_MULTI), CFG_SEC((char *) "screen", screen_opts, CFGF_TITLE | CFGF_MULTI),
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),
@ -281,9 +281,9 @@ parse_config(const char *confpatharg, awesome_config *awesomeconf)
cfg_statusbar = cfg_getsec(cfg_screen, "statusbar"); cfg_statusbar = cfg_getsec(cfg_screen, "statusbar");
cfg_tags = cfg_getsec(cfg_screen, "tags"); cfg_tags = cfg_getsec(cfg_screen, "tags");
cfg_colors = cfg_getsec(cfg_screen, "colors"); cfg_colors = cfg_getsec(cfg_screen, "colors");
cfg_general = cfg_getsec(cfg_screen, "general");
/* get general sections */ /* get general sections */
cfg_general = cfg_getsec(cfg, "general");
cfg_layouts = cfg_getsec(cfg, "layouts"); cfg_layouts = cfg_getsec(cfg, "layouts");
cfg_rules = cfg_getsec(cfg, "rules"); cfg_rules = cfg_getsec(cfg, "rules");
cfg_keys = cfg_getsec(cfg, "keys"); cfg_keys = cfg_getsec(cfg, "keys");