mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-07 13:30:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reload config+theme on SIGHUP

Browse source
This commit is contained in:
Johan Malm 2020-09-25 19:42:40 +01:00
parent 745915c0ba
commit 1721b339da
6 changed files with 80 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/config/rcxml.c
View file

@ -214,9 +214,22 @@ void rcxml_parse_xml(struct buf *b)
xmlCleanupParser();
}
static void pre_processing(void)
{
rc.xdg_shell_server_side_deco = true;
rc.font_size_activewindow = 8;
}
static void rcxml_init()
{
static bool has_run;
if (has_run)
return;
has_run = true;
LIBXML_TEST_VERSION
wl_list_init(&rc.keybinds);
pre_processing();
}
static void bind(const char *binding, const char *action, const char *command)
@ -240,12 +253,6 @@ static void set_title_height(void)
rc.title_height = font_height(buf);
}
static void pre_processing(void)
{
rc.xdg_shell_server_side_deco = true;
rc.font_size_activewindow = 8;
}
static void post_processing(void)
{
if (!wl_list_length(&rc.keybinds)) {
@ -271,30 +278,38 @@ static void rcxml_path(char *buf, size_t len)
snprintf(buf, len, "%s/rc.xml", config_dir());
}
static void find_config_file(char *buffer, size_t len, const char *filename)
{
if (filename) {
snprintf(buffer, len, "%s", filename);
return;
}
rcxml_path(buffer, len);
}
void rcxml_read(const char *filename)
{
FILE *stream;
char *line = NULL;
size_t len = 0;
struct buf b;
char rcxml[4096] = { 0 };
static char rcxml[4096] = { 0 };
rcxml_init();
wl_list_init(&rc.keybinds);
pre_processing();
/*
* Reading file into buffer before parsing makes it easier to write
* unit tests.
* rcxml_read() can be called multiple times, but we only set rcxml[]
* the first time. The specified 'filename' is only respected the first
* time.
*/
if (filename)
snprintf(rcxml, sizeof(rcxml), "%s", filename);
else
rcxml_path(rcxml, sizeof(rcxml));
if (rcxml[0] == '\0')
find_config_file(rcxml, sizeof(rcxml), filename);
if (rcxml[0] == '\0') {
warn("cannot find rc.xml config file");
goto no_config;
}
/* Reading file into buffer before parsing - better for unit tests */
stream = fopen(rcxml, "r");
if (!stream) {
warn("cannot read (%s)", rcxml);