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

Merge pull request #1681 from emersion/xwayland-configure-position

Browse source 
Fix various xwayland issues
This commit is contained in:
Drew DeVault 2018-03-31 11:40:34 -04:00 committed by GitHub
parent a1e7ffd857 98b67e2399
commit 89ca6676be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sway/desktop/output.c
View file

@ -243,14 +243,25 @@ static void render_output(struct sway_output *output, struct timespec *when,
struct sway_view *view;
wl_list_for_each(view, &root_container.sway_root->unmanaged_views,
unmanaged_view_link) {
if (view->type == SWAY_XWAYLAND_VIEW) {
// the only kind of unamanged view right now is xwayland override
// redirect
int view_x = view->wlr_xwayland_surface->x;
int view_y = view->wlr_xwayland_surface->y;
render_surface(view->surface, wlr_output, &output->last_frame,
view_x, view_y, 0);
if (view->type != SWAY_XWAYLAND_VIEW) {
continue;
}
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
const struct wlr_box view_box = {
.x = xsurface->x,
.y = xsurface->y,
.width = xsurface->width,
.height = xsurface->height,
};
struct wlr_box intersection;
if (!wlr_box_intersection(&view_box, output_box, &intersection)) {
continue;
}
render_surface(view->surface, wlr_output, &output->last_frame,
view_box.x - output_box->x, view_box.y - output_box->y, 0);
}
// TODO: Consider revising this when fullscreen windows are supported

13
sway/desktop/xwayland.c
View file

@ -41,7 +41,7 @@ static void set_size(struct sway_view *view, int width, int height) {
view->sway_xwayland_surface->pending_height = height;
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
wlr_xwayland_surface_configure(xsurface, view->swayc->x, view->swayc->y,
wlr_xwayland_surface_configure(xsurface, xsurface->x, xsurface->y,
width, height);
}
@ -67,13 +67,10 @@ static void set_position(struct sway_view *view, double ox, double oy) {
view->swayc->x = ox;
view->swayc->y = oy;
if (view->width == 0 || view->height == 0) {
return;
}
wlr_xwayland_surface_configure(view->wlr_xwayland_surface,
ox + loutput->x, oy + loutput->y,
view->width, view->height);
view->wlr_xwayland_surface->width,
view->wlr_xwayland_surface->height);
}
static void set_activated(struct sway_view *view, bool activated) {
@ -157,7 +154,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
view_damage_whole(sway_surface->view);
}
static void handle_configure_request(struct wl_listener *listener, void *data) {
static void handle_request_configure(struct wl_listener *listener, void *data) {
struct sway_xwayland_surface *sway_surface =
wl_container_of(listener, sway_surface, request_configure);
struct wlr_xwayland_surface_configure_event *ev = data;
@ -212,7 +209,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
wl_signal_add(&xsurface->events.request_configure,
&sway_surface->request_configure);
sway_surface->request_configure.notify = handle_configure_request;
sway_surface->request_configure.notify = handle_request_configure;
wl_signal_add(&xsurface->events.unmap, &sway_surface->unmap);
sway_surface->unmap.notify = handle_unmap;

30
sway/input/cursor.c
View file

@ -50,21 +50,23 @@ static struct sway_container *container_at_cursor(struct sway_cursor *cursor,
struct wl_list *unmanaged = &root_container.sway_root->unmanaged_views;
struct sway_view *view;
wl_list_for_each_reverse(view, unmanaged, unmanaged_view_link) {
if (view->type == SWAY_XWAYLAND_VIEW) {
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
struct wlr_box box = {
.x = xsurface->x,
.y = xsurface->y,
.width = xsurface->width,
.height = xsurface->height,
};
if (view->type != SWAY_XWAYLAND_VIEW) {
continue;
}
if (wlr_box_contains_point(&box, cursor->x, cursor->y)) {
*surface = xsurface->surface;
*sx = cursor->x - box.x;
*sy = cursor->y - box.y;
return NULL;
}
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
struct wlr_box box = {
.x = xsurface->x,
.y = xsurface->y,
.width = xsurface->width,
.height = xsurface->height,
};
if (wlr_box_contains_point(&box, cursor->x, cursor->y)) {
*surface = xsurface->surface;
*sx = cursor->x - box.x;
*sy = cursor->y - box.y;
return NULL;
}
}