aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
Diffstat (limited to 'sway')
-rw-r--r--sway/desktop/render.c6
-rw-r--r--sway/desktop/transaction.c4
-rw-r--r--sway/main.c8
3 files changed, 8 insertions, 10 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 8fc642a6..f6afb82b 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -834,9 +834,9 @@ void output_render(struct sway_output *output, struct timespec *when,
goto renderer_end;
}
- if (debug.highlight_damage) {
+ if (debug.damage == DAMAGE_HIGHLIGHT) {
wlr_renderer_clear(renderer, (float[]){1, 1, 0, 1});
- } else if (debug.nodamage) {
+ } else if (debug.damage == DAMAGE_RERENDER) {
int width, height;
wlr_output_transformed_resolution(wlr_output, &width, &height);
pixman_region32_union_rect(damage, damage, 0, 0, width, height);
@@ -918,7 +918,7 @@ renderer_end:
wlr_render_texture(renderer, root_container.sway_root->debug_tree,
wlr_output->transform_matrix, 0, 40, 1);
}
- if (debug.highlight_damage) {
+ if (debug.damage == DAMAGE_HIGHLIGHT) {
int width, height;
wlr_output_transformed_resolution(wlr_output, &width, &height);
pixman_region32_union_rect(damage, damage, 0, 0, width, height);
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index 219f5362..8688fa13 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -345,9 +345,7 @@ static void set_instruction_ready(
}
instruction->container->instruction = NULL;
- if (!txn_debug) {
- transaction_progress_queue();
- }
+ transaction_progress_queue();
}
void transaction_notify_view_ready_by_serial(struct sway_view *view,
diff --git a/sway/main.c b/sway/main.c
index 7a1afd4c..3ba4ba75 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -235,12 +235,12 @@ static void drop_permissions(bool keep_caps) {
}
void enable_debug_flag(const char *flag) {
- if (strcmp(flag, "highlight-damage") == 0) {
- debug.highlight_damage = 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, "nodamage") == 0) {
- debug.nodamage = true;
} else if (strcmp(flag, "render-tree") == 0) {
debug.render_tree = true;
} else if (strcmp(flag, "txn-wait") == 0) {