Reset stacking client list whenever appropriate

[bspwm.git] / settings.c

diff --git a/settings.c b/settings.c
index f36c511721a66a83e8d15aa492ccfd5291a12b8a..52aeaa39d56c00146ad03c50d7a9ac54817f3451 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/wait.h>
 #include <xcb/xcb.h>
 #include <xcb/xcb_event.h>
 #include "bspwm.h"
@@ -13,18 +14,24 @@ void run_autostart(void)
 {
     char path[MAXLEN];
 
-    snprintf(path, sizeof(path), "%s/%s/%s", getenv("XDG_CONFIG_HOME"), WM_NAME, AUTOSTART_FILE);
+    char *config_home = getenv(CONFIG_HOME_ENV);
+    if (config_home != NULL)
+        snprintf(path, sizeof(path), "%s/%s/%s", config_home, WM_NAME, AUTOSTART_FILE);
+    else
+        snprintf(path, sizeof(path), "%s/%s/%s/%s", getenv("HOME"), ".config", WM_NAME, AUTOSTART_FILE);
 
-    if (fork() != 0)
-        return;
+    if (fork() == 0) {
+        if (dpy != NULL)
+            close(xcb_get_file_descriptor(dpy));
+        if (fork() == 0) {
+            setsid();
+            execl(path, path, NULL);
+            err("Couldn't spawn the autostart file.\n");
+        }
+        exit(EXIT_SUCCESS);
+    }
 
-    if (dpy != NULL)
-        close(xcb_get_file_descriptor(dpy));
-
-    setsid();
-    execl(path, path, NULL);
-
-    err("could not run autostart file\n");
+    wait(NULL);
 }
 
 void load_settings(void)
@@ -32,8 +39,6 @@ void load_settings(void)
     strncpy(normal_border_color, NORMAL_BORDER_COLOR, sizeof(normal_border_color));
     strncpy(focused_border_color, FOCUSED_BORDER_COLOR, sizeof(focused_border_color));
     strncpy(active_border_color, ACTIVE_BORDER_COLOR, sizeof(active_border_color));
-    strncpy(inner_border_color, INNER_BORDER_COLOR, sizeof(inner_border_color));
-    strncpy(outer_border_color, OUTER_BORDER_COLOR, sizeof(outer_border_color));
     strncpy(presel_border_color, PRESEL_BORDER_COLOR, sizeof(presel_border_color));
     strncpy(focused_locked_border_color, FOCUSED_LOCKED_BORDER_COLOR, sizeof(focused_locked_border_color));
     strncpy(active_locked_border_color, ACTIVE_LOCKED_BORDER_COLOR, sizeof(active_locked_border_color));
@@ -43,8 +48,6 @@ void load_settings(void)
     normal_border_color_pxl = get_color(normal_border_color);
     focused_border_color_pxl = get_color(active_border_color);
     active_border_color_pxl = get_color(active_border_color);
-    inner_border_color_pxl = get_color(inner_border_color);
-    outer_border_color_pxl = get_color(outer_border_color);
     presel_border_color_pxl = get_color(presel_border_color);
     focused_locked_border_color_pxl = get_color(active_locked_border_color);
     active_locked_border_color_pxl = get_color(active_locked_border_color);
@@ -52,20 +55,19 @@ void load_settings(void)
     urgent_border_color_pxl = get_color(urgent_border_color);
 
     strncpy(wm_name, WM_NAME, sizeof(wm_name));
-    button_modifier = BUTTON_MODIFIER;
-
-    inner_border_width = INNER_BORDER_WIDTH;
-    main_border_width = MAIN_BORDER_WIDTH;
-    outer_border_width = OUTER_BORDER_WIDTH;
-
-    border_width = inner_border_width + main_border_width + outer_border_width;
 
+    border_width = BORDER_WIDTH;
     window_gap = WINDOW_GAP;
-    left_padding = LEFT_PADDING;
-    right_padding = RIGHT_PADDING;
-    top_padding = TOP_PADDING;
-    bottom_padding = BOTTOM_PADDING;
+    split_ratio = SPLIT_RATIO;
 
     borderless_monocle = BORDERLESS_MONOCLE;
-    focus_follows_mouse = FOCUS_FOLLOWS_MOUSE;
+    gapless_monocle = GAPLESS_MONOCLE;
+    focus_follows_pointer = FOCUS_FOLLOWS_POINTER;
+    pointer_follows_monitor = POINTER_FOLLOWS_MONITOR;
+    monitor_focus_fallback = MONITOR_FOCUS_FALLBACK;
+    adaptative_raise = ADAPTATIVE_RAISE;
+    apply_shadow_property = APPLY_SHADOW_PROPERTY;
+    auto_alternate = AUTO_ALTERNATE;
+    focus_by_distance = FOCUS_BY_DISTANCE;
+    history_aware_focus = HISTORY_AWARE_FOCUS;
 }