From 4b412d86ff8aa0f5359ac5f31dbe18ba46d5d067 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Thu, 31 Jan 2008 16:34:00 +0100 Subject: [PATCH] split out config stuff --- Makefile.am | 2 +- awesome.c | 1 + common/configopts.c | 332 ++++++++++++++++++++++++++++++++++++++++++++ common/configopts.h | 283 ++++--------------------------------- config.c | 51 +------ config.h | 1 - 6 files changed, 363 insertions(+), 307 deletions(-) create mode 100644 common/configopts.c diff --git a/Makefile.am b/Makefile.am index af0e45864..a1ed5a3c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,7 +132,7 @@ awesome_SOURCES = \ ewmh.c ewmh.h \ common/list.h structs.h \ common/awclient.h \ - common/configopts.h + common/configopts.h common/configopts.c awesome_SOURCES += $(LAYOUTS) awesome_SOURCES += $(WIDGETS) awesome_LDADD = $(XFT_LIBS) $(X_LIBS) $(CAIRO_LIBS) $(CONFUSE_LIBS) $(XRANDR_LIBS) $(XINERAMA_LIBS) diff --git a/awesome.c b/awesome.c index cc85ddf4e..d7e8428b7 100644 --- a/awesome.c +++ b/awesome.c @@ -52,6 +52,7 @@ #include "common/awclient.h" #include "common/util.h" #include "common/awesome-version.h" +#include "common/configopts.h" static int (*xerrorxlib) (Display *, XErrorEvent *); static Bool running = True; diff --git a/common/configopts.c b/common/configopts.c new file mode 100644 index 000000000..947a72bb8 --- /dev/null +++ b/common/configopts.c @@ -0,0 +1,332 @@ +/* + * configopts.c - configuration options + * + * Copyright © 2007-2008 Julien Danjou + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include + +#include "rules.h" +#include "common/configopts.h" + +#define AWESOME_CONFIG_FILE ".awesomerc" + +cfg_opt_t general_opts[] = +{ + CFG_INT((char *) "border", 1, CFGF_NONE), + CFG_INT((char *) "snap", 8, CFGF_NONE), + CFG_BOOL((char *) "resize_hints", cfg_true, CFGF_NONE), + CFG_BOOL((char *) "sloppy_focus", cfg_true, CFGF_NONE), + CFG_BOOL((char *) "sloppy_focus_raise", cfg_false, CFGF_NONE), + CFG_BOOL((char *) "new_become_master", cfg_true, CFGF_NONE), + CFG_BOOL((char *) "new_get_focus", cfg_true, CFGF_NONE), + CFG_STR((char *) "font", (char *) "vera-10", CFGF_NONE), + CFG_END() +}; +cfg_opt_t colors_opts[] = +{ + CFG_STR((char *) "normal_border", (char *) "#111111", CFGF_NONE), + CFG_STR((char *) "normal_bg", (char *) "#111111", CFGF_NONE), + CFG_STR((char *) "normal_fg", (char *) "#eeeeee", CFGF_NONE), + CFG_STR((char *) "focus_border", (char *) "#6666ff", CFGF_NONE), + CFG_STR((char *) "focus_bg", (char *) "#6666ff", CFGF_NONE), + CFG_STR((char *) "focus_fg", (char *) "#ffffff", CFGF_NONE), + CFG_STR((char *) "urgent_bg", (char *) "#ff0000", CFGF_NONE), + CFG_STR((char *) "urgent_fg", (char *) "#ffffff", CFGF_NONE), + CFG_STR((char *) "tab_border", (char *) "#ff0000", CFGF_NONE), + CFG_END() +}; +cfg_opt_t mouse_taglist_opts[] = +{ + CFG_STR_LIST((char *) "modkey", (char *) "{}", CFGF_NONE), + CFG_STR((char *) "button", (char *) "None", CFGF_NONE), + CFG_STR((char *) "command", (char *) "", CFGF_NONE), + CFG_END() +}; +cfg_opt_t mouse_generic_opts[] = +{ + CFG_STR_LIST((char *) "modkey", (char *) "{}", CFGF_NONE), + CFG_STR((char *) "button", (char *) "None", CFGF_NONE), + CFG_STR((char *) "command", (char *) "", CFGF_NONE), + CFG_STR((char *) "arg", NULL, CFGF_NONE), + CFG_END() +}; +cfg_opt_t widget_opts[] = +{ + CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), + CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), + CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), + CFG_END() +}; +cfg_opt_t widget_taglist_opts[] = +{ + CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), + CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), + CFG_SEC((char *) "mouse", mouse_taglist_opts, CFGF_MULTI), + CFG_END() +}; +cfg_opt_t widget_iconbox_opts[] = +{ + CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), + CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), + CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), + CFG_STR((char *) "image", (char *) NULL, CFGF_NONE), + CFG_BOOL((char *) "resize", cfg_true, CFGF_NONE), + CFG_END() +}; +cfg_opt_t widget_textbox_opts[] = +{ + CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), + CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), + CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), + CFG_INT((char *) "width", 0, CFGF_NONE), + CFG_STR((char *) "text", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "fg", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "bg", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "font", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "align", (char *) "center", CFGF_NONE), + CFG_END() +}; +cfg_opt_t widget_focustitle_opts[] = +{ + CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), + CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), + CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), + CFG_STR((char *) "fg", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "bg", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "font", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "align", (char *) "left", CFGF_NONE), + CFG_END() +}; +cfg_opt_t widget_tasklist_opts[] = +{ + CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), + CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), + CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), + CFG_STR((char *) "fg", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "bg", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "focus_fg", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "focus_bg", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "font", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "align", (char *) "left", CFGF_NONE), + CFG_BOOL((char *) "show_icons", cfg_true, CFGF_NONE), + CFG_BOOL((char *) "show_all", cfg_false, CFGF_NONE), + CFG_END() +}; +cfg_opt_t widget_graph_data_opts[] = +{ + CFG_FLOAT((char *) "max", 100.0f, CFGF_NONE), + CFG_BOOL((char *) "scale", cfg_false, CFGF_NONE), + CFG_STR((char *) "fg", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "style", (char *) "bottom", CFGF_NONE), + CFG_END() +}; +cfg_opt_t widget_graph_opts[] = +{ + CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), + CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), + CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), + CFG_SEC((char *) "data", widget_graph_data_opts, CFGF_MULTI), + CFG_INT((char *) "width", 100, CFGF_NONE), + CFG_INT((char *) "padding_left", 0, CFGF_NONE), + CFG_FLOAT((char *) "height", 0.67, CFGF_NONE), + CFG_STR((char *) "bg", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "bordercolor", (char *) NULL, CFGF_NONE), + CFG_END() +}; +cfg_opt_t widget_progressbar_bar_opts[] = +{ + CFG_STR((char *) "fg", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "bg", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "bordercolor", (char *) NULL, CFGF_NONE), + CFG_END() +}; +cfg_opt_t widget_progressbar_opts[] = +{ + CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), + CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), + CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), + CFG_SEC((char *) "bar", widget_progressbar_bar_opts, CFGF_MULTI), + CFG_INT((char *) "width", 100, CFGF_NONE), + CFG_INT((char *) "gap", 2, CFGF_NONE), + CFG_INT((char *) "padding", 0, CFGF_NONE), + CFG_FLOAT((char *) "height", 0.67, CFGF_NONE), + CFG_END() +}; +cfg_opt_t statusbar_opts[] = +{ + CFG_STR((char *) "position", (char *) "top", CFGF_NONE), + CFG_INT((char *) "height", 0, CFGF_NONE), + CFG_INT((char *) "width", 0, CFGF_NONE), + CFG_SEC((char *) "textbox", widget_textbox_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), + CFG_SEC((char *) "taglist", widget_taglist_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), + CFG_SEC((char *) "focustitle", widget_focustitle_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), + CFG_SEC((char *) "layoutinfo", widget_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), + CFG_SEC((char *) "iconbox", widget_iconbox_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), + CFG_SEC((char *) "netwmicon", widget_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), + CFG_SEC((char *) "progressbar", widget_progressbar_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), + CFG_SEC((char *) "graph", widget_graph_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), + CFG_SEC((char *) "tasklist", widget_tasklist_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), + CFG_END() +}; +cfg_opt_t tag_opts[] = +{ + CFG_STR((char *) "layout", (char *) "tile", CFGF_NONE), + CFG_FLOAT((char *) "mwfact", 0.5, CFGF_NONE), + CFG_INT((char *) "nmaster", 1, CFGF_NONE), + CFG_INT((char *) "ncol", 1, CFGF_NONE), + CFG_END() +}; +cfg_opt_t tags_opts[] = +{ + CFG_SEC((char *) "tag", tag_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), + CFG_END() +}; +cfg_opt_t layout_opts[] = +{ + CFG_STR((char *) "image", NULL, CFGF_NONE), + CFG_END() +}; +cfg_opt_t layouts_opts[] = +{ + CFG_SEC((char *) "layout", layout_opts, CFGF_TITLE | CFGF_MULTI), + CFG_END() +}; +cfg_opt_t padding_opts[] = +{ + CFG_INT((char *) "top", 0, CFGF_NONE), + CFG_INT((char *) "bottom", 0, CFGF_NONE), + CFG_INT((char *) "right", 0, CFGF_NONE), + CFG_INT((char *) "left", 0, CFGF_NONE), + CFG_END() +}; +cfg_opt_t screen_opts[] = +{ + CFG_SEC((char *) "general", general_opts, CFGF_NONE), + CFG_SEC((char *) "statusbar", statusbar_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), + CFG_SEC((char *) "tags", tags_opts, CFGF_NONE), + CFG_SEC((char *) "colors", colors_opts, CFGF_NONE), + CFG_SEC((char *) "layouts", layouts_opts, CFGF_NONE), + CFG_SEC((char *) "padding", padding_opts, CFGF_NONE), + CFG_END() +}; +cfg_opt_t rule_opts[] = +{ + CFG_STR((char *) "xproperty_name", NULL, CFGF_NONE), + CFG_STR((char *) "xproperty_value", NULL, CFGF_NONE), + CFG_STR((char *) "name", NULL, CFGF_NONE), + CFG_STR((char *) "tags", NULL, CFGF_NONE), + CFG_STR((char *) "icon", NULL, CFGF_NONE), + CFG_STR((char *) "float", (char *) "auto", CFGF_NONE), + CFG_INT((char *) "screen", RULE_NOSCREEN, CFGF_NONE), + CFG_BOOL((char *) "not_master", cfg_false, CFGF_NONE), + CFG_FLOAT((char *) "opacity", -1.0f, CFGF_NONE), + CFG_END() +}; +cfg_opt_t rules_opts[] = +{ + CFG_SEC((char *) "rule", rule_opts, CFGF_MULTI), + CFG_END() +}; +cfg_opt_t key_opts[] = +{ + CFG_STR_LIST((char *) "modkey", (char *) "{Mod4}", CFGF_NONE), + CFG_STR((char *) "key", (char *) "None", CFGF_NONE), + CFG_STR((char *) "command", (char *) "", CFGF_NONE), + CFG_STR((char *) "arg", NULL, CFGF_NONE), + CFG_END() +}; +cfg_opt_t keylist_opts[] = +{ + CFG_STR_LIST((char *) "modkey", (char *) "{Mod4}", CFGF_NONE), + CFG_STR_LIST((char *) "keylist", (char *) NULL, CFGF_NONE), + CFG_STR((char *) "command", (char *) "", CFGF_NONE), + CFG_STR_LIST((char *) "arglist", NULL, CFGF_NONE), + CFG_END() +}; +cfg_opt_t keys_opts[] = +{ + CFG_SEC((char *) "key", key_opts, CFGF_MULTI), + CFG_SEC((char *) "keylist", keylist_opts, CFGF_MULTI), + CFG_END() +}; +cfg_opt_t mouse_opts[] = +{ + CFG_SEC((char *) "root", mouse_generic_opts, CFGF_MULTI), + CFG_SEC((char *) "client", mouse_generic_opts, CFGF_MULTI), + CFG_END() +}; +cfg_opt_t awesome_opts[] = +{ + CFG_SEC((char *) "screen", screen_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), + CFG_SEC((char *) "rules", rules_opts, CFGF_NONE), + CFG_SEC((char *) "keys", keys_opts, CFGF_NONE), + CFG_SEC((char *) "mouse", mouse_opts, CFGF_NONE), + CFG_END() +}; + +char * +config_file(void) +{ + const char *homedir; + char * confpath; + ssize_t confpath_len; + + homedir = getenv("HOME"); + confpath_len = a_strlen(homedir) + a_strlen(AWESOME_CONFIG_FILE) + 2; + confpath = p_new(char, confpath_len); + a_strcpy(confpath, confpath_len, homedir); + a_strcat(confpath, confpath_len, "/"); + a_strcat(confpath, confpath_len, AWESOME_CONFIG_FILE); + + return confpath; +} + +int +config_check(const char *confpatharg) +{ + cfg_t *cfg; + int ret; + char *confpath; + + cfg = cfg_init(awesome_opts, CFGF_NONE); + + if(confpatharg) + confpath = a_strdup(confpatharg); + else + confpath = config_file(); + + switch((ret = cfg_parse(cfg, confpath))) + { + case CFG_FILE_ERROR: + perror("awesome: parsing configuration file failed"); + break; + case CFG_PARSE_ERROR: + cfg_error(cfg, "awesome: parsing configuration file %s failed.\n", confpath); + break; + case CFG_SUCCESS: + printf("Configuration file OK.\n"); + break; + } + + p_delete(&confpath); + + return ret; +} + +// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 diff --git a/common/configopts.h b/common/configopts.h index 68d53b64c..dc1fe9ce2 100644 --- a/common/configopts.h +++ b/common/configopts.h @@ -1,259 +1,30 @@ -#include -#include "rules.h" +/* + * configopts.h - configuration options header + * + * Copyright © 2007-2008 Julien Danjou + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ -#define AWESOME_CONFIG_FILE ".awesomerc" +#ifndef AWESOME_COMMON_CONFIGOPTS_H +#define AWESOME_COMMON_CONFIGOPTS_H + +char * config_file(void); +int config_check(const char *); + +#endif -static cfg_opt_t general_opts[] = -{ - CFG_INT((char *) "border", 1, CFGF_NONE), - CFG_INT((char *) "snap", 8, CFGF_NONE), - CFG_BOOL((char *) "resize_hints", cfg_true, CFGF_NONE), - CFG_BOOL((char *) "sloppy_focus", cfg_true, CFGF_NONE), - CFG_BOOL((char *) "sloppy_focus_raise", cfg_false, CFGF_NONE), - CFG_BOOL((char *) "new_become_master", cfg_true, CFGF_NONE), - CFG_BOOL((char *) "new_get_focus", cfg_true, CFGF_NONE), - CFG_STR((char *) "font", (char *) "vera-10", CFGF_NONE), - CFG_END() -}; -static cfg_opt_t colors_opts[] = -{ - CFG_STR((char *) "normal_border", (char *) "#111111", CFGF_NONE), - CFG_STR((char *) "normal_bg", (char *) "#111111", CFGF_NONE), - CFG_STR((char *) "normal_fg", (char *) "#eeeeee", CFGF_NONE), - CFG_STR((char *) "focus_border", (char *) "#6666ff", CFGF_NONE), - CFG_STR((char *) "focus_bg", (char *) "#6666ff", CFGF_NONE), - CFG_STR((char *) "focus_fg", (char *) "#ffffff", CFGF_NONE), - CFG_STR((char *) "urgent_bg", (char *) "#ff0000", CFGF_NONE), - CFG_STR((char *) "urgent_fg", (char *) "#ffffff", CFGF_NONE), - CFG_STR((char *) "tab_border", (char *) "#ff0000", CFGF_NONE), - CFG_END() -}; -static cfg_opt_t mouse_taglist_opts[] = -{ - CFG_STR_LIST((char *) "modkey", (char *) "{}", CFGF_NONE), - CFG_STR((char *) "button", (char *) "None", CFGF_NONE), - CFG_STR((char *) "command", (char *) "", CFGF_NONE), - CFG_END() -}; -static cfg_opt_t mouse_generic_opts[] = -{ - CFG_STR_LIST((char *) "modkey", (char *) "{}", CFGF_NONE), - CFG_STR((char *) "button", (char *) "None", CFGF_NONE), - CFG_STR((char *) "command", (char *) "", CFGF_NONE), - CFG_STR((char *) "arg", NULL, CFGF_NONE), - CFG_END() -}; -static cfg_opt_t widget_opts[] = -{ - CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), - CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), - CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), - CFG_END() -}; -static cfg_opt_t widget_taglist_opts[] = -{ - CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), - CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), - CFG_SEC((char *) "mouse", mouse_taglist_opts, CFGF_MULTI), - CFG_END() -}; -static cfg_opt_t widget_iconbox_opts[] = -{ - CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), - CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), - CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), - CFG_STR((char *) "image", (char *) NULL, CFGF_NONE), - CFG_BOOL((char *) "resize", cfg_true, CFGF_NONE), - CFG_END() -}; -static cfg_opt_t widget_textbox_opts[] = -{ - CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), - CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), - CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), - CFG_INT((char *) "width", 0, CFGF_NONE), - CFG_STR((char *) "text", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "fg", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "bg", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "font", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "align", (char *) "center", CFGF_NONE), - CFG_END() -}; -static cfg_opt_t widget_focustitle_opts[] = -{ - CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), - CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), - CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), - CFG_STR((char *) "fg", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "bg", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "font", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "align", (char *) "left", CFGF_NONE), - CFG_END() -}; -static cfg_opt_t widget_tasklist_opts[] = -{ - CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), - CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), - CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), - CFG_STR((char *) "fg", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "bg", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "focus_fg", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "focus_bg", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "font", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "align", (char *) "left", CFGF_NONE), - CFG_BOOL((char *) "show_icons", cfg_true, CFGF_NONE), - CFG_BOOL((char *) "show_all", cfg_false, CFGF_NONE), - CFG_END() -}; -static cfg_opt_t widget_graph_data_opts[] = -{ - CFG_FLOAT((char *) "max", 100.0f, CFGF_NONE), - CFG_BOOL((char *) "scale", cfg_false, CFGF_NONE), - CFG_STR((char *) "fg", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "style", (char *) "bottom", CFGF_NONE), - CFG_END() -}; -static cfg_opt_t widget_graph_opts[] = -{ - CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), - CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), - CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), - CFG_SEC((char *) "data", widget_graph_data_opts, CFGF_MULTI), - CFG_INT((char *) "width", 100, CFGF_NONE), - CFG_INT((char *) "padding_left", 0, CFGF_NONE), - CFG_FLOAT((char *) "height", 0.67, CFGF_NONE), - CFG_STR((char *) "bg", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "bordercolor", (char *) NULL, CFGF_NONE), - CFG_END() -}; -static cfg_opt_t widget_progressbar_bar_opts[] = -{ - CFG_STR((char *) "fg", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "bg", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "bordercolor", (char *) NULL, CFGF_NONE), - CFG_END() -}; -static cfg_opt_t widget_progressbar_opts[] = -{ - CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), - CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), - CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), - CFG_SEC((char *) "bar", widget_progressbar_bar_opts, CFGF_MULTI), - CFG_INT((char *) "width", 100, CFGF_NONE), - CFG_INT((char *) "gap", 2, CFGF_NONE), - CFG_INT((char *) "padding", 0, CFGF_NONE), - CFG_FLOAT((char *) "height", 0.67, CFGF_NONE), - CFG_END() -}; -static cfg_opt_t statusbar_opts[] = -{ - CFG_STR((char *) "position", (char *) "top", CFGF_NONE), - CFG_INT((char *) "height", 0, CFGF_NONE), - CFG_INT((char *) "width", 0, CFGF_NONE), - CFG_SEC((char *) "textbox", widget_textbox_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), - CFG_SEC((char *) "taglist", widget_taglist_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), - CFG_SEC((char *) "focustitle", widget_focustitle_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), - CFG_SEC((char *) "layoutinfo", widget_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), - CFG_SEC((char *) "iconbox", widget_iconbox_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), - CFG_SEC((char *) "netwmicon", widget_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), - CFG_SEC((char *) "progressbar", widget_progressbar_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), - CFG_SEC((char *) "graph", widget_graph_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), - CFG_SEC((char *) "tasklist", widget_tasklist_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), - CFG_END() -}; -static cfg_opt_t tag_opts[] = -{ - CFG_STR((char *) "layout", (char *) "tile", CFGF_NONE), - CFG_FLOAT((char *) "mwfact", 0.5, CFGF_NONE), - CFG_INT((char *) "nmaster", 1, CFGF_NONE), - CFG_INT((char *) "ncol", 1, CFGF_NONE), - CFG_END() -}; -static cfg_opt_t tags_opts[] = -{ - CFG_SEC((char *) "tag", tag_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), - CFG_END() -}; -static cfg_opt_t layout_opts[] = -{ - CFG_STR((char *) "image", NULL, CFGF_NONE), - CFG_END() -}; -static cfg_opt_t layouts_opts[] = -{ - CFG_SEC((char *) "layout", layout_opts, CFGF_TITLE | CFGF_MULTI), - CFG_END() -}; -static cfg_opt_t padding_opts[] = -{ - CFG_INT((char *) "top", 0, CFGF_NONE), - CFG_INT((char *) "bottom", 0, CFGF_NONE), - CFG_INT((char *) "right", 0, CFGF_NONE), - CFG_INT((char *) "left", 0, CFGF_NONE), - CFG_END() -}; -static cfg_opt_t screen_opts[] = -{ - CFG_SEC((char *) "general", general_opts, CFGF_NONE), - CFG_SEC((char *) "statusbar", statusbar_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), - CFG_SEC((char *) "tags", tags_opts, CFGF_NONE), - CFG_SEC((char *) "colors", colors_opts, CFGF_NONE), - CFG_SEC((char *) "layouts", layouts_opts, CFGF_NONE), - CFG_SEC((char *) "padding", padding_opts, CFGF_NONE), - CFG_END() -}; -static cfg_opt_t rule_opts[] = -{ - CFG_STR((char *) "xproperty_name", NULL, CFGF_NONE), - CFG_STR((char *) "xproperty_value", NULL, CFGF_NONE), - CFG_STR((char *) "name", NULL, CFGF_NONE), - CFG_STR((char *) "tags", NULL, CFGF_NONE), - CFG_STR((char *) "icon", NULL, CFGF_NONE), - CFG_STR((char *) "float", (char *) "auto", CFGF_NONE), - CFG_INT((char *) "screen", RULE_NOSCREEN, CFGF_NONE), - CFG_BOOL((char *) "not_master", cfg_false, CFGF_NONE), - CFG_FLOAT((char *) "opacity", -1.0f, CFGF_NONE), - CFG_END() -}; -static cfg_opt_t rules_opts[] = -{ - CFG_SEC((char *) "rule", rule_opts, CFGF_MULTI), - CFG_END() -}; -static cfg_opt_t key_opts[] = -{ - CFG_STR_LIST((char *) "modkey", (char *) "{Mod4}", CFGF_NONE), - CFG_STR((char *) "key", (char *) "None", CFGF_NONE), - CFG_STR((char *) "command", (char *) "", CFGF_NONE), - CFG_STR((char *) "arg", NULL, CFGF_NONE), - CFG_END() -}; -static cfg_opt_t keylist_opts[] = -{ - CFG_STR_LIST((char *) "modkey", (char *) "{Mod4}", CFGF_NONE), - CFG_STR_LIST((char *) "keylist", (char *) NULL, CFGF_NONE), - CFG_STR((char *) "command", (char *) "", CFGF_NONE), - CFG_STR_LIST((char *) "arglist", NULL, CFGF_NONE), - CFG_END() -}; -static cfg_opt_t keys_opts[] = -{ - CFG_SEC((char *) "key", key_opts, CFGF_MULTI), - CFG_SEC((char *) "keylist", keylist_opts, CFGF_MULTI), - CFG_END() -}; -static cfg_opt_t mouse_opts[] = -{ - CFG_SEC((char *) "root", mouse_generic_opts, CFGF_MULTI), - CFG_SEC((char *) "client", mouse_generic_opts, CFGF_MULTI), - CFG_END() -}; -static cfg_opt_t awesome_opts[] = -{ - CFG_SEC((char *) "screen", screen_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), - CFG_SEC((char *) "rules", rules_opts, CFGF_NONE), - CFG_SEC((char *) "keys", keys_opts, CFGF_NONE), - CFG_SEC((char *) "mouse", mouse_opts, CFGF_NONE), - CFG_END() -}; // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 diff --git a/config.c b/config.c index e9db2feab..bbfea7d89 100644 --- a/config.c +++ b/config.c @@ -36,6 +36,7 @@ #include "defconfig.h" #include "layouts/tile.h" #include "common/configopts.h" +#include "common/configopts.h" /* Permit to use mouse with many more buttons */ #ifndef Button6 @@ -46,6 +47,7 @@ #endif extern AwesomeConf globalconf; +extern cfg_opt_t awesome_opts[]; /** Link a name to a key symbol */ typedef struct @@ -428,55 +430,6 @@ config_parse_screen(cfg_t *cfg, int screen) virtscreen->padding.right = cfg_getint(cfg_padding, "right"); } -static char * -config_file(void) -{ - const char *homedir; - char * confpath; - ssize_t confpath_len; - - homedir = getenv("HOME"); - confpath_len = a_strlen(homedir) + a_strlen(AWESOME_CONFIG_FILE) + 2; - confpath = p_new(char, confpath_len); - a_strcpy(confpath, confpath_len, homedir); - a_strcat(confpath, confpath_len, "/"); - a_strcat(confpath, confpath_len, AWESOME_CONFIG_FILE); - - return confpath; -} - -int -config_check(const char *confpatharg) -{ - cfg_t *cfg; - int ret; - char *confpath; - - cfg = cfg_init(awesome_opts, CFGF_NONE); - - if(confpatharg) - confpath = a_strdup(confpatharg); - else - confpath = config_file(); - - switch((ret = cfg_parse(cfg, confpath))) - { - case CFG_FILE_ERROR: - perror("awesome: parsing configuration file failed"); - break; - case CFG_PARSE_ERROR: - cfg_error(cfg, "awesome: parsing configuration file %s failed.\n", confpath); - break; - case CFG_SUCCESS: - printf("Configuration file OK.\n"); - break; - } - - p_delete(&confpath); - - return ret; -} - /** Parse configuration file and initialize some stuff * \param confpatharg Path to configuration file */ diff --git a/config.h b/config.h index 01bcea4ad..10262cbce 100644 --- a/config.h +++ b/config.h @@ -27,7 +27,6 @@ DO_SLIST(Key, key, p_delete); DO_SLIST(Button, button, p_delete); -int config_check(const char *); void config_parse(const char *); #endif