New setting: `honor_ewmh_focus`

[bspwm.git] / settings.c

diff --git a/settings.c b/settings.c
index 3a31829f45cd88a5b997157a801f2db1e5cb1f82..f9e63d8f7382e4d752084d589e8404741857adc1 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -1,28 +1,19 @@
-#include <stdio.h>
 #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"
-#include "helpers.h"
-#include "common.h"
 #include "settings.h"
 
-void run_autostart(void)
+void run_config(void)
 {
-    char path[MAXLEN];
-
-    snprintf(path, sizeof(path), "%s/%s/%s", getenv("XDG_CONFIG_HOME"), WM_NAME, AUTOSTART_FILE);
-
     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");
+            execl(config_path, config_path, NULL);
+            err("Couldn't execute the configuration file.\n");
         }
         exit(EXIT_SUCCESS);
     }
@@ -32,43 +23,26 @@ void run_autostart(void)
 
 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;
+    snprintf(normal_border_color, sizeof(normal_border_color), "%s", NORMAL_BORDER_COLOR);
+    snprintf(focused_border_color, sizeof(focused_border_color), "%s", FOCUSED_BORDER_COLOR);
+    snprintf(active_border_color, sizeof(active_border_color), "%s", ACTIVE_BORDER_COLOR);
+    snprintf(presel_border_color, sizeof(presel_border_color), "%s", PRESEL_BORDER_COLOR);
+    snprintf(focused_locked_border_color, sizeof(focused_locked_border_color), "%s", FOCUSED_LOCKED_BORDER_COLOR);
+    snprintf(active_locked_border_color, sizeof(active_locked_border_color), "%s", ACTIVE_LOCKED_BORDER_COLOR);
+    snprintf(normal_locked_border_color, sizeof(normal_locked_border_color), "%s", NORMAL_LOCKED_BORDER_COLOR);
+    snprintf(urgent_border_color, sizeof(urgent_border_color), "%s", URGENT_BORDER_COLOR);
+
+    border_width = BORDER_WIDTH;
+    split_ratio = SPLIT_RATIO;
+    growth_factor = GROWTH_FACTOR;
 
     borderless_monocle = BORDERLESS_MONOCLE;
     gapless_monocle = GAPLESS_MONOCLE;
-    focus_follows_mouse = FOCUS_FOLLOWS_MOUSE;
-    adaptative_raise = ADAPTATIVE_RAISE;
-    status_stdout = STATUS_STDOUT;
+    focus_follows_pointer = FOCUS_FOLLOWS_POINTER;
+    pointer_follows_monitor = POINTER_FOLLOWS_MONITOR;
+    apply_floating_atom = APPLY_FLOATING_ATOM;
+    auto_alternate = AUTO_ALTERNATE;
+    auto_cancel = AUTO_CANCEL;
+    history_aware_focus = HISTORY_AWARE_FOCUS;
+    honor_ewmh_focus = HONOR_EWMH_FOCUS;
 }