Merge branch 'master' into status

[bspwm.git] / settings.c

diff --git a/settings.c b/settings.c
index 1522c8f7479f3bcf29c4ec66c7977d5731e734ee..3a31829f45cd88a5b997157a801f2db1e5cb1f82 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -2,87 +2,73 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
+#include <sys/wait.h>
 #include <xcb/xcb.h>
 #include <xcb/xcb_event.h>
-#include "helpers.h"
-#include "types.h"
 #include "bspwm.h"
-#include "utils.h"
-#include "luautils.h"
+#include "helpers.h"
 #include "common.h"
 #include "settings.h"
 
-void load_settings(void)
-{
-    char path[MAXLEN];
-    lua_State *L = lua_open();
-    luaopen_base(L);
-    /* luaL_openlibs(L); */
-
-    snprintf(path, sizeof(path), "%s/%s/%s", getenv("XDG_CONFIG_HOME"), WM_NAME, CONFIG_FILE);
-
-    if (luaL_loadfile(L, path) == 0) {
-        if (lua_pcall(L, 0, 0, 0) == 0)
-            apply_settings(L);
-        else
-            PUTS("error: cannot interpret configuration file\n");
-    } else {
-        PUTS("error: could not load configuration file\n");
-    }
-
-    lua_close(L);
-}
-
 void run_autostart(void)
 {
     char path[MAXLEN];
 
     snprintf(path, sizeof(path), "%s/%s/%s", getenv("XDG_CONFIG_HOME"), WM_NAME, AUTOSTART_FILE);
 
-    if (fork() != 0)
-        return;
-
-    if (dpy != NULL)
-        close(xcb_get_file_descriptor(dpy));
+    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);
+    }
 
-    execl(path, path, NULL);
-        
-    PUTS("error: could not load autostart file\n");
+    wait(NULL);
 }
 
-void apply_settings(lua_State *L)
+void load_settings(void)
 {
-    string_expr(L, normal_border_color, "normal_border_color", NORMAL_BORDER_COLOR);
-    string_expr(L, active_border_color, "active_border_color", ACTIVE_BORDER_COLOR);
-    string_expr(L, inner_border_color, "inner_border_color", INNER_BORDER_COLOR);
-    string_expr(L, outer_border_color, "outer_border_color", OUTER_BORDER_COLOR);
-    string_expr(L, presel_border_color, "presel_border_color", PRESEL_BORDER_COLOR);
-    string_expr(L, locked_border_color, "locked_border_color", LOCKED_BORDER_COLOR);
+    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);
-    locked_border_color_pxl = get_color(locked_border_color);
-
-    string_expr(L, wm_name, "wm_name", WM_NAME);
+    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);
 
-    adaptive_window_border = bool_expr(L, "adaptive_window_border", ADAPTIVE_WINDOW_BORDER);
-    adaptive_window_gap = bool_expr(L, "adaptive_window_gap", ADAPTIVE_WINDOW_GAP);
+    strncpy(wm_name, WM_NAME, sizeof(wm_name));
+    button_modifier = BUTTON_MODIFIER;
+    numlock_modifier = NUMLOCK_MODIFIER;
+    capslock_modifier = CAPSLOCK_MODIFIER;
 
-    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);
+    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;
 
-    window_gap = int_expr(L, "window_gap", WINDOW_GAP);
-    left_padding = int_expr(L, "left_padding", LEFT_PADDING);
-    right_padding = int_expr(L, "right_padding", RIGHT_PADDING);
-    top_padding = int_expr(L, "top_padding", TOP_PADDING);
-    bottom_padding = int_expr(L, "bottom_padding", BOTTOM_PADDING);
+    borderless_monocle = BORDERLESS_MONOCLE;
+    gapless_monocle = GAPLESS_MONOCLE;
+    focus_follows_mouse = FOCUS_FOLLOWS_MOUSE;
+    adaptative_raise = ADAPTATIVE_RAISE;
+    status_stdout = STATUS_STDOUT;
 }