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

Merge pull request #1588 from Deiz/xdg-wizard 

Respect XDG config directories in i3-config-wizard
This commit is contained in:
Michael Stapelberg 2015-03-30 08:38:58 +02:00
parent d6657cea36 9b8c2b1d1a
commit aa8349a550
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
i3-config-wizard/main.c
View File

@ -482,17 +482,23 @@ static int handle_expose() {
set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000")); set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000"));
txt(logical_px(10), 2, "You have not configured i3 yet."); txt(logical_px(10), 2, "You have not configured i3 yet.");
txt(logical_px(10), 3, "Do you want me to generate ~/.i3/config?"); txt(logical_px(10), 3, "Do you want me to generate a config at");
txt(logical_px(85), 5, "Yes, generate ~/.i3/config");
txt(logical_px(85), 7, "No, I will use the defaults"); char *msg;
sasprintf(&msg, "%s?", config_path);
txt(logical_px(10), 4, msg);
free(msg);
txt(logical_px(85), 6, "Yes, generate the config");
txt(logical_px(85), 8, "No, I will use the defaults");
/* green */ /* green */
set_font_colors(pixmap_gc, get_colorpixel("#00FF00"), get_colorpixel("#000000")); set_font_colors(pixmap_gc, get_colorpixel("#00FF00"), get_colorpixel("#000000"));
txt(logical_px(25), 5, "<Enter>"); txt(logical_px(25), 6, "<Enter>");
/* red */ /* red */
set_font_colors(pixmap_gc, get_colorpixel("#FF0000"), get_colorpixel("#000000")); set_font_colors(pixmap_gc, get_colorpixel("#FF0000"), get_colorpixel("#000000"));
txt(logical_px(31), 7, "<ESC>"); txt(logical_px(31), 8, "<ESC>");
} }
if (current_step == STEP_GENERATE) { if (current_step == STEP_GENERATE) {
@ -502,7 +508,7 @@ static int handle_expose() {
txt(logical_px(85), 4, "Win as default modifier"); txt(logical_px(85), 4, "Win as default modifier");
txt(logical_px(85), 5, "Alt as default modifier"); txt(logical_px(85), 5, "Alt as default modifier");
txt(logical_px(10), 7, "Afterwards, press"); txt(logical_px(10), 7, "Afterwards, press");
txt(logical_px(85), 9, "to write ~/.i3/config"); txt(logical_px(85), 9, "to write the config");
txt(logical_px(85), 10, "to abort"); txt(logical_px(85), 10, "to abort");
/* the not-selected modifier */ /* the not-selected modifier */
@ -740,7 +746,7 @@ static void finish() {
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
config_path = resolve_tilde("~/.i3/config"); char *xdg_config_home;
socket_path = getenv("I3SOCK"); socket_path = getenv("I3SOCK");
char *pattern = "pango:monospace 8"; char *pattern = "pango:monospace 8";
char *patternbold = "pango:monospace bold 8"; char *patternbold = "pango:monospace bold 8";
@ -774,20 +780,29 @@ int main(int argc, char *argv[]) {
} }
} }
/* Check if the destination config file does not exist but the path is char *path = get_config_path(NULL, false);
* writable. If not, exit now, this program is not useful in that case. */ if (path != NULL) {
struct stat stbuf; printf("The config file \"%s\" already exists. Exiting.\n", path);
if (stat(config_path, &stbuf) == 0) { free(path);
printf("The config file \"%s\" already exists. Exiting.\n", config_path);
return 0; return 0;
} }
/* Create ~/.i3 if it does not yet exist */ /* Always write to $XDG_CONFIG_HOME/i3/config by default. */
char *config_dir = resolve_tilde("~/.i3"); if ((xdg_config_home = getenv("XDG_CONFIG_HOME")) == NULL)
xdg_config_home = "~/.config";
xdg_config_home = resolve_tilde(xdg_config_home);
sasprintf(&config_path, "%s/i3/config", xdg_config_home);
/* Create $XDG_CONFIG_HOME/i3 if it does not yet exist */
char *config_dir;
struct stat stbuf;
sasprintf(&config_dir, "%s/i3", xdg_config_home);
if (stat(config_dir, &stbuf) != 0) if (stat(config_dir, &stbuf) != 0)
if (mkdir(config_dir, 0755) == -1) if (!mkdirp(config_dir))
err(1, "mkdir(%s) failed", config_dir); err(EXIT_FAILURE, "mkdirp(%s) failed", config_dir);
free(config_dir); free(config_dir);
free(xdg_config_home);
int fd; int fd;
if ((fd = open(config_path, O_CREAT | O_RDWR, 0644)) == -1) { if ((fd = open(config_path, O_CREAT | O_RDWR, 0644)) == -1) {