X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=settings.c;h=7e509dd11a5af34996da7c6c338e5250b38c3dea;hb=a7821774c50aefa8c758b964814818b4634b77ce;hp=edff6ed6589bdb4308c5b22ed5a233e42e1be4e2;hpb=c026b3baa139e32a363821722536e7a63c399a4b;p=bspwm.git

diff --git a/settings.c b/settings.c
index edff6ed..7e509dd 100644
--- a/settings.c
+++ b/settings.c
@@ -1,47 +1,78 @@
-#include <stdlib.h>
-#include <string.h>
+/* Copyright (c) 2012, Bastien Dejean
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
 #include <unistd.h>
-#include <sys/wait.h>
+#include <sys/types.h>
 #include "bspwm.h"
 #include "settings.h"
 
 void run_config(void)
 {
-    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);
-    }
-
-    wait(NULL);
+	if (fork() == 0) {
+		if (dpy != NULL) {
+			close(xcb_get_file_descriptor(dpy));
+		}
+		setsid();
+		execl(config_path, config_path, NULL);
+		err("Couldn't execute the configuration file.\n");
+	}
 }
 
 void load_settings(void)
 {
-    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);
+	snprintf(external_rules_command, sizeof(external_rules_command), "%s", EXTERNAL_RULES_COMMAND);
+	snprintf(status_prefix, sizeof(status_prefix), "%s", STATUS_PREFIX);
+
+	snprintf(normal_border_color, sizeof(normal_border_color), "%s", NORMAL_BORDER_COLOR);
+	snprintf(active_border_color, sizeof(active_border_color), "%s", ACTIVE_BORDER_COLOR);
+	snprintf(focused_border_color, sizeof(focused_border_color), "%s", FOCUSED_BORDER_COLOR);
+	snprintf(presel_feedback_color, sizeof(presel_feedback_color), "%s", PRESEL_FEEDBACK_COLOR);
+
+	padding = (padding_t) PADDING;
+	window_gap = WINDOW_GAP;
+	border_width = BORDER_WIDTH;
+	split_ratio = SPLIT_RATIO;
+	initial_polarity = FIRST_CHILD;
+	pointer_modifier = POINTER_MODIFIER;
 
-    border_width = BORDER_WIDTH;
-    split_ratio = SPLIT_RATIO;
-    growth_factor = GROWTH_FACTOR;
+	pointer_actions[0] = ACTION_MOVE;
+	pointer_actions[1] = ACTION_RESIZE_SIDE;
+	pointer_actions[2] = ACTION_RESIZE_CORNER;
 
-    borderless_monocle = BORDERLESS_MONOCLE;
-    gapless_monocle = GAPLESS_MONOCLE;
-    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;
+	borderless_monocle = BORDERLESS_MONOCLE;
+	gapless_monocle = GAPLESS_MONOCLE;
+	paddingless_monocle = PADDINGLESS_MONOCLE;
+	single_monocle = SINGLE_MONOCLE;
+	focus_follows_pointer = FOCUS_FOLLOWS_POINTER;
+	pointer_follows_focus = POINTER_FOLLOWS_FOCUS;
+	pointer_follows_monitor = POINTER_FOLLOWS_MONITOR;
+	ignore_ewmh_focus = IGNORE_EWMH_FOCUS;
+	center_pseudo_tiled = CENTER_PSEUDO_TILED;
+	click_to_focus = CLICK_TO_FOCUS;
+	honor_size_hints = HONOR_SIZE_HINTS;
+	remove_disabled_monitors = REMOVE_DISABLED_MONITORS;
+	remove_unplugged_monitors = REMOVE_UNPLUGGED_MONITORS;
+	merge_overlapping_monitors = MERGE_OVERLAPPING_MONITORS;
 }