godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config: Rename variables -> alias in the configuration file

Browse Source
This commit is contained in:
Martin Duquesnoy
2008-12-03 17:01:56 +01:00
parent d39dbe658d
commit 9f177d8d4b
5 changed files with 59 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/client.c
View File

@@ -495,6 +495,7 @@ client_moveresize(Client *c, XRectangle geo, bool r)
frame_moveresize(c, geo); frame_moveresize(c, geo);
XMoveResizeWindow(dpy, c->win, BORDH, BORDH + TBARH, geo.width, geo.height); XMoveResizeWindow(dpy, c->win, BORDH, BORDH + TBARH, geo.width, geo.height);
XSync(dpy, False); XSync(dpy, False);
} }

107
src/config.c
View File

@@ -37,13 +37,14 @@
cfg_t *cfg; cfg_t *cfg;
cfg_t *cfg_misc; cfg_t *cfg_misc;
cfg_t *cfg_bar; cfg_t *cfg_bar;
cfg_t *cfg_variables; cfg_t *cfg_alias;
cfg_t *cfg_root; cfg_t *cfg_root;
cfg_t *cfg_client; cfg_t *cfg_client;
cfg_t *cfg_layouts; cfg_t *cfg_layouts;
cfg_t *cfg_tags; cfg_t *cfg_tags;
cfg_t *cfg_keys; cfg_t *cfg_keys;
cfg_t *cfgtmp; cfg_t *cfgtmp;
Alias *confalias;
static cfg_opt_t misc_opts[] = static cfg_opt_t misc_opts[] =
{ {
@@ -151,28 +152,28 @@ static cfg_opt_t keys_opts[] =
CFG_END() CFG_END()
}; };
static cfg_opt_t variable_opts[] = static cfg_opt_t _alias_opts[] =
{ {
CFG_STR("content", "", CFGF_NONE), CFG_STR("content", "", CFGF_NONE),
CFG_END() CFG_END()
}; };
static cfg_opt_t variables_opts[] = static cfg_opt_t alias_opts[] =
{ {
CFG_SEC("var", variable_opts, CFGF_TITLE | CFGF_MULTI), CFG_SEC("alias", _alias_opts, CFGF_TITLE | CFGF_MULTI),
CFG_END() CFG_END()
}; };
static cfg_opt_t opts[] = static cfg_opt_t opts[] =
{ {
CFG_SEC("misc", misc_opts, CFGF_NONE), CFG_SEC("misc", misc_opts, CFGF_NONE),
CFG_SEC("variables", variables_opts, CFGF_NONE), CFG_SEC("alias", alias_opts, CFGF_NONE),
CFG_SEC("root", root_opts, CFGF_NONE), CFG_SEC("root", root_opts, CFGF_NONE),
CFG_SEC("client", client_opts, CFGF_NONE), CFG_SEC("client", client_opts, CFGF_NONE),
CFG_SEC("bar", bar_opts, CFGF_NONE), CFG_SEC("bar", bar_opts, CFGF_NONE),
CFG_SEC("layouts", layouts_opts, CFGF_NONE), CFG_SEC("layouts", layouts_opts, CFGF_NONE),
CFG_SEC("tags", tags_opts, CFGF_NONE), CFG_SEC("tags", tags_opts, CFGF_NONE),
CFG_SEC("keys", keys_opts, CFGF_NONE), CFG_SEC("keys", keys_opts, CFGF_NONE),
CFG_END() CFG_END()
}; };
@@ -292,7 +293,7 @@ layout_name_to_struct(Layout lt[], char *name, int n)
} }
char* char*
var_to_str(char *conf_choice) alias_to_str(char *conf_choice)
{ {
int i; int i;
char *tmpchar = NULL; char *tmpchar = NULL;
@@ -300,9 +301,9 @@ var_to_str(char *conf_choice)
if(!conf_choice) if(!conf_choice)
return 0; return 0;
for(i = 0; confvar[i].name; i++) for(i = 0; confalias[i].name; i++)
if(!strcmp(conf_choice, confvar[i].name)) if(!strcmp(conf_choice, confalias[i].name))
tmpchar = confvar[i].content; tmpchar = confalias[i].content;
if(tmpchar) if(tmpchar)
return strdup(tmpchar); return strdup(tmpchar);
else else
@@ -323,7 +324,7 @@ mouse_section(MouseBinding mb[], cfg_t *cfg, int ns)
mb[i].tag = cfg_getint(tmp, "tag"); mb[i].tag = cfg_getint(tmp, "tag");
mb[i].button = char_to_button(cfg_getstr(tmp, "button")); mb[i].button = char_to_button(cfg_getstr(tmp, "button"));
mb[i].func = name_to_func(cfg_getstr(tmp, "func"), func_list); mb[i].func = name_to_func(cfg_getstr(tmp, "func"), func_list);
mb[i].cmd = strdup(var_to_str(cfg_getstr(tmp, "cmd"))); mb[i].cmd = strdup(alias_to_str(cfg_getstr(tmp, "cmd")));
} }
return; return;
@@ -355,40 +356,40 @@ init_conf(void)
ret = cfg_parse(cfg, final_path); ret = cfg_parse(cfg, final_path);
} }
cfg_misc = cfg_getsec(cfg, "misc"); cfg_misc = cfg_getsec(cfg, "misc");
cfg_variables = cfg_getsec(cfg, "variables"); cfg_alias = cfg_getsec(cfg, "alias");
cfg_root = cfg_getsec(cfg, "root"); cfg_root = cfg_getsec(cfg, "root");
cfg_client = cfg_getsec(cfg, "client"); cfg_client = cfg_getsec(cfg, "client");
cfg_bar = cfg_getsec(cfg, "bar"); cfg_bar = cfg_getsec(cfg, "bar");
cfg_layouts = cfg_getsec(cfg, "layouts"); cfg_layouts = cfg_getsec(cfg, "layouts");
cfg_tags = cfg_getsec(cfg, "tags"); cfg_tags = cfg_getsec(cfg, "tags");
cfg_keys = cfg_getsec(cfg, "keys"); cfg_keys = cfg_getsec(cfg, "keys");
if((cfg_size(cfg_variables, "var")) > 256) /* alias */
if(cfg_size(cfg_alias, "alias"))
{ {
fprintf(stderr,"WMFS Configuration: Too many variables !\n"); confalias = emalloc(cfg_size(cfg_alias, "alias"), sizeof(Alias));
exit(EXIT_FAILURE);
}
for(i = 0; i < cfg_size(cfg_variables, "var"); ++i) for(i = 0; i < cfg_size(cfg_alias, "alias"); ++i)
{ {
cfgtmp = cfg_getnsec(cfg_variables, "var", i); cfgtmp = cfg_getnsec(cfg_alias, "alias", i);
confvar[i].name = strdup(cfg_title(cfgtmp)); confalias[i].name = strdup(cfg_title(cfgtmp));
confvar[i].content = strdup(cfg_getstr(cfgtmp, "content")); confalias[i].content = strdup(cfg_getstr(cfgtmp, "content"));
}
} }
/* misc */ /* misc */
conf.font = var_to_str(strdup(cfg_getstr(cfg_misc, "font"))); conf.font = alias_to_str(strdup(cfg_getstr(cfg_misc, "font")));
conf.raisefocus = cfg_getbool(cfg_misc, "raisefocus"); conf.raisefocus = cfg_getbool(cfg_misc, "raisefocus");
conf.raiseswitch = cfg_getbool(cfg_misc, "raiseswitch"); conf.raiseswitch = cfg_getbool(cfg_misc, "raiseswitch");
/* bar */ /* bar */
conf.colors.bar = getcolor(var_to_str(cfg_getstr(cfg_bar, "bg"))); conf.colors.bar = getcolor(alias_to_str(cfg_getstr(cfg_bar, "bg")));
conf.colors.text = strdup(var_to_str(cfg_getstr(cfg_bar, "fg"))); conf.colors.text = strdup(alias_to_str(cfg_getstr(cfg_bar, "fg")));
conf.bartop = (strcmp(strdup(cfg_getstr(cfg_bar, "position")), "top") == 0) ? True : False; conf.bartop = (strcmp(strdup(cfg_getstr(cfg_bar, "position")), "top") == 0) ? True : False;
/* root */ /* root */
conf.root.background_command = strdup(var_to_str(cfg_getstr(cfg_root, "background_command"))); conf.root.background_command = strdup(alias_to_str(cfg_getstr(cfg_root, "background_command")));
conf.root.nmouse = cfg_size(cfg_root, "mouse"); conf.root.nmouse = cfg_size(cfg_root, "mouse");
conf.root.mouse = emalloc(conf.root.nmouse, sizeof(MouseBinding)); conf.root.mouse = emalloc(conf.root.nmouse, sizeof(MouseBinding));
mouse_section(conf.root.mouse, cfg_root, conf.root.nmouse); mouse_section(conf.root.mouse, cfg_root, conf.root.nmouse);
@@ -397,10 +398,10 @@ init_conf(void)
conf.client.borderheight = (cfg_getint(cfg_client, "border_height")) conf.client.borderheight = (cfg_getint(cfg_client, "border_height"))
? cfg_getint(cfg_client, "border_height") : 1; ? cfg_getint(cfg_client, "border_height") : 1;
conf.client.place_at_mouse = cfg_getbool(cfg_client, "place_at_mouse"); conf.client.place_at_mouse = cfg_getbool(cfg_client, "place_at_mouse");
conf.client.bordernormal = getcolor(var_to_str(cfg_getstr(cfg_client, "border_normal"))); conf.client.bordernormal = getcolor(alias_to_str(cfg_getstr(cfg_client, "border_normal")));
conf.client.borderfocus = getcolor(var_to_str(cfg_getstr(cfg_client, "border_focus"))); conf.client.borderfocus = getcolor(alias_to_str(cfg_getstr(cfg_client, "border_focus")));
conf.client.resizecorner_normal = getcolor(var_to_str(cfg_getstr(cfg_client, "resize_corner_normal"))); conf.client.resizecorner_normal = getcolor(alias_to_str(cfg_getstr(cfg_client, "resize_corner_normal")));
conf.client.resizecorner_focus = getcolor(var_to_str(cfg_getstr(cfg_client, "resize_corner_focus"))); conf.client.resizecorner_focus = getcolor(alias_to_str(cfg_getstr(cfg_client, "resize_corner_focus")));
conf.client.mod |= char_to_modkey(cfg_getstr(cfg_client, "modifier")); conf.client.mod |= char_to_modkey(cfg_getstr(cfg_client, "modifier"));
conf.client.nmouse = cfg_size(cfg_client, "mouse"); conf.client.nmouse = cfg_size(cfg_client, "mouse");
conf.client.mouse = emalloc(conf.client.nmouse, sizeof(MouseBinding)); conf.client.mouse = emalloc(conf.client.nmouse, sizeof(MouseBinding));
@@ -409,7 +410,7 @@ init_conf(void)
/* titlebar (into the client section) */ /* titlebar (into the client section) */
cfgtmp = cfg_getsec(cfg_client, "titlebar"); cfgtmp = cfg_getsec(cfg_client, "titlebar");
conf.titlebar.height = cfg_getint(cfgtmp, "height"); conf.titlebar.height = cfg_getint(cfgtmp, "height");
conf.titlebar.fg = var_to_str(cfg_getstr(cfgtmp, "fg")); conf.titlebar.fg = alias_to_str(cfg_getstr(cfgtmp, "fg"));
conf.titlebar.nmouse = cfg_size(cfgtmp, "mouse"); conf.titlebar.nmouse = cfg_size(cfgtmp, "mouse");
conf.titlebar.mouse = emalloc(conf.titlebar.nmouse, sizeof(MouseBinding)); conf.titlebar.mouse = emalloc(conf.titlebar.nmouse, sizeof(MouseBinding));
mouse_section(conf.titlebar.mouse, cfgtmp, conf.titlebar.nmouse); mouse_section(conf.titlebar.mouse, cfgtmp, conf.titlebar.nmouse);
@@ -422,8 +423,8 @@ init_conf(void)
conf.layout[i].func = NULL; conf.layout[i].func = NULL;
} }
conf.colors.layout_fg = strdup(var_to_str(cfg_getstr(cfg_layouts, "fg"))); conf.colors.layout_fg = strdup(alias_to_str(cfg_getstr(cfg_layouts, "fg")));
conf.colors.layout_bg = getcolor(var_to_str(cfg_getstr(cfg_layouts, "bg"))); conf.colors.layout_bg = getcolor(alias_to_str(cfg_getstr(cfg_layouts, "bg")));
if((conf.nlayout = cfg_size(cfg_layouts, "layout")) > NUM_OF_LAYOUT if((conf.nlayout = cfg_size(cfg_layouts, "layout")) > NUM_OF_LAYOUT
|| !(conf.nlayout = cfg_size(cfg_layouts, "layout"))) || !(conf.nlayout = cfg_size(cfg_layouts, "layout")))
@@ -448,7 +449,7 @@ init_conf(void)
} }
else else
{ {
conf.layout[i].symbol = strdup(var_to_str(cfg_getstr(cfgtmp, "symbol"))); conf.layout[i].symbol = strdup(alias_to_str(cfg_getstr(cfgtmp, "symbol")));
conf.layout[i].func = name_to_func(strdup(cfg_getstr(cfgtmp, "type")), layout_list); conf.layout[i].func = name_to_func(strdup(cfg_getstr(cfgtmp, "type")), layout_list);
} }
} }
@@ -459,10 +460,10 @@ init_conf(void)
* MAXTAG (32) print an error and create only one. * MAXTAG (32) print an error and create only one.
*/ */
conf.tag_round = cfg_getbool(cfg_tags, "tag_round"); conf.tag_round = cfg_getbool(cfg_tags, "tag_round");
conf.colors.tagselfg = strdup(var_to_str(cfg_getstr(cfg_tags, "sel_fg"))); conf.colors.tagselfg = strdup(alias_to_str(cfg_getstr(cfg_tags, "sel_fg")));
conf.colors.tagselbg = getcolor(var_to_str(cfg_getstr(cfg_tags, "sel_bg"))); conf.colors.tagselbg = getcolor(alias_to_str(cfg_getstr(cfg_tags, "sel_bg")));
conf.colors.tag_occupied_bg = getcolor(var_to_str(cfg_getstr(cfg_tags, "occupied_bg"))); conf.colors.tag_occupied_bg = getcolor(alias_to_str(cfg_getstr(cfg_tags, "occupied_bg")));
conf.colors.tagbord = getcolor(var_to_str(cfg_getstr(cfg_tags, "border"))); conf.colors.tagbord = getcolor(alias_to_str(cfg_getstr(cfg_tags, "border")));
/* Alloc all */ /* Alloc all */
conf.ntag = emalloc(screen_count(), sizeof(int)); conf.ntag = emalloc(screen_count(), sizeof(int));
@@ -522,11 +523,11 @@ init_conf(void)
cfg_getstr(cfgtmp, "func")); cfg_getstr(cfgtmp, "func"));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
keys[j].cmd = (!strdup(var_to_str((cfg_getstr(cfgtmp, "cmd")))) keys[j].cmd = (!strdup(alias_to_str((cfg_getstr(cfgtmp, "cmd"))))
? NULL : strdup(var_to_str(cfg_getstr(cfgtmp, "cmd")))); ? NULL : strdup(alias_to_str(cfg_getstr(cfgtmp, "cmd"))));
} }
cfg_free(cfg); cfg_free(cfg);
free(confalias);
return; return;
} }

2
src/structs.h
View File

@@ -235,6 +235,6 @@ typedef struct
{ {
char *name; char *name;
char *content; char *content;
} Variable; } Alias;
#endif /* STRUCTS_H */ #endif /* STRUCTS_H */

2
src/wmfs.h
View File

@@ -257,7 +257,7 @@ Client *sel;
/* Other */ /* Other */
uint numlockmask; uint numlockmask;
Variable confvar[256]; Alias *confalias;
#endif /* WMFS_H */ #endif /* WMFS_H */

4
wmfsrc
View File

@@ -1,8 +1,8 @@
# WMFS config file # WMFS config file
variables alias
{ {
var term { content = "urxvt" } alias term { content = "urxvt" }
} }
misc misc