From: Johan Malm <jgm323@gmail.com>
Date: Fri, 22 Oct 2021 19:23:09 +0000 (+0100)
Subject: config: add <core><adaptiveSync>
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=c48b9d44d14c084f088f7704900c4dc8525cc4d5;p=proto%2Flabwc.git

config: add <core><adaptiveSync>
---

diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index 2027f81a..57f34959 100644
--- 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 b029d189..89634e14 100644
--- 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 87a8b581..16e09032 100644
--- 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 2dbb2096..0738e730 100644
--- 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 0f74cdec..9490ec0c 100644
--- 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 0e80fa67..c8a44f69 100644
--- 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);