Merge branch 'master' into status

[bspwm.git] / settings.c

diff --git a/settings.c b/settings.c
index 27cab5ea040d360975739c2ebbd8384f10772a16..3a31829f45cd88a5b997157a801f2db1e5cb1f82 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"
@@ -15,53 +16,59 @@ void run_autostart(void)
 
     snprintf(path, sizeof(path), "%s/%s/%s", getenv("XDG_CONFIG_HOME"), 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("could not run autostart file\n");
+        }
+        exit(EXIT_SUCCESS);
+    }
 
-    if (dpy != NULL)
-        close(xcb_get_file_descriptor(dpy));
-
-    setsid();
-    execl(path, path, NULL);
-
-    PUTS("error: could not load autostart file");
-    exit(EXIT_SUCCESS);
+    wait(NULL);
 }
 
 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));
     strncpy(normal_locked_border_color, NORMAL_LOCKED_BORDER_COLOR, sizeof(normal_locked_border_color));
     strncpy(urgent_border_color, URGENT_BORDER_COLOR, sizeof(urgent_border_color));
 
     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);
     normal_locked_border_color_pxl = get_color(normal_locked_border_color);
     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;
-
     window_gap = WINDOW_GAP;
-    left_padding = LEFT_PADDING;
-    right_padding = RIGHT_PADDING;
-    top_padding = TOP_PADDING;
-    bottom_padding = BOTTOM_PADDING;
 
     borderless_monocle = BORDERLESS_MONOCLE;
-    focus_follow_mouse = FOCUS_FOLLOW_MOUSE;
+    gapless_monocle = GAPLESS_MONOCLE;
+    focus_follows_mouse = FOCUS_FOLLOWS_MOUSE;
+    adaptative_raise = ADAPTATIVE_RAISE;
+    status_stdout = STATUS_STDOUT;
 }