Remove settings: auto_cancel and auto_alternate

[bspwm.git] / settings.c

diff --git a/settings.c b/settings.c
index 7ab85e687860379d77871ff7bf9f402288d0d453..9330e625d4e50d0e2dc2ed43214cfb1f8a000583 100644 (file)
--- 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,10 +20,6 @@
  * 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 <unistd.h>
@@ -62,17 +58,20 @@ void load_settings(void)
        snprintf(urgent_border_color, sizeof(urgent_border_color), "%s", URGENT_BORDER_COLOR);
 
        split_ratio = SPLIT_RATIO;
+       window_gap = WINDOW_GAP;
+       border_width = BORDER_WIDTH;
+       initial_polarity = FIRST_CHILD;
 
        borderless_monocle = BORDERLESS_MONOCLE;
        gapless_monocle = GAPLESS_MONOCLE;
+       leaf_monocle = LEAF_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;
-       remove_disabled_monitor = REMOVE_DISABLED_MONITOR;
+       center_pseudo_tiled = CENTER_PSEUDO_TILED;
+       remove_disabled_monitors = REMOVE_DISABLED_MONITORS;
        remove_unplugged_monitors = REMOVE_UNPLUGGED_MONITORS;
        merge_overlapping_monitors = MERGE_OVERLAPPING_MONITORS;
 }