diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-19 11:29:59 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-19 16:17:24 +1000 |
| commit | f9563d88f30fd70c5999520fa7f4b3d0dffd1a4c (patch) | |
| tree | e042ef90214040470a7a3e6371a23d97032786c6 | |
| parent | 8d1dd038233cf946b36813c4c8508c17f4cda0fc (diff) | |
Use enum for damage debug options
| -rw-r--r-- | include/sway/debug.h | 8 | ||||
| -rw-r--r-- | sway/desktop/render.c | 6 | ||||
| -rw-r--r-- | sway/desktop/transaction.c | 4 | ||||
| -rw-r--r-- | sway/main.c | 8 |
4 files changed, 14 insertions, 12 deletions
diff --git a/include/sway/debug.h b/include/sway/debug.h index 5dcd9e00..bf3a5f6d 100644 --- a/include/sway/debug.h +++ b/include/sway/debug.h @@ -3,12 +3,16 @@ #include <stdbool.h> struct sway_debug { - bool highlight_damage; // Highlight regions of the screen being damaged bool noatomic; // Ignore atomic layout updates - bool nodamage; // Render the full output on each frame bool render_tree; // Render the tree overlay bool txn_timings; // Log verbose messages about transactions bool txn_wait; // Always wait for the timeout before applying + + enum { + DAMAGE_DEFAULT, // Default behaviour + DAMAGE_HIGHLIGHT, // Highlight regions of the screen being damaged + DAMAGE_RERENDER, // Render the full output when any damage occurs + } damage; }; extern struct sway_debug debug; 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) { |