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

Update to new surface enter/leave API

Browse source
This commit is contained in:
Kenny Levinsen 2020-11-07 22:08:24 +01:00
parent 0df5753aed
commit 44e9774636
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sway/desktop/layer_shell.c
View file

@ -369,7 +369,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
struct sway_output *output = sway_layer->layer_surface->output->data; struct sway_output *output = sway_layer->layer_surface->output->data;
output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y, output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y,
sway_layer->layer_surface->surface, true); sway_layer->layer_surface->surface, true);
wlr_surface_send_enter(sway_layer->layer_surface->surface, wlr_surface_enter_output(sway_layer->layer_surface->surface,
sway_layer->layer_surface->output); sway_layer->layer_surface->output);
cursor_rebase_all(); cursor_rebase_all();
} }
@ -416,7 +416,7 @@ static void popup_handle_map(struct wl_listener *listener, void *data) {
struct sway_layer_popup *popup = wl_container_of(listener, popup, map); struct sway_layer_popup *popup = wl_container_of(listener, popup, map);
struct sway_layer_surface *layer = popup_get_layer(popup); struct sway_layer_surface *layer = popup_get_layer(popup);
struct wlr_output *wlr_output = layer->layer_surface->output; struct wlr_output *wlr_output = layer->layer_surface->output;
wlr_surface_send_enter(popup->wlr_popup->base->surface, wlr_output); wlr_surface_enter_output(popup->wlr_popup->base->surface, wlr_output);
popup_damage(popup, true); popup_damage(popup, true);
} }

4
sway/tree/container.c
View file

@ -1161,13 +1161,13 @@ bool container_is_fullscreen_or_child(struct sway_container *container) {
static void surface_send_enter_iterator(struct wlr_surface *surface, static void surface_send_enter_iterator(struct wlr_surface *surface,
int x, int y, void *data) { int x, int y, void *data) {
struct wlr_output *wlr_output = data; struct wlr_output *wlr_output = data;
wlr_surface_send_enter(surface, wlr_output); wlr_surface_enter_output(surface, wlr_output);
} }
static void surface_send_leave_iterator(struct wlr_surface *surface, static void surface_send_leave_iterator(struct wlr_surface *surface,
int x, int y, void *data) { int x, int y, void *data) {
struct wlr_output *wlr_output = data; struct wlr_output *wlr_output = data;
wlr_surface_send_leave(surface, wlr_output); wlr_surface_leave_output(surface, wlr_output);
} }
void container_discover_outputs(struct sway_container *con) { void container_discover_outputs(struct sway_container *con) {

2
sway/tree/view.c
View file

@ -1049,7 +1049,7 @@ void view_child_init(struct sway_view_child *child,
struct sway_workspace *workspace = child->view->container->workspace; struct sway_workspace *workspace = child->view->container->workspace;
if (workspace) { if (workspace) {
wlr_surface_send_enter(child->surface, workspace->output->wlr_output); wlr_surface_enter_output(child->surface, workspace->output->wlr_output);
} }
view_init_subsurfaces(child->view, surface); view_init_subsurfaces(child->view, surface);