config: add <core><adaptiveSync>

diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index 2027f81a2faaea2d32758a49a249056017774a77..57f34959ebc881dfa6ca44bbf1fde7ff49ad5082 100644 (file)
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -28,6 +28,9 @@ Configuration must be wrapped in a <labwc_config> root-node.
        The distance in pixels between views and output edges when using
        movement actions, for example MoveToEdge. Default is 0.
 
+*<core><adaptiveSync>* [yes|no]
+       Enable adaptive sync. Default is no.
+
 # FOCUS
 
 *<focus><followMouse>* [yes|no]

diff --git a/docs/labwc-environment.5.scd b/docs/labwc-environment.5.scd
index b029d1890b5dcd3f89139066c39b7db3c935207a..89634e14877e26e725fd4835bc74e19fd8371eac 100644 (file)
--- a/docs/labwc-environment.5.scd
+++ b/docs/labwc-environment.5.scd
@@ -23,11 +23,6 @@ For example, this sets keyboard layout to Swedish:
 XKB_DEFAULT_LAYOUT=se
 ```
 
-The following environment variables are supported by labwc:
-
-*LABWC_ADAPTIVE_SYNC*
-       Set to 1 enable adaptive sync
-
 # SEE ALSO
 
 labwc(1)

diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index 87a8b581a549222747f612d6243eaf2fbf097ec5..16e090324b85926b2b8a59855389aabe4c3b6b8b 100644 (file)
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -10,6 +10,7 @@
   <core>
     <decoration>server</decoration>
     <gap>0</gap>
+    <adaptiveSync>no</adaptiveSync>
   </core>
 
   <!--

diff --git a/include/config/rcxml.h b/include/config/rcxml.h
index 2dbb2096b3f6d429a7ba81b78e5c988948986f65..0738e7306ebca10135bc80a7438bc781a99a2a96 100644 (file)
--- a/include/config/rcxml.h
+++ b/include/config/rcxml.h
@@ -11,6 +11,7 @@
 struct rcxml {
        bool xdg_shell_server_side_deco;
        int gap;
+       bool adaptive_sync;
        bool focus_follow_mouse;
        bool raise_on_focus;
        char *theme_name;

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 0f74cdec2550d4f11ab71f6b10224d67f0734de3..9490ec0c50661b0dbe132197f914801e8d1e0832 100644 (file)
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -292,6 +292,8 @@ entry(xmlNode *node, char *nodename, char *content)
                }
        } else if (!strcmp(nodename, "gap.core")) {
                rc.gap = atoi(content);
+       } else if (!strcmp(nodename, "adaptiveSync.core")) {
+               rc.adaptive_sync = get_bool(content);
        } else if (!strcmp(nodename, "name.theme")) {
                rc.theme_name = strdup(content);
        } else if (!strcmp(nodename, "cornerradius.theme")) {

diff --git a/src/output.c b/src/output.c
index 0e80fa6782513b38808bbbf9a2645400a441142c..c8a44f694dc42a2f10972608d5a16c4f804e78be 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -994,8 +994,9 @@ new_output_notify(struct wl_listener *listener, void *data)
         * TODO: support configuration in run-time
         */
 
-       if (getenv("LABWC_ADAPTIVE_SYNC")) {
-               wlr_log(WLR_INFO, "enable adaptive sync on %s", wlr_output->name);
+       if (rc.adaptive_sync) {
+               wlr_log(WLR_INFO, "enable adaptive sync on %s",
+                       wlr_output->name);
                wlr_output_enable_adaptive_sync(wlr_output, true);
        }
        wlr_output_layout_add_auto(server->output_layout, wlr_output);