mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-29 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 1942ab6cc4 into 024b9d85ea

Browse source
This commit is contained in:
William Wold 2018-09-10 12:34:23 +00:00 • committed by GitHub
commit 2634c667bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sway/desktop/transaction.c
View file

@ -10,6 +10,7 @@
#include "sway/desktop.h"
#include "sway/desktop/idle_inhibit_v1.h"
#include "sway/desktop/transaction.h"
#include "sway/input/cursor.h"
#include "sway/output.h"
#include "sway/tree/container.h"
#include "sway/tree/node.h"
@ -532,4 +533,6 @@ void transaction_commit_dirty(void) {
// if the transaction has nothing to wait for.
transaction_progress_queue();
}
if (config->handler_context.seat)
cursor_send_pointer_motion(config->handler_context.seat->cursor, 0, true);
}

2
sway/tree/container.c
View file

@ -218,7 +218,7 @@ static struct sway_container *container_at_tabbed(struct sway_node *parent,
// Surfaces
struct sway_node *current = seat_get_active_child(seat, parent);
return tiling_container_at(current, lx, ly, surface, sx, sy);
return current ? tiling_container_at(current, lx, ly, surface, sx, sy) : NULL;
}
/**

2
sway/tree/node.c
View file

@ -38,7 +38,7 @@ void node_set_dirty(struct sway_node *node) {
}
bool node_is_view(struct sway_node *node) {
return node->type == N_CONTAINER && node->sway_container->view;
return node && node->type == N_CONTAINER && node->sway_container->view;
}
char *node_get_name(struct sway_node *node) {