mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-18 05:59:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into exit-nag

Browse source
This commit is contained in:
Brian Ashworth 2018-08-02 22:18:14 -04:00 committed by GitHub
parent 94888e58a2 4eadf9f3ae
commit b16043aeeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/sway/tree/container.h
View file

@ -234,6 +234,10 @@ struct sway_container *container_at(struct sway_container *workspace,
double lx, double ly, struct wlr_surface **surface,
double *sx, double *sy);
struct sway_container *container_at_view(struct sway_container *view,
double lx, double ly, struct wlr_surface **surface,
double *sx, double *sy);
/**
* Apply the function for each descendant of the container breadth first.
*/

2
sway/input/cursor.c
View file

@ -99,7 +99,7 @@ static struct sway_container *container_at_coords(
return ws;
}
if (ws->sway_workspace->fullscreen) {
return container_at(ws->sway_workspace->fullscreen, lx, ly,
return container_at_view(ws->sway_workspace->fullscreen, lx, ly,
surface, sx, sy);
}
if ((*surface = layer_surface_at(output,

2
sway/server.c
View file

@ -9,6 +9,7 @@
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_export_dmabuf_v1.h>
#include <wlr/types/wlr_gamma_control.h>
#include <wlr/types/wlr_gamma_control_v1.h>
#include <wlr/types/wlr_idle.h>
#include <wlr/types/wlr_layer_shell.h>
#include <wlr/types/wlr_linux_dmabuf_v1.h>
@ -56,6 +57,7 @@ bool server_init(struct sway_server *server) {
wlr_data_device_manager_create(server->wl_display);
wlr_gamma_control_manager_create(server->wl_display);
wlr_gamma_control_manager_v1_create(server->wl_display);
wlr_primary_selection_device_manager_create(server->wl_display);
server->new_output.notify = handle_new_output;

2
sway/tree/container.c
View file

@ -535,7 +535,7 @@ struct sway_container *container_parent(struct sway_container *container,
return container;
}
static struct sway_container *container_at_view(struct sway_container *swayc,
struct sway_container *container_at_view(struct sway_container *swayc,
double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) {
if (!sway_assert(swayc->type == C_VIEW, "Expected a view")) {