New setting: `pointer_follows_monitor`

[bspwm.git] / settings.c

diff --git a/settings.c b/settings.c
index 3a31829f45cd88a5b997157a801f2db1e5cb1f82..8852740226cb7dc009e09afb13daefb681849279 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -14,7 +14,11 @@ 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) {
         if (dpy != NULL)
@@ -22,7 +26,7 @@ void run_autostart(void)
         if (fork() == 0) {
             setsid();
             execl(path, path, NULL);
-            err("could not run autostart file\n");
+            err("Couldn't spawn the autostart file.\n");
         }
         exit(EXIT_SUCCESS);
     }
@@ -35,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));
@@ -46,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);
@@ -55,20 +55,17 @@ 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;
-    numlock_modifier = NUMLOCK_MODIFIER;
-    capslock_modifier = CAPSLOCK_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;
+    split_ratio = SPLIT_RATIO;
 
     borderless_monocle = BORDERLESS_MONOCLE;
     gapless_monocle = GAPLESS_MONOCLE;
-    focus_follows_mouse = FOCUS_FOLLOWS_MOUSE;
+    focus_follows_pointer = FOCUS_FOLLOWS_POINTER;
+    pointer_follows_monitor = POINTER_FOLLOWS_MONITOR;
     adaptative_raise = ADAPTATIVE_RAISE;
-    status_stdout = STATUS_STDOUT;
+    apply_shadow_property = APPLY_SHADOW_PROPERTY;
+    auto_alternate = AUTO_ALTERNATE;
+    focus_by_distance = FOCUS_BY_DISTANCE;
 }