diff options
| -rw-r--r-- | sway/desktop/transaction.c | 1 | ||||
| -rw-r--r-- | sway/server.c | 4 | ||||
| -rw-r--r-- | sway/tree/container.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c index fcfb0b51..19f41efc 100644 --- a/sway/desktop/transaction.c +++ b/sway/desktop/transaction.c @@ -4,7 +4,6 @@ #include <string.h> #include <time.h> #include <wlr/types/wlr_buffer.h> -#include <wlr/types/wlr_linux_dmabuf.h> #include "sway/debug.h" #include "sway/desktop/idle_inhibit_v1.h" #include "sway/desktop/transaction.h" diff --git a/sway/server.c b/sway/server.c index ee71d538..89dfbf8c 100644 --- a/sway/server.c +++ b/sway/server.c @@ -11,7 +11,7 @@ #include <wlr/types/wlr_gamma_control.h> #include <wlr/types/wlr_idle.h> #include <wlr/types/wlr_layer_shell.h> -#include <wlr/types/wlr_linux_dmabuf.h> +#include <wlr/types/wlr_linux_dmabuf_v1.h> #include <wlr/types/wlr_primary_selection.h> #include <wlr/types/wlr_screencopy_v1.h> #include <wlr/types/wlr_server_decoration.h> @@ -108,7 +108,7 @@ bool server_init(struct sway_server *server) { wlr_server_decoration_manager_set_default_mode( deco_manager, WLR_SERVER_DECORATION_MANAGER_MODE_SERVER); - wlr_linux_dmabuf_create(server->wl_display, renderer); + wlr_linux_dmabuf_v1_create(server->wl_display, renderer); wlr_export_dmabuf_manager_v1_create(server->wl_display); wlr_screencopy_manager_v1_create(server->wl_display); diff --git a/sway/tree/container.c b/sway/tree/container.c index 02384199..4dbfbb29 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -660,7 +660,9 @@ struct sway_container *floating_container_at(double lx, double ly, if (!workspace_is_visible(workspace)) { continue; } - for (int k = 0; k < ws->floating->children->length; ++k) { + // Items at the end of the list are on top, so iterate the list in + // reverse. + for (int k = ws->floating->children->length - 1; k >= 0; --k) { struct sway_container *floater = ws->floating->children->items[k]; struct wlr_box box = { |