9058fc44e6
We're going to call parse_configuration() very early if -C is given on the command line. Instead of the previous "only_check_config", which has been a global variable, we now simply pass use_nagbar as false if we're just validating. This causes the whole parsing to run without X and of course without starting nagbar and displaying the errors to standard out/error instead. The return code of parse_configuration() is now a boolean which represents whether an error occured during parsing and the programs exit code is returned accordingly. Although the config parser still has a lot of side-effects, we now can parse without the need to have an XCB connection. A nicer implementation would be to just set the new font and load it just after we're done parsing, but to ensure we don't break functionality we just load a dummy FONT_TYPE_NONE if XCB isn't available. The main reason for going this route is that it's a bit difficult to test fonts in a distribution agnostic way without bundling fonts with i3 (or Xdummy to be more exact). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
43 lines
1.2 KiB
C
43 lines
1.2 KiB
C
/*
|
|
* vim:ts=4:sw=4:expandtab
|
|
*
|
|
* i3 - an improved dynamic tiling window manager
|
|
* © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
|
|
*
|
|
* config_parser.h: config parser-related definitions
|
|
*
|
|
*/
|
|
#pragma once
|
|
|
|
#include <yajl/yajl_gen.h>
|
|
|
|
extern pid_t config_error_nagbar_pid;
|
|
|
|
/*
|
|
* An intermediate reprsentation of the result of a parse_config call.
|
|
* Currently unused, but the JSON output will be useful in the future when we
|
|
* implement a config parsing IPC command.
|
|
*
|
|
*/
|
|
struct ConfigResultIR {
|
|
/* The JSON generator to append a reply to. */
|
|
yajl_gen json_gen;
|
|
|
|
/* The next state to transition to. Passed to the function so that we can
|
|
* determine the next state as a result of a function call, like
|
|
* cfg_criteria_pop_state() does. */
|
|
int next_state;
|
|
};
|
|
|
|
struct ConfigResultIR *parse_config(const char *input, struct context *context);
|
|
|
|
/**
|
|
* Parses the given file by first replacing the variables, then calling
|
|
* parse_config and launching i3-nagbar if use_nagbar is true.
|
|
*
|
|
* The return value is a boolean indicating whether there were errors during
|
|
* parsing.
|
|
*
|
|
*/
|
|
bool parse_file(const char *f, bool use_nagbar);
|