mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix xwayland configure in set_size

This commit is contained in:
emersion 2018-03-31 11:30:15 -04:00
parent 0f7936735c
commit 98b67e2399
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sway/desktop/output.c
View File

@ -247,11 +247,13 @@ static void render_output(struct sway_output *output, struct timespec *when,
continue;
}
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
const struct wlr_box view_box = {
.x = view->wlr_xwayland_surface->x,
.y = view->wlr_xwayland_surface->y,
.width = view->wlr_xwayland_surface->width,
.height = view->wlr_xwayland_surface->height,
.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)) {

6
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);
}
@ -151,7 +151,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;
@ -206,7 +206,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;
}
}