alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix nitpicks

Browse source
This commit is contained in:
Ryan Dwyer 2018-06-27 17:23:44 +10:00
parent a7b3f29292
commit 61c1187685
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/desktop/transaction.c
View file

@ -73,8 +73,7 @@ static void save_view_buffer(struct sway_view *view,
remove_saved_view_buffer(instruction); remove_saved_view_buffer(instruction);
} }
if (view->surface && wlr_surface_has_buffer(view->surface)) { if (view->surface && wlr_surface_has_buffer(view->surface)) {
wlr_buffer_ref(view->surface->buffer); instruction->saved_buffer = wlr_buffer_ref(view->surface->buffer);
instruction->saved_buffer = view->surface->buffer;
} }
} }
@ -198,12 +197,11 @@ static void transaction_apply(struct sway_transaction *transaction) {
(now.tv_nsec - commit->tv_nsec) / 1000000.0; (now.tv_nsec - commit->tv_nsec) / 1000000.0;
float ms_total = ms_arranging + ms_waiting; float ms_total = ms_arranging + ms_waiting;
wlr_log(L_DEBUG, "Transaction %p: %.1fms arranging, %.1fms waiting, " wlr_log(L_DEBUG, "Transaction %p: %.1fms arranging, %.1fms waiting, "
"%.1fms total (%.1f frames if 60hz)", transaction, "%.1fms total (%.1f frames if 60Hz)", transaction,
ms_arranging, ms_waiting, ms_total, ms_total / (1000 / 60)); ms_arranging, ms_waiting, ms_total, ms_total / (1000 / 60));
} }
int i;
// Apply the instruction state to the container's current state // Apply the instruction state to the container's current state
for (i = 0; i < transaction->instructions->length; ++i) { for (int i = 0; i < transaction->instructions->length; ++i) {
struct sway_transaction_instruction *instruction = struct sway_transaction_instruction *instruction =
transaction->instructions->items[i]; transaction->instructions->items[i];
struct sway_container *container = instruction->container; struct sway_container *container = instruction->container;
@ -220,7 +218,7 @@ static void transaction_apply(struct sway_transaction *transaction) {
} }
// Apply damage // Apply damage
for (i = 0; i < transaction->damage->length; ++i) { for (int i = 0; i < transaction->damage->length; ++i) {
struct wlr_box *box = transaction->damage->items[i]; struct wlr_box *box = transaction->damage->items[i];
for (int j = 0; j < root_container.children->length; ++j) { for (int j = 0; j < root_container.children->length; ++j) {
struct sway_container *output = root_container.children->items[j]; struct sway_container *output = root_container.children->items[j];

3
sway/tree/container.c
View file

@ -296,7 +296,8 @@ static struct sway_container *container_output_destroy(
/** /**
* Implement the actual destroy logic, without reaping. * Implement the actual destroy logic, without reaping.
*/ */
struct sway_container *container_destroy_noreaping(struct sway_container *con) { static struct sway_container *container_destroy_noreaping(
struct sway_container *con) {
if (con == NULL) { if (con == NULL) {
return NULL; return NULL;
} }