blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update rootston for surface changes

This commit is contained in:
Tony Crisci 2017-09-28 19:32:04 -04:00
parent 3a04f5b2db
commit 2e8543cac0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rootston/desktop.c
View File

@ -31,8 +31,8 @@ void view_get_input_bounds(struct roots_view *view, struct wlr_box *box) {
return; return;
} }
box->x = box->y = 0; box->x = box->y = 0;
box->width = view->wlr_surface->current.width; box->width = view->wlr_surface->current->width;
box->height = view->wlr_surface->current.height; box->height = view->wlr_surface->current->height;
} }
void view_activate(struct roots_view *view, bool activate) { void view_activate(struct roots_view *view, bool activate) {

6
rootston/output.c
View File

@ -31,7 +31,7 @@ static void render_view(struct roots_desktop *desktop,
surface->texture, &matrix); surface->texture, &matrix);
struct wlr_frame_callback *cb, *cnext; 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_callback_send_done(cb->resource, timespec_to_msec(when));
wl_resource_destroy(cb->resource); 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) { for (size_t i = 0; i < desktop->views->length; ++i) {
struct roots_view *view = desktop->views->items[i]; struct roots_view *view = desktop->views->items[i];
int width = view->wlr_surface->current.buffer_width; int width = view->wlr_surface->current->buffer_width;
int height = view->wlr_surface->current.buffer_height; int height = view->wlr_surface->current->buffer_height;
if (wlr_output_layout_intersects(desktop->layout, wlr_output, if (wlr_output_layout_intersects(desktop->layout, wlr_output,
view->x, view->y, view->x + width, view->y + height)) { view->x, view->y, view->x + width, view->y + height)) {