Implement sticky windows

[bspwm.git] / settings.c

diff --git a/settings.c b/settings.c
index 3da3593b5a437d0bc43c6e80f920c3f73685c8ec..2d33bb636dcfb948326f4115e732972b46bc305a 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -1,13 +1,7 @@
-#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_config(void)
@@ -28,26 +22,27 @@ void run_config(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(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));
+    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(focused_sticky_border_color, sizeof(focused_sticky_border_color), "%s", FOCUSED_STICKY_BORDER_COLOR);
+    snprintf(normal_sticky_border_color, sizeof(normal_sticky_border_color), "%s", NORMAL_STICKY_BORDER_COLOR);
+    snprintf(urgent_border_color, sizeof(urgent_border_color), "%s", URGENT_BORDER_COLOR);
 
-    border_width = BORDER_WIDTH;
-    window_gap = WINDOW_GAP;
     split_ratio = SPLIT_RATIO;
+    growth_factor = GROWTH_FACTOR;
 
     borderless_monocle = BORDERLESS_MONOCLE;
     gapless_monocle = GAPLESS_MONOCLE;
     focus_follows_pointer = FOCUS_FOLLOWS_POINTER;
     pointer_follows_monitor = POINTER_FOLLOWS_MONITOR;
-    adaptative_raise = ADAPTATIVE_RAISE;
     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;
 }