aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'sway/desktop')
-rw-r--r--sway/desktop/layer_shell.c1
-rw-r--r--sway/desktop/output.c14
-rw-r--r--sway/desktop/render.c28
-rw-r--r--sway/desktop/transaction.c87
-rw-r--r--sway/desktop/xdg_shell.c3
-rw-r--r--sway/desktop/xdg_shell_v6.c3
-rw-r--r--sway/desktop/xwayland.c3
7 files changed, 65 insertions, 74 deletions
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index a2935883..1fae5db2 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -14,7 +14,6 @@
#include "sway/output.h"
#include "sway/server.h"
#include "sway/tree/arrange.h"
-#include "sway/tree/layout.h"
#include "log.h"
static void apply_exclusive(struct wlr_box *usable_area,
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 2253eb51..bbebe453 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -23,7 +23,7 @@
#include "sway/server.h"
#include "sway/tree/arrange.h"
#include "sway/tree/container.h"
-#include "sway/tree/layout.h"
+#include "sway/tree/root.h"
#include "sway/tree/view.h"
#include "sway/tree/workspace.h"
@@ -163,8 +163,10 @@ void output_view_for_each_popup(struct sway_output *output,
.user_iterator = iterator,
.user_data = user_data,
.output = output,
- .ox = view->swayc->current.view_x - output->swayc->current.swayc_x,
- .oy = view->swayc->current.view_y - output->swayc->current.swayc_y,
+ .ox = view->swayc->current.view_x - output->swayc->current.swayc_x
+ - view->geometry.x,
+ .oy = view->swayc->current.view_y - output->swayc->current.swayc_y
+ - view->geometry.y,
.width = view->swayc->current.view_width,
.height = view->swayc->current.view_height,
.rotation = 0, // TODO
@@ -496,7 +498,7 @@ void output_damage_whole_container(struct sway_output *output,
static void damage_handle_destroy(struct wl_listener *listener, void *data) {
struct sway_output *output =
wl_container_of(listener, output, damage_destroy);
- container_destroy(output->swayc);
+ output_begin_destroy(output->swayc);
}
static void handle_destroy(struct wl_listener *listener, void *data) {
@@ -504,7 +506,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_signal_emit(&output->events.destroy, output);
if (output->swayc) {
- container_destroy(output->swayc);
+ output_begin_destroy(output->swayc);
}
wl_list_remove(&output->link);
@@ -554,7 +556,7 @@ void handle_new_output(struct wl_listener *listener, void *data) {
wl_signal_add(&wlr_output->events.destroy, &output->destroy);
output->destroy.notify = handle_destroy;
- wl_list_insert(&root_container.sway_root->outputs, &output->link);
+ wl_list_insert(&root_container.sway_root->all_outputs, &output->link);
if (!wl_list_empty(&wlr_output->modes)) {
struct wlr_output_mode *mode =
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index aa70903e..b5a10370 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -24,7 +24,7 @@
#include "sway/server.h"
#include "sway/tree/arrange.h"
#include "sway/tree/container.h"
-#include "sway/tree/layout.h"
+#include "sway/tree/root.h"
#include "sway/tree/view.h"
#include "sway/tree/workspace.h"
@@ -813,8 +813,6 @@ static void render_floating(struct sway_output *soutput,
}
}
-const char *damage_debug = NULL;
-
void output_render(struct sway_output *output, struct timespec *when,
pixman_region32_t *damage) {
struct wlr_output *wlr_output = output->wlr_output;
@@ -828,21 +826,17 @@ void output_render(struct sway_output *output, struct timespec *when,
wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height);
- bool damage_whole_before_swap = false;
if (!pixman_region32_not_empty(damage)) {
// Output isn't damaged but needs buffer swap
goto renderer_end;
}
- if (damage_debug != NULL) {
- if (strcmp(damage_debug, "highlight") == 0) {
- wlr_renderer_clear(renderer, (float[]){1, 1, 0, 1});
- damage_whole_before_swap = true;
- } else if (strcmp(damage_debug, "rerender") == 0) {
- int width, height;
- wlr_output_transformed_resolution(wlr_output, &width, &height);
- pixman_region32_union_rect(damage, damage, 0, 0, width, height);
- }
+ if (debug.damage == DAMAGE_HIGHLIGHT) {
+ wlr_renderer_clear(renderer, (float[]){1, 1, 0, 1});
+ } 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);
}
struct sway_container *workspace = output_get_active_workspace(output);
@@ -916,12 +910,12 @@ render_overlay:
render_drag_icons(output, damage, &root_container.sway_root->drag_icons);
renderer_end:
- if (root_container.sway_root->debug_tree) {
+ if (debug.render_tree) {
+ wlr_renderer_scissor(renderer, NULL);
wlr_render_texture(renderer, root_container.sway_root->debug_tree,
- wlr_output->transform_matrix, 0, 0, 1);
+ wlr_output->transform_matrix, 0, 40, 1);
}
-
- if (damage_whole_before_swap || root_container.sway_root->debug_tree) {
+ 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 692fb447..c18529fb 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -1,5 +1,6 @@
#define _POSIX_C_SOURCE 200809L
#include <errno.h>
+#include <limits.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
@@ -16,26 +17,12 @@
#include "list.h"
#include "log.h"
-/**
- * How long we should wait for views to respond to the configure before giving
- * up and applying the transaction anyway.
- */
-int txn_timeout_ms = 200;
-
-/**
- * If enabled, sway will always wait for the transaction timeout before
- * applying it, rather than applying it when the views are ready. This allows us
- * to observe the rendered state while a transaction is in progress.
- */
-bool txn_debug = false;
-
struct sway_transaction {
struct wl_event_source *timer;
list_t *instructions; // struct sway_transaction_instruction *
size_t num_waiting;
size_t num_configures;
uint32_t con_ids; // Bitwise XOR of view container IDs
- struct timespec create_time;
struct timespec commit_time;
};
@@ -53,9 +40,6 @@ static struct sway_transaction *transaction_create() {
return NULL;
}
transaction->instructions = create_list();
- if (server.debug_txn_timings) {
- clock_gettime(CLOCK_MONOTONIC, &transaction->create_time);
- }
return transaction;
}
@@ -70,7 +54,22 @@ static void transaction_destroy(struct sway_transaction *transaction) {
con->instruction = NULL;
}
if (con->destroying && con->ntxnrefs == 0) {
- container_free(con);
+ switch (con->type) {
+ case C_ROOT:
+ break;
+ case C_OUTPUT:
+ output_destroy(con);
+ break;
+ case C_WORKSPACE:
+ workspace_destroy(con);
+ break;
+ case C_CONTAINER:
+ case C_VIEW:
+ container_destroy(con);
+ break;
+ case C_TYPES:
+ break;
+ }
}
free(instruction);
}
@@ -150,19 +149,14 @@ static void transaction_add_container(struct sway_transaction *transaction,
*/
static void transaction_apply(struct sway_transaction *transaction) {
wlr_log(WLR_DEBUG, "Applying transaction %p", transaction);
- if (server.debug_txn_timings) {
+ if (debug.txn_timings) {
struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
- struct timespec *create = &transaction->create_time;
struct timespec *commit = &transaction->commit_time;
- float ms_arranging = (commit->tv_sec - create->tv_sec) * 1000 +
- (commit->tv_nsec - create->tv_nsec) / 1000000.0;
- float ms_waiting = (now.tv_sec - commit->tv_sec) * 1000 +
+ float ms = (now.tv_sec - commit->tv_sec) * 1000 +
(now.tv_nsec - commit->tv_nsec) / 1000000.0;
- float ms_total = ms_arranging + ms_waiting;
- wlr_log(WLR_DEBUG, "Transaction %p: %.1fms arranging, %.1fms waiting, "
- "%.1fms total (%.1f frames if 60Hz)", transaction,
- ms_arranging, ms_waiting, ms_total, ms_total / (1000.0f / 60));
+ wlr_log(WLR_DEBUG, "Transaction %p: %.1fms waiting "
+ "(%.1f frames if 60Hz)", transaction, ms, ms / (1000.0f / 60));
}
// Apply the instruction state to the container's current state
@@ -196,7 +190,9 @@ static void transaction_apply(struct sway_transaction *transaction) {
sizeof(struct sway_container_state));
if (container->type == C_VIEW && container->sway_view->saved_buffer) {
- view_remove_saved_buffer(container->sway_view);
+ if (!container->destroying || container->ntxnrefs == 1) {
+ view_remove_saved_buffer(container->sway_view);
+ }
}
// Damage the new location
@@ -214,6 +210,9 @@ static void transaction_apply(struct sway_transaction *transaction) {
}
container->instruction = NULL;
+ if (container->type == C_CONTAINER || container->type == C_VIEW) {
+ container_discover_outputs(container);
+ }
}
}
@@ -304,7 +303,7 @@ static void transaction_commit(struct sway_transaction *transaction) {
struct timespec when;
wlr_surface_send_frame_done(con->sway_view->surface, &when);
}
- if (con->type == C_VIEW) {
+ if (con->type == C_VIEW && !con->sway_view->saved_buffer) {
view_save_buffer(con->sway_view);
memcpy(&con->sway_view->saved_geometry, &con->sway_view->geometry,
sizeof(struct wlr_box));
@@ -312,25 +311,30 @@ static void transaction_commit(struct sway_transaction *transaction) {
con->instruction = instruction;
}
transaction->num_configures = transaction->num_waiting;
- if (server.debug_txn_timings) {
+ if (debug.txn_timings) {
clock_gettime(CLOCK_MONOTONIC, &transaction->commit_time);
}
+ if (debug.noatomic) {
+ transaction->num_waiting = 0;
+ } else if (debug.txn_wait) {
+ // Force the transaction to time out even if all views are ready.
+ // We do this by inflating the waiting counter.
+ transaction->num_waiting += 1000000;
+ }
if (transaction->num_waiting) {
// Set up a timer which the views must respond within
transaction->timer = wl_event_loop_add_timer(server.wl_event_loop,
handle_timeout, transaction);
if (transaction->timer) {
- wl_event_source_timer_update(transaction->timer, txn_timeout_ms);
+ wl_event_source_timer_update(transaction->timer,
+ server.txn_timeout_ms);
} else {
wlr_log(WLR_ERROR, "Unable to create transaction timer (%s). "
"Some imperfect frames might be rendered.",
strerror(errno));
- handle_timeout(transaction);
+ transaction->num_waiting = 0;
}
- } else {
- wlr_log(WLR_DEBUG,
- "Transaction %p has nothing to wait for", transaction);
}
// The debug tree shows the pending/live tree. Here is a good place to
@@ -343,7 +347,7 @@ static void set_instruction_ready(
struct sway_transaction_instruction *instruction) {
struct sway_transaction *transaction = instruction->transaction;
- if (server.debug_txn_timings) {
+ if (debug.txn_timings) {
struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
struct timespec *start = &transaction->commit_time;
@@ -354,21 +358,16 @@ static void set_instruction_ready(
transaction->num_configures - transaction->num_waiting + 1,
transaction->num_configures, ms,
instruction->container->name);
-
}
// If the transaction has timed out then its num_waiting will be 0 already.
if (transaction->num_waiting > 0 && --transaction->num_waiting == 0) {
- if (!txn_debug) {
- wlr_log(WLR_DEBUG, "Transaction %p is ready", transaction);
- wl_event_source_timer_update(transaction->timer, 0);
- }
+ wlr_log(WLR_DEBUG, "Transaction %p is ready", transaction);
+ wl_event_source_timer_update(transaction->timer, 0);
}
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/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index aae129bd..7d1824f1 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -13,7 +13,6 @@
#include "sway/server.h"
#include "sway/tree/arrange.h"
#include "sway/tree/container.h"
-#include "sway/tree/layout.h"
#include "sway/tree/view.h"
static const struct sway_view_child_impl popup_impl;
@@ -448,7 +447,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&xdg_shell_view->map.link);
wl_list_remove(&xdg_shell_view->unmap.link);
view->wlr_xdg_surface = NULL;
- view_destroy(view);
+ view_begin_destroy(view);
}
struct sway_view *view_from_wlr_xdg_surface(
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 277c53a3..522fddca 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -12,7 +12,6 @@
#include "sway/server.h"
#include "sway/tree/arrange.h"
#include "sway/tree/container.h"
-#include "sway/tree/layout.h"
#include "sway/tree/view.h"
static const struct sway_view_child_impl popup_impl;
@@ -441,7 +440,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&xdg_shell_v6_view->map.link);
wl_list_remove(&xdg_shell_v6_view->unmap.link);
view->wlr_xdg_surface_v6 = NULL;
- view_destroy(view);
+ view_begin_destroy(view);
}
struct sway_view *view_from_wlr_xdg_surface_v6(
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index ce7235e4..4e401008 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -14,7 +14,6 @@
#include "sway/server.h"
#include "sway/tree/arrange.h"
#include "sway/tree/container.h"
-#include "sway/tree/layout.h"
#include "sway/tree/view.h"
static const char *atom_map[ATOM_LAST] = {
@@ -341,7 +340,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&xwayland_view->set_hints.link);
wl_list_remove(&xwayland_view->map.link);
wl_list_remove(&xwayland_view->unmap.link);
- view_destroy(&xwayland_view->view);
+ view_begin_destroy(&xwayland_view->view);
}
static void handle_unmap(struct wl_listener *listener, void *data) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 19:21:54 +0000