Don't trust WM_PROTOCOLS

[bspwm.git] / settings.c

diff --git a/settings.c b/settings.c
index c103895d51c6e9f87fcb1a40cf956cfbc6da3272..3da3593b5a437d0bc43c6e80f920c3f73685c8ec 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -1,61 +1,53 @@
-#define _BSD_SOURCE
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
+#include <unistd.h>
+#include <sys/wait.h>
 #include <xcb/xcb.h>
 #include <xcb/xcb_event.h>
+#include "bspwm.h"
 #include "helpers.h"
-#include "utils.h"
-#include "luautils.h"
 #include "common.h"
 #include "settings.h"
 
-void load_settings(void)
+void run_config(void)
 {
-    lua_State *L = lua_open();
-    luaopen_base(L);
-
-    if (luaL_loadfile(L, CONFIG_FILE) == 0) {
-        if (lua_pcall(L, 0, 0, 0) == 0)
-            apply_settings(L);
-        else
-            die("error: cannot interpret configuration file\n");
-    } else {
-        die("error: could not load configuration file\n");
+    if (fork() == 0) {
+        if (dpy != NULL)
+            close(xcb_get_file_descriptor(dpy));
+        if (fork() == 0) {
+            setsid();
+            execl(config_path, config_path, NULL);
+            err("Couldn't execute the configuration file.\n");
+        }
+        exit(EXIT_SUCCESS);
     }
 
-    lua_close(L);
+    wait(NULL);
 }
 
-void apply_settings(lua_State *L)
+void load_settings(void)
 {
-    normal_border_color = string_expr(L, "normal_border_color", NORMAL_BORDER_COLOR);
-    active_border_color = string_expr(L, "active_border_color", ACTIVE_BORDER_COLOR);
-    inner_border_color = string_expr(L, "inner_border_color", INNER_BORDER_COLOR);
-    outer_border_color = string_expr(L, "outer_border_color", OUTER_BORDER_COLOR);
-    presel_border_color = string_expr(L, "presel_border_color", PRESELECT_BORDER_COLOR);
-    locked_border_color = string_expr(L, "locked_border_color", LOCKED_BORDER_COLOR);
-
-    normal_border_color_pxl = get_color(normal_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);
-    locked_border_color_pxl = get_color(locked_border_color);
-
-    wm_name = string_expr(L, "wm_name", WM_NAME);
-
-    adaptive_window_border = bool_expr(L, "adaptive_window_border", SMART_WINDOW_BORDER);
-    adaptive_window_gap = bool_expr(L, "adaptive_window_gap", SMART_WINDOW_GAP);
-
-    inner_border_width = int_expr(L, "inner_border_width", INNER_BORDER_WIDTH);
-    main_border_width = int_expr(L, "main_border_width", MAIN_BORDER_WIDTH);
-    outer_border_width = int_expr(L, "outer_border_width", OUTER_BORDER_WIDTH);
-
-    border_width = inner_border_width + main_border_width + outer_border_width;
-    window_gap = int_expr(L, "window_gap", WINDOW_GAP);
+    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));
+
+    border_width = BORDER_WIDTH;
+    window_gap = WINDOW_GAP;
+    split_ratio = SPLIT_RATIO;
+
+    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;
 }