#125 apply VRR_OFF via CLI and cfg.yaml (#126)

alex-courtis · Aug 21, 2023 · c42418a · c42418a
1 parent 8017443
commit c42418a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/layout.c b/src/layout.c
@@ -212,7 +212,9 @@ void desire_adaptive_sync(struct Head *head) {
 		return;
 	}
 
-	if (!slist_find_equal(cfg->adaptive_sync_off_name_desc, head_name_desc_matches_head, head)) {
+	if (slist_find_equal(cfg->adaptive_sync_off_name_desc, head_name_desc_matches_head, head)) {
+		head->desired.adaptive_sync = ZWLR_OUTPUT_HEAD_V1_ADAPTIVE_SYNC_STATE_DISABLED;
+	} else {
 		head->desired.adaptive_sync = ZWLR_OUTPUT_HEAD_V1_ADAPTIVE_SYNC_STATE_ENABLED;
 	}
 }

diff --git a/tst/tst-layout.c b/tst/tst-layout.c
@@ -502,12 +502,12 @@ void desire_scale__user(void **state) {
 void desire_adaptive_sync__head_disabled(void **state) {
 	struct Head head0 = {
 		.desired.enabled = false,
-		.desired.adaptive_sync = ZWLR_OUTPUT_HEAD_V1_ADAPTIVE_SYNC_STATE_ENABLED,
+		.desired.adaptive_sync = ZWLR_OUTPUT_HEAD_V1_ADAPTIVE_SYNC_STATE_DISABLED,
 	};
 
 	desire_adaptive_sync(&head0);
 
-	assert_int_equal(head0.desired.adaptive_sync, ZWLR_OUTPUT_HEAD_V1_ADAPTIVE_SYNC_STATE_ENABLED);
+	assert_int_equal(head0.desired.adaptive_sync, ZWLR_OUTPUT_HEAD_V1_ADAPTIVE_SYNC_STATE_DISABLED);
 }
 
 void desire_adaptive_sync__failed(void **state) {
@@ -522,7 +522,7 @@ void desire_adaptive_sync__failed(void **state) {
 	assert_int_equal(head0.desired.adaptive_sync, ZWLR_OUTPUT_HEAD_V1_ADAPTIVE_SYNC_STATE_DISABLED);
 }
 
-void desire_adaptive_sync__adaptive_sync_off(void **state) {
+void desire_adaptive_sync__disabled(void **state) {
 	struct Head head0 = {
 		.name = "some head",
 		.desired.enabled = true,
@@ -533,10 +533,10 @@ void desire_adaptive_sync__adaptive_sync_off(void **state) {
 
 	desire_adaptive_sync(&head0);
 
-	assert_int_equal(head0.desired.adaptive_sync, ZWLR_OUTPUT_HEAD_V1_ADAPTIVE_SYNC_STATE_ENABLED);
+	assert_int_equal(head0.desired.adaptive_sync, ZWLR_OUTPUT_HEAD_V1_ADAPTIVE_SYNC_STATE_DISABLED);
 }
 
-void desire_adaptive_sync__ok(void **state) {
+void desire_adaptive_sync__enabled(void **state) {
 	struct Head head0 = {
 		.desired.enabled = true,
 		.desired.adaptive_sync = ZWLR_OUTPUT_HEAD_V1_ADAPTIVE_SYNC_STATE_DISABLED,
@@ -682,8 +682,8 @@ int main(void) {
 
 		TEST(desire_adaptive_sync__head_disabled),
 		TEST(desire_adaptive_sync__failed),
-		TEST(desire_adaptive_sync__adaptive_sync_off),
-		TEST(desire_adaptive_sync__ok),
+		TEST(desire_adaptive_sync__disabled),
+		TEST(desire_adaptive_sync__enabled),
 
 		TEST(handle_success__head_changing_adaptive_sync),
 		TEST(handle_success__head_changing_adaptive_sync_fail),