Fix "alternate" command, min width,height is 1,1

[bspwm.git] / settings.c

diff --git a/settings.c b/settings.c
index 532ea380ca9465dfdd5f3469c5a7431d1adfeed5..219199c96c9e96f495c55aa786709a840bd4a3d6 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -1,84 +1,89 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.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 "settings.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, CONFIG_FILE) == 0) {
+    if (luaL_loadfile(L, path) == 0) {
         if (lua_pcall(L, 0, 0, 0) == 0)
             apply_settings(L);
         else
-            die("error: cannot interpret configuration file\n");
+            PUTS("error: cannot interpret configuration file");
     } else {
-        die("error: could not load configuration file\n");
+        PUTS("error: could not load configuration file");
     }
 
     lua_close(L);
 }
 
-void apply_settings(lua_State *L)
+void run_autostart(void)
 {
-    normal_border_color = string_expr(L, "normal_border_color", NORMAL_BORDER_COLOR);
-    split_ratio = double_expr(L, "split_ratio", SPLIT_RATIO);
-    smart_surroundings = bool_expr(L, "smart_surroundings", SMART_SURROUNDINGS);
-    outer_border_width = int_expr(L, "outer_border_width", OUTER_BORDER_WIDTH);
-    inner_border_width = int_expr(L, "inner_border_width", INNER_BORDER_WIDTH);
-    inner_border_color = string_expr(L, "inner_border_color", INNER_BORDER_COLOR);
-    border_width = inner_border_width + outer_border_width;
-    /* printf("split ratio: %f\n", split_ratio); */
-    /* printf("outer_border_width: %i\n", outer_border_width); */
-    /* printf("inner_border_color: %s\n", inner_border_color); */
-    /* printf("normal_border_color: %s\n", normal_border_color); */
-    /* printf("default normal_border_color: %s\n", NORMAL_BORDER_COLOR); */
-    /* printf("outer_border_color: %s\n", outer_border_color); */
-    /* printf("smart_surroundings: %i\n", smart_surroundings); */
-}
+    char path[MAXLEN];
 
-void get_setting(lua_State *L, char* rsp)
-{
-    char *name;
+    snprintf(path, sizeof(path), "%s/%s/%s", getenv("XDG_CONFIG_HOME"), WM_NAME, AUTOSTART_FILE);
 
-    if (!has_table(L, "get"))
+    if (fork() != 0)
         return;
 
-    name = string_expr(L, "get.name", NULL);
-    if (name == NULL)
-        return;
+    if (dpy != NULL)
+        close(xcb_get_file_descriptor(dpy));
 
-    if (strcmp(name, "inner_border_width") == 0)
-        sprintf(rsp, "%i\n", inner_border_width);
-    else if (strcmp(name, "normal_border_color") == 0)
-        sprintf(rsp, "%s\n", normal_border_color);
-    else if (strcmp(name, "inner_border_color") == 0)
-        sprintf(rsp, "%s\n", inner_border_color);
+    setsid();
+    execl(path, path, NULL);
+        
+    PUTS("error: could not load autostart file");
+    exit(EXIT_SUCCESS);
 }
 
-void set_setting(lua_State *L)
+void apply_settings(lua_State *L)
 {
-    char *name;
+    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);
 
-    if (!has_table(L, "set"))
-        return;
+    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);
 
-    name = string_expr(L, "set.name", NULL);
+    string_expr(L, wm_name, "wm_name", WM_NAME);
 
-    if (name == NULL)
-        return;
+    adaptive_window_border = bool_expr(L, "adaptive_window_border", ADAPTIVE_WINDOW_BORDER);
 
-    if (strcmp(name, "inner_border_width") == 0) {
-        inner_border_width = int_expr(L, "set.value", INNER_BORDER_WIDTH);
-    } else if (strcmp(name, "normal_border_color") == 0) {
-        free(normal_border_color);
-        normal_border_color = string_expr(L, "set.value", NORMAL_BORDER_COLOR);
-    } else if (strcmp(name, "inner_border_color") == 0) {
-        free(inner_border_color);
-        inner_border_color = string_expr(L, "set.value", INNER_BORDER_COLOR);
-    }
+    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);
+    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);
 }