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

diff --git a/settings.c b/settings.c
index 8caa6dd..7e509dd 100644
--- a/settings.c
+++ b/settings.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014, Bastien Dejean
+/* Copyright (c) 2012, Bastien Dejean
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -20,21 +20,20 @@
  * 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.
- *
- * The views and conclusions contained in the software and documentation are those
- * of the authors and should not be interpreted as representing official policies,
- * either expressed or implied, of the FreeBSD Project.
  */
 
+#include <stdio.h>
 #include <unistd.h>
+#include <sys/types.h>
 #include "bspwm.h"
 #include "settings.h"
 
 void run_config(void)
 {
 	if (fork() == 0) {
-		if (dpy != NULL)
+		if (dpy != NULL) {
 			close(xcb_get_file_descriptor(dpy));
+		}
 		setsid();
 		execl(config_path, config_path, NULL);
 		err("Couldn't execute the configuration file.\n");
@@ -47,31 +46,32 @@ void load_settings(void)
 	snprintf(status_prefix, sizeof(status_prefix), "%s", STATUS_PREFIX);
 
 	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(active_sticky_border_color, sizeof(active_sticky_border_color), "%s", ACTIVE_STICKY_BORDER_COLOR);
-	snprintf(normal_sticky_border_color, sizeof(normal_sticky_border_color), "%s", NORMAL_STICKY_BORDER_COLOR);
-	snprintf(focused_private_border_color, sizeof(focused_private_border_color), "%s", FOCUSED_PRIVATE_BORDER_COLOR);
-	snprintf(active_private_border_color, sizeof(active_private_border_color), "%s", ACTIVE_PRIVATE_BORDER_COLOR);
-	snprintf(normal_private_border_color, sizeof(normal_private_border_color), "%s", NORMAL_PRIVATE_BORDER_COLOR);
-	snprintf(urgent_border_color, sizeof(urgent_border_color), "%s", URGENT_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;
+
+	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;
+	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;
-	apply_floating_atom = APPLY_FLOATING_ATOM;
-	auto_alternate = AUTO_ALTERNATE;
-	auto_cancel = AUTO_CANCEL;
-	history_aware_focus = HISTORY_AWARE_FOCUS;
 	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;