nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle saved_configpath in get_config_path, fix memleak in current_configpath handling, update atoms after reloading (Thanks fernandotcl)

This commit is contained in:
Michael Stapelberg 2011-03-19 22:26:15 +01:00
parent 626c65b0d8
commit b342d387a8
6 changed files with 79 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/config.h
View File

@ -22,7 +22,7 @@
#include "i3.h" #include "i3.h"
typedef struct Config Config; typedef struct Config Config;
extern const char *current_configpath; extern char *current_configpath;
extern Config config; extern Config config;
extern SLIST_HEAD(modes_head, Mode) modes; extern SLIST_HEAD(modes_head, Mode) modes;

6
include/x.h
View File

@ -79,4 +79,10 @@ void x_raise_con(Con *con);
*/ */
void x_set_name(Con *con, const char *name); void x_set_name(Con *con, const char *name);
/**
* Sets up i3 specific atoms (I3_SOCKET_PATH and I3_CONFIG_PATH)
*
*/
void x_set_i3_atoms();
#endif #endif

1
src/cmdparse.y
View File

@ -346,6 +346,7 @@ reload:
{ {
printf("reloading\n"); printf("reloading\n");
load_configuration(conn, NULL, true); load_configuration(conn, NULL, true);
x_set_i3_atoms();
/* Send an IPC event just in case the ws names have changed */ /* Send an IPC event just in case the ws names have changed */
ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"reload\"}"); ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"reload\"}");
} }

118
src/config.c
View File

@ -19,7 +19,7 @@
#include "all.h" #include "all.h"
const char *current_configpath = NULL; char *current_configpath = NULL;
Config config; Config config;
struct modes_head modes; struct modes_head modes;
@ -170,60 +170,72 @@ void switch_mode(xcb_connection_t *conn, const char *new_mode) {
} }
/* /*
* Get the path of the first configuration file found. Checks the home directory * Get the path of the first configuration file found. If override_configpath
* first, then the system directory first, always taking into account the XDG * is specified, that path is returned and saved for further calls. Otherwise,
* Base Directory Specification ($XDG_CONFIG_HOME, $XDG_CONFIG_DIRS) * checks the home directory first, then the system directory first, always
* taking into account the XDG Base Directory Specification ($XDG_CONFIG_HOME,
* $XDG_CONFIG_DIRS)
* *
*/ */
static char *get_config_path() { static char *get_config_path(const char *override_configpath) {
char *xdg_config_home, *xdg_config_dirs, *config_path; char *xdg_config_home, *xdg_config_dirs, *config_path;
/* 1: check the traditional path under the home directory */ static const char *saved_configpath = NULL;
config_path = resolve_tilde("~/.i3/config");
if (path_exists(config_path))
return config_path;
/* 2: check for $XDG_CONFIG_HOME/i3/config */ if (override_configpath != NULL) {
if ((xdg_config_home = getenv("XDG_CONFIG_HOME")) == NULL) saved_configpath = override_configpath;
xdg_config_home = "~/.config"; return sstrdup(saved_configpath);
}
xdg_config_home = resolve_tilde(xdg_config_home); if (saved_configpath != NULL)
if (asprintf(&config_path, "%s/i3/config", xdg_config_home) == -1) return sstrdup(saved_configpath);
die("asprintf() failed");
free(xdg_config_home);
if (path_exists(config_path)) /* 1: check the traditional path under the home directory */
return config_path; config_path = resolve_tilde("~/.i3/config");
free(config_path); if (path_exists(config_path))
return config_path;
/* 3: check the traditional path under /etc */ /* 2: check for $XDG_CONFIG_HOME/i3/config */
config_path = SYSCONFDIR "/i3/config"; if ((xdg_config_home = getenv("XDG_CONFIG_HOME")) == NULL)
if (path_exists(config_path)) xdg_config_home = "~/.config";
return sstrdup(config_path);
/* 4: check for $XDG_CONFIG_DIRS/i3/config */ xdg_config_home = resolve_tilde(xdg_config_home);
if ((xdg_config_dirs = getenv("XDG_CONFIG_DIRS")) == NULL) if (asprintf(&config_path, "%s/i3/config", xdg_config_home) == -1)
xdg_config_dirs = "/etc/xdg"; die("asprintf() failed");
free(xdg_config_home);
char *buf = sstrdup(xdg_config_dirs); if (path_exists(config_path))
char *tok = strtok(buf, ":"); return config_path;
while (tok != NULL) { free(config_path);
tok = resolve_tilde(tok);
if (asprintf(&config_path, "%s/i3/config", tok) == -1) /* 3: check the traditional path under /etc */
die("asprintf() failed"); config_path = SYSCONFDIR "/i3/config";
free(tok); if (path_exists(config_path))
if (path_exists(config_path)) { return sstrdup(config_path);
free(buf);
return config_path; /* 4: check for $XDG_CONFIG_DIRS/i3/config */
} if ((xdg_config_dirs = getenv("XDG_CONFIG_DIRS")) == NULL)
free(config_path); xdg_config_dirs = "/etc/xdg";
tok = strtok(NULL, ":");
char *buf = sstrdup(xdg_config_dirs);
char *tok = strtok(buf, ":");
while (tok != NULL) {
tok = resolve_tilde(tok);
if (asprintf(&config_path, "%s/i3/config", tok) == -1)
die("asprintf() failed");
free(tok);
if (path_exists(config_path)) {
free(buf);
return config_path;
} }
free(buf); free(config_path);
tok = strtok(NULL, ":");
}
free(buf);
die("Unable to find the configuration file (looked at " die("Unable to find the configuration file (looked at "
"~/.i3/config, $XDG_CONFIG_HOME/i3/config, " "~/.i3/config, $XDG_CONFIG_HOME/i3/config, "
SYSCONFDIR "i3/config and $XDG_CONFIG_DIRS/i3/config)"); SYSCONFDIR "i3/config and $XDG_CONFIG_DIRS/i3/config)");
} }
/* /*
@ -233,25 +245,11 @@ static char *get_config_path() {
* *
*/ */
static void parse_configuration(const char *override_configpath) { static void parse_configuration(const char *override_configpath) {
static const char *saved_configpath = NULL; char *path = get_config_path(override_configpath);
if (override_configpath != NULL) {
saved_configpath = override_configpath;
current_configpath = override_configpath;
parse_file(override_configpath);
return;
}
else if (saved_configpath != NULL) {
current_configpath = saved_configpath;
parse_file(saved_configpath);
return;
}
char *path = get_config_path();
DLOG("Parsing configfile %s\n", path); DLOG("Parsing configfile %s\n", path);
FREE(current_configpath);
current_configpath = path; current_configpath = path;
parse_file(path); parse_file(path);
free(path);
} }
/* /*

6
src/main.c
View File

@ -351,11 +351,7 @@ int main(int argc, char *argv[]) {
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_WM_NAME, A_UTF8_STRING, 8, strlen("i3"), "i3"); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_WM_NAME, A_UTF8_STRING, 8, strlen("i3"), "i3");
/* Set up i3 specific atoms like I3_SOCKET_PATH and I3_CONFIG_PATH */ /* Set up i3 specific atoms like I3_SOCKET_PATH and I3_CONFIG_PATH */
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_SOCKET_PATH, A_UTF8_STRING, 8, x_set_i3_atoms();
(config.ipc_socket_path != NULL ? strlen(config.ipc_socket_path) : 0),
config.ipc_socket_path);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_CONFIG_PATH, A_UTF8_STRING, 8,
strlen(current_configpath), current_configpath);
keysyms = xcb_key_symbols_alloc(conn); keysyms = xcb_key_symbols_alloc(conn);

12
src/x.c
View File

@ -703,3 +703,15 @@ void x_set_name(Con *con, const char *name) {
FREE(state->name); FREE(state->name);
state->name = sstrdup(name); state->name = sstrdup(name);
} }
/*
* Sets up i3 specific atoms (I3_SOCKET_PATH and I3_CONFIG_PATH)
*
*/
void x_set_i3_atoms() {
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_SOCKET_PATH, A_UTF8_STRING, 8,
(config.ipc_socket_path != NULL ? strlen(config.ipc_socket_path) : 0),
config.ipc_socket_path);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_CONFIG_PATH, A_UTF8_STRING, 8,
strlen(current_configpath), current_configpath);
}