aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2021-09-30 21:03:09 +0200
committerLibravatar Kirill Primak <vyivel@posteo.net>2021-10-01 00:21:56 +0300
commitc43f1fbf1c0f9ec607854ab912324ce150c43f7b (patch)
tree2a3a8190a9720f18a365ae48fa5d9576282512dd
parentAdd support for DRM panel orientation (diff)
downloadsway-c43f1fbf1c0f9ec607854ab912324ce150c43f7b.tar.gz
sway-c43f1fbf1c0f9ec607854ab912324ce150c43f7b.tar.zst
sway-c43f1fbf1c0f9ec607854ab912324ce150c43f7b.zip
Chase wlr_xdg_surface breaking changes
See [1]. [1]: https://github.com/swaywm/wlroots/pull/3106
-rw-r--r--sway/desktop/layer_shell.c4
-rw-r--r--sway/desktop/xdg_shell.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index 7b249be3..7f5a337b 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -483,8 +483,8 @@ static struct sway_layer_surface *popup_get_layer(
483static void popup_damage(struct sway_layer_popup *layer_popup, bool whole) { 483static void popup_damage(struct sway_layer_popup *layer_popup, bool whole) {
484 struct wlr_xdg_popup *popup = layer_popup->wlr_popup; 484 struct wlr_xdg_popup *popup = layer_popup->wlr_popup;
485 struct wlr_surface *surface = popup->base->surface; 485 struct wlr_surface *surface = popup->base->surface;
486 int popup_sx = popup->geometry.x - popup->base->geometry.x; 486 int popup_sx = popup->geometry.x - popup->base->current.geometry.x;
487 int popup_sy = popup->geometry.y - popup->base->geometry.y; 487 int popup_sy = popup->geometry.y - popup->base->current.geometry.y;
488 int ox = popup_sx, oy = popup_sy; 488 int ox = popup_sx, oy = popup_sy;
489 struct sway_layer_surface *layer; 489 struct sway_layer_surface *layer;
490 while (true) { 490 while (true) {
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 7c78a897..fe67c8a7 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -27,8 +27,8 @@ static void popup_get_view_coords(struct sway_view_child *child,
27 struct wlr_xdg_surface *surface = popup->wlr_xdg_surface; 27 struct wlr_xdg_surface *surface = popup->wlr_xdg_surface;
28 28
29 wlr_xdg_popup_get_toplevel_coords(surface->popup, 29 wlr_xdg_popup_get_toplevel_coords(surface->popup,
30 surface->popup->geometry.x - surface->geometry.x, 30 surface->popup->geometry.x - surface->current.geometry.x,
31 surface->popup->geometry.y - surface->geometry.y, 31 surface->popup->geometry.y - surface->current.geometry.y,
32 sx, sy); 32 sx, sy);
33} 33}
34 34
@@ -306,7 +306,7 @@ static void handle_commit(struct wl_listener *listener, void *data) {
306 306
307 if (view->container->node.instruction) { 307 if (view->container->node.instruction) {
308 transaction_notify_view_ready_by_serial(view, 308 transaction_notify_view_ready_by_serial(view,
309 xdg_surface->configure_serial); 309 xdg_surface->current.configure_serial);
310 } 310 }
311 311
312 view_damage_from(view); 312 view_damage_from(view);
@@ -425,8 +425,8 @@ static void handle_map(struct wl_listener *listener, void *data) {
425 struct sway_view *view = &xdg_shell_view->view; 425 struct sway_view *view = &xdg_shell_view->view;
426 struct wlr_xdg_surface *xdg_surface = view->wlr_xdg_surface; 426 struct wlr_xdg_surface *xdg_surface = view->wlr_xdg_surface;
427 427
428 view->natural_width = view->wlr_xdg_surface->geometry.width; 428 view->natural_width = view->wlr_xdg_surface->current.geometry.width;
429 view->natural_height = view->wlr_xdg_surface->geometry.height; 429 view->natural_height = view->wlr_xdg_surface->current.geometry.height;
430 if (!view->natural_width && !view->natural_height) { 430 if (!view->natural_width && !view->natural_height) {
431 view->natural_width = view->wlr_xdg_surface->surface->current.width; 431 view->natural_width = view->wlr_xdg_surface->surface->current.width;
432 view->natural_height = view->wlr_xdg_surface->surface->current.height; 432 view->natural_height = view->wlr_xdg_surface->surface->current.height;