aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rootston/desktop.c4
-rw-r--r--rootston/output.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 14703e6e..4d1cb199 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -31,8 +31,8 @@ void view_get_input_bounds(struct roots_view *view, struct wlr_box *box) {
return;
}
box->x = box->y = 0;
- box->width = view->wlr_surface->current.width;
- box->height = view->wlr_surface->current.height;
+ box->width = view->wlr_surface->current->width;
+ box->height = view->wlr_surface->current->height;
}
void view_activate(struct roots_view *view, bool activate) {
diff --git a/rootston/output.c b/rootston/output.c
index 5aeb71b1..833ee4aa 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -31,7 +31,7 @@ static void render_view(struct roots_desktop *desktop,
surface->texture, &matrix);
struct wlr_frame_callback *cb, *cnext;
- wl_list_for_each_safe(cb, cnext, &surface->frame_callback_list, link) {
+ wl_list_for_each_safe(cb, cnext, &surface->current->frame_callback_list, link) {
wl_callback_send_done(cb->resource, timespec_to_msec(when));
wl_resource_destroy(cb->resource);
}
@@ -52,8 +52,8 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
for (size_t i = 0; i < desktop->views->length; ++i) {
struct roots_view *view = desktop->views->items[i];
- int width = view->wlr_surface->current.buffer_width;
- int height = view->wlr_surface->current.buffer_height;
+ int width = view->wlr_surface->current->buffer_width;
+ int height = view->wlr_surface->current->buffer_height;
if (wlr_output_layout_intersects(desktop->layout, wlr_output,
view->x, view->y, view->x + width, view->y + height)) {