Implement variables in configfile.
This implements ticket #42. Syntax is "set $key value". All further instances of $key will be replaced with value before parsing each line of the configfile.
This commit is contained in:
parent
170ba60191
commit
e689be983b
|
@ -15,6 +15,8 @@
|
||||||
#ifndef _CONFIG_H
|
#ifndef _CONFIG_H
|
||||||
#define _CONFIG_H
|
#define _CONFIG_H
|
||||||
|
|
||||||
|
#include "queue.h"
|
||||||
|
|
||||||
typedef struct Config Config;
|
typedef struct Config Config;
|
||||||
extern Config config;
|
extern Config config;
|
||||||
|
|
||||||
|
@ -24,6 +26,13 @@ struct Colortriple {
|
||||||
uint32_t text;
|
uint32_t text;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct Variable {
|
||||||
|
char *key;
|
||||||
|
char *value;
|
||||||
|
|
||||||
|
SLIST_ENTRY(Variable) variables;
|
||||||
|
};
|
||||||
|
|
||||||
struct Config {
|
struct Config {
|
||||||
const char *terminal;
|
const char *terminal;
|
||||||
const char *font;
|
const char *font;
|
||||||
|
|
54
src/config.c
54
src/config.c
|
@ -34,6 +34,28 @@ static char *glob_path(const char *path) {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This function does a very simple replacement of each instance of key with value.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
static void replace_variable(char *buffer, const char *key, const char *value) {
|
||||||
|
char *pos;
|
||||||
|
/* To prevent endless recursions when the user makes an error configuring,
|
||||||
|
* we stop after 100 replacements. That should be vastly more than enough. */
|
||||||
|
int c = 0;
|
||||||
|
LOG("Replacing %s with %s\n", key, value);
|
||||||
|
while ((pos = strcasestr(buffer, key)) != NULL && c++ < 100) {
|
||||||
|
LOG("replacing variable %s in \"%s\" with \"%s\"\n", key, buffer, value);
|
||||||
|
char *rest = pos + strlen(key);
|
||||||
|
*pos = '\0';
|
||||||
|
char *replaced;
|
||||||
|
asprintf(&replaced, "%s%s%s", buffer, value, rest);
|
||||||
|
/* Hm, this is a bit ugly, but sizeof(buffer) = 4, as it’s just a pointer.
|
||||||
|
* So we need to hard-code the dimensions here. */
|
||||||
|
strncpy(buffer, replaced, 1026);
|
||||||
|
free(replaced);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Reads the configuration from ~/.i3/config or /etc/i3/config if not found.
|
* Reads the configuration from ~/.i3/config or /etc/i3/config if not found.
|
||||||
|
@ -43,6 +65,8 @@ static char *glob_path(const char *path) {
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void load_configuration(xcb_connection_t *conn, const char *override_configpath) {
|
void load_configuration(xcb_connection_t *conn, const char *override_configpath) {
|
||||||
|
SLIST_HEAD(variables_head, Variable) variables;
|
||||||
|
|
||||||
#define OPTION_STRING(name) \
|
#define OPTION_STRING(name) \
|
||||||
if (strcasecmp(key, #name) == 0) { \
|
if (strcasecmp(key, #name) == 0) { \
|
||||||
config.name = sstrdup(value); \
|
config.name = sstrdup(value); \
|
||||||
|
@ -75,6 +99,8 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath)
|
||||||
/* Clear the old config or initialize the data structure */
|
/* Clear the old config or initialize the data structure */
|
||||||
memset(&config, 0, sizeof(config));
|
memset(&config, 0, sizeof(config));
|
||||||
|
|
||||||
|
SLIST_INIT(&variables);
|
||||||
|
|
||||||
/* Initialize default colors */
|
/* Initialize default colors */
|
||||||
config.client.focused.border = get_colorpixel(conn, "#4c7899");
|
config.client.focused.border = get_colorpixel(conn, "#4c7899");
|
||||||
config.client.focused.background = get_colorpixel(conn, "#285577");
|
config.client.focused.background = get_colorpixel(conn, "#285577");
|
||||||
|
@ -118,6 +144,14 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath)
|
||||||
die("Could not read configuration file\n");
|
die("Could not read configuration file\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (config.terminal != NULL)
|
||||||
|
replace_variable(buffer, "$terminal", config.terminal);
|
||||||
|
|
||||||
|
/* Replace all custom variables */
|
||||||
|
struct Variable *current;
|
||||||
|
SLIST_FOREACH(current, &variables, variables)
|
||||||
|
replace_variable(buffer, current->key, current->value);
|
||||||
|
|
||||||
/* sscanf implicitly strips whitespace. Also, we skip comments and empty lines. */
|
/* sscanf implicitly strips whitespace. Also, we skip comments and empty lines. */
|
||||||
if (sscanf(buffer, "%s %[^\n]", key, value) < 1 ||
|
if (sscanf(buffer, "%s %[^\n]", key, value) < 1 ||
|
||||||
key[0] == '#' || strlen(key) < 3)
|
key[0] == '#' || strlen(key) < 3)
|
||||||
|
@ -219,6 +253,26 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* set a custom variable */
|
||||||
|
if (strcasecmp(key, "set") == 0) {
|
||||||
|
if (value[0] != '$')
|
||||||
|
die("Malformed variable assignment, name has to start with $\n");
|
||||||
|
|
||||||
|
/* get key/value for this variable */
|
||||||
|
char *v_key = value, *v_value;
|
||||||
|
if ((v_value = strstr(value, " ")) == NULL)
|
||||||
|
die("Malformed variable assignment, need a value\n");
|
||||||
|
|
||||||
|
*(v_value++) = '\0';
|
||||||
|
|
||||||
|
struct Variable *new = scalloc(sizeof(struct Variable));
|
||||||
|
new->key = sstrdup(v_key);
|
||||||
|
new->value = sstrdup(v_value);
|
||||||
|
SLIST_INSERT_HEAD(&variables, new, variables);
|
||||||
|
LOG("Got new variable %s = %s\n", v_key, v_value);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
die("Unknown configfile option: %s\n", key);
|
die("Unknown configfile option: %s\n", key);
|
||||||
}
|
}
|
||||||
fclose(handle);
|
fclose(handle);
|
||||||
|
|
Loading…
Reference in New Issue