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

xwayland: listen to set_geometry event

Browse source 
Closes #5735, refs #3007.

This makes the "Search everywhere" dialog in JetBrains IDEs movable.
This commit is contained in:
Tudor Brindus 2020-10-18 00:07:41 -04:00 committed by Simon Ser
parent 5bcbc0b4a9
commit 181798c2fe
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/tree/view.h
View file

@ -174,6 +174,7 @@ struct sway_xwayland_unmanaged {
struct wl_listener request_configure; struct wl_listener request_configure;
struct wl_listener request_fullscreen; struct wl_listener request_fullscreen;
struct wl_listener commit; struct wl_listener commit;
struct wl_listener set_geometry;
struct wl_listener map; struct wl_listener map;
struct wl_listener unmap; struct wl_listener unmap;
struct wl_listener destroy; struct wl_listener destroy;

17
sway/desktop/xwayland.c
View file

@ -47,6 +47,15 @@ static void unmanaged_handle_commit(struct wl_listener *listener, void *data) {
wl_container_of(listener, surface, commit); wl_container_of(listener, surface, commit);
struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface; struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
desktop_damage_surface(xsurface->surface, surface->lx, surface->ly,
false);
}
static void unmanaged_handle_set_geometry(struct wl_listener *listener, void *data) {
struct sway_xwayland_unmanaged *surface =
wl_container_of(listener, surface, set_geometry);
struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
if (xsurface->x != surface->lx || xsurface->y != surface->ly) { if (xsurface->x != surface->lx || xsurface->y != surface->ly) {
// Surface has moved // Surface has moved
desktop_damage_surface(xsurface->surface, surface->lx, surface->ly, desktop_damage_surface(xsurface->surface, surface->lx, surface->ly,
@ -55,9 +64,6 @@ static void unmanaged_handle_commit(struct wl_listener *listener, void *data) {
surface->ly = xsurface->y; surface->ly = xsurface->y;
desktop_damage_surface(xsurface->surface, surface->lx, surface->ly, desktop_damage_surface(xsurface->surface, surface->lx, surface->ly,
true); true);
} else {
desktop_damage_surface(xsurface->surface, xsurface->x, xsurface->y,
false);
} }
} }
@ -68,6 +74,9 @@ static void unmanaged_handle_map(struct wl_listener *listener, void *data) {
wl_list_insert(root->xwayland_unmanaged.prev, &surface->link); wl_list_insert(root->xwayland_unmanaged.prev, &surface->link);
wl_signal_add(&xsurface->events.set_geometry, &surface->set_geometry);
surface->set_geometry.notify = unmanaged_handle_set_geometry;
wl_signal_add(&xsurface->surface->events.commit, &surface->commit); wl_signal_add(&xsurface->surface->events.commit, &surface->commit);
surface->commit.notify = unmanaged_handle_commit; surface->commit.notify = unmanaged_handle_commit;
@ -89,6 +98,7 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface; struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
desktop_damage_surface(xsurface->surface, xsurface->x, xsurface->y, true); desktop_damage_surface(xsurface->surface, xsurface->x, xsurface->y, true);
wl_list_remove(&surface->link); wl_list_remove(&surface->link);
wl_list_remove(&surface->set_geometry.link);
wl_list_remove(&surface->commit.link); wl_list_remove(&surface->commit.link);
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();
@ -174,7 +184,6 @@ static struct sway_xwayland_unmanaged *create_unmanaged(
return surface; return surface;
} }
static struct sway_xwayland_view *xwayland_view_from_view( static struct sway_xwayland_view *xwayland_view_from_view(
struct sway_view *view) { struct sway_view *view) {
if (!sway_assert(view->type == SWAY_VIEW_XWAYLAND, if (!sway_assert(view->type == SWAY_VIEW_XWAYLAND,