Merge branch 'master' into next

[i3/i3] / include / config.h

diff --git a/include/config.h b/include/config.h
index 1021a612e7a98917a211a61d037b688e255c6861..07391a6af6458e4e02d1dfad3c11cf85992f6807 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -123,9 +123,22 @@ struct Config {
          * more often. */
         bool force_focus_wrapping;
 
+        /** By default, use the RandR API for multi-monitor setups.
+         * Unfortunately, the nVidia binary graphics driver doesn't support
+         * this API. Instead, it only support the less powerful Xinerama API,
+         * which can be enabled by this option.
+         *
+         * Note: this option takes only effect on the initial startup (eg.
+         * reconfiguration is not possible). On startup, the list of screens
+         * is fetched once and never updated. */
+        bool force_xinerama;
+
         /** The default border style for new windows. */
         border_style_t default_border;
 
+        /** The default border style for new floating windows. */
+        border_style_t default_floating_border;
+
         /** The modifier which needs to be pressed in combination with your mouse
          * buttons to do things with floating windows (move, resize) */
         uint32_t floating_modifier;