Merge pull request #2478 from RyanDwyer/standardise-debug

Standardise debug variables

1 files changed, 13 insertions, 7 deletions

diff --git a/sway/main.c b/sway/main.c
index 54f48340..3ba4ba75 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -235,14 +235,20 @@ static void drop_permissions(bool keep_caps) {
 }
 
 void enable_debug_flag(const char *flag) {
-	if (strcmp(flag, "render-tree") == 0) {
-		enable_debug_tree = true;
-	} else if (strncmp(flag, "damage=", 7) == 0) {
-		damage_debug = &flag[7];
-	} else if (strcmp(flag, "txn-debug") == 0) {
-		txn_debug = true;
+	if (strcmp(flag, "damage=highlight") == 0) {
+		debug.damage = DAMAGE_HIGHLIGHT;
+	} else if (strcmp(flag, "damage=rerender") == 0) {
+		debug.damage = DAMAGE_RERENDER;
+	} else if (strcmp(flag, "noatomic") == 0) {
+		debug.noatomic = true;
+	} else if (strcmp(flag, "render-tree") == 0) {
+		debug.render_tree = true;
+	} else if (strcmp(flag, "txn-wait") == 0) {
+		debug.txn_wait = true;
+	} else if (strcmp(flag, "txn-timings") == 0) {
+		debug.txn_timings = true;
 	} else if (strncmp(flag, "txn-timeout=", 12) == 0) {
-		txn_timeout_ms = atoi(&flag[12]);
+		server.txn_timeout_ms = atoi(&flag[12]);
 	}
 }