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

Send surface enter/leave events

Browse source
This commit is contained in:
Drew DeVault 2018-02-25 17:23:36 -05:00
parent 61c1c3e7af
commit 8ad26c8afd
3 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/view.h
View file

@ -115,4 +115,6 @@ void view_set_activated(struct sway_view *view, bool activated);
void view_close(struct sway_view *view); void view_close(struct sway_view *view);
void view_update_outputs(struct sway_view *view, const struct wlr_box *before);
#endif #endif

1
sway/desktop/xdg_shell_v6.c
View file

@ -72,6 +72,7 @@ static void handle_commit(struct wl_listener *listener, void *data) {
wl_container_of(listener, sway_surface, commit); wl_container_of(listener, sway_surface, commit);
struct sway_view *view = sway_surface->view; struct sway_view *view = sway_surface->view;
// NOTE: We intentionally discard the view's desired width here // NOTE: We intentionally discard the view's desired width here
// TODO: Store this for restoration when moving to floating plane
// TODO: Let floating views do whatever // TODO: Let floating views do whatever
view->width = sway_surface->pending_width; view->width = sway_surface->pending_width;
view->height = sway_surface->pending_height; view->height = sway_surface->pending_height;

42
sway/tree/view.c
View file

@ -1,3 +1,7 @@
#include <wayland-server.h>
#include <wlr/types/wlr_output_layout.h>
#include "sway/container.h"
#include "sway/layout.h"
#include "sway/view.h" #include "sway/view.h"
const char *view_get_title(struct sway_view *view) { const char *view_get_title(struct sway_view *view) {
@ -30,13 +34,27 @@ const char *view_get_instance(struct sway_view *view) {
void view_set_size(struct sway_view *view, int width, int height) { void view_set_size(struct sway_view *view, int width, int height) {
if (view->iface.set_size) { if (view->iface.set_size) {
struct wlr_box box = {
.x = view->swayc->x,
.y = view->swayc->y,
.width = view->width,
.height = view->height,
};
view->iface.set_size(view, width, height); view->iface.set_size(view, width, height);
view_update_outputs(view, &box);
} }
} }
void view_set_position(struct sway_view *view, double ox, double oy) { void view_set_position(struct sway_view *view, double ox, double oy) {
if (view->iface.set_position) { if (view->iface.set_position) {
struct wlr_box box = {
.x = view->swayc->x,
.y = view->swayc->y,
.width = view->width,
.height = view->height,
};
view->iface.set_position(view, ox, oy); view->iface.set_position(view, ox, oy);
view_update_outputs(view, &box);
} }
} }
@ -51,3 +69,27 @@ void view_close(struct sway_view *view) {
view->iface.close(view); view->iface.close(view);
} }
} }
void view_update_outputs(struct sway_view *view, const struct wlr_box *before) {
struct wlr_output_layout *output_layout =
root_container.sway_root->output_layout;
struct wlr_box box = {
.x = view->swayc->x,
.y = view->swayc->y,
.width = view->width,
.height = view->height,
};
struct wlr_output_layout_output *layout_output;
wl_list_for_each(layout_output, &output_layout->outputs, link) {
bool intersected = before != NULL && wlr_output_layout_intersects(
output_layout, layout_output->output, before);
bool intersects = wlr_output_layout_intersects(output_layout,
layout_output->output, &box);
if (intersected && !intersects) {
wlr_surface_send_leave(view->surface, layout_output->output);
}
if (!intersected && intersects) {
wlr_surface_send_enter(view->surface, layout_output->output);
}
}
}