From d57869d43add58331386fc8e89c14bb2b74afe17 Mon Sep 17 00:00:00 2001 From: project-repo Date: Wed, 23 Jun 2021 20:53:48 +0200 Subject: [PATCH 1/2] Add fixes for wlroots 0.14.0 --- meson.build | 2 +- message.c | 10 ++++++++-- view.c | 6 +++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 2e5c248..b123f0b 100644 --- a/meson.build +++ b/meson.build @@ -53,7 +53,7 @@ if is_freebsd ) endif -wlroots = dependency('wlroots', version: ['>=0.13.0', '< 0.14.0']) +wlroots = dependency('wlroots', version: ['>=0.14.0', '< 0.15.0']) wayland_protos = dependency('wayland-protocols', version: '>=1.14') wayland_server = dependency('wayland-server') wayland_cursor = dependency('wayland-cursor') diff --git a/message.c b/message.c index acf1ffc..e90593d 100644 --- a/message.c +++ b/message.c @@ -108,11 +108,17 @@ message_set_output(struct cg_output *output, const char *string, return; } message->message = create_message_texture(string, output); + if(!message->message) { + wlr_log(WLR_ERROR, "Could not create message texture"); + free(box); + free(message); + return; + } message->position = box; wl_list_insert(&output->messages, &message->link); - int width, height; - wlr_texture_get_size(message->message, &width, &height); + int width=message->message->width; + int height=message->message->height; message->position->width = width; message->position->height = height; switch(align) { diff --git a/view.c b/view.c index 410a746..a7116b6 100644 --- a/view.c +++ b/view.c @@ -337,7 +337,11 @@ view_map(struct cg_view *view, struct wlr_surface *surface, view->wlr_surface = surface; struct wlr_subsurface *subsurface; - wl_list_for_each(subsurface, &view->wlr_surface->subsurfaces, parent_link) { + wl_list_for_each(subsurface, &view->wlr_surface->subsurfaces_above, parent_link) { + subsurface_create(NULL, view, subsurface); + } + + wl_list_for_each(subsurface, &view->wlr_surface->subsurfaces_below, parent_link) { subsurface_create(NULL, view, subsurface); } From e4ebc1e292d553d6ceb4e9469596ce541c823efa Mon Sep 17 00:00:00 2001 From: project-repo Date: Wed, 23 Jun 2021 20:58:42 +0200 Subject: [PATCH 2/2] Apply clang-format --- message.c | 4 ++-- view.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/message.c b/message.c index e90593d..2ff2075 100644 --- a/message.c +++ b/message.c @@ -117,8 +117,8 @@ message_set_output(struct cg_output *output, const char *string, message->position = box; wl_list_insert(&output->messages, &message->link); - int width=message->message->width; - int height=message->message->height; + int width = message->message->width; + int height = message->message->height; message->position->width = width; message->position->height = height; switch(align) { diff --git a/view.c b/view.c index a7116b6..19ae2ad 100644 --- a/view.c +++ b/view.c @@ -337,11 +337,13 @@ view_map(struct cg_view *view, struct wlr_surface *surface, view->wlr_surface = surface; struct wlr_subsurface *subsurface; - wl_list_for_each(subsurface, &view->wlr_surface->subsurfaces_above, parent_link) { + wl_list_for_each(subsurface, &view->wlr_surface->subsurfaces_above, + parent_link) { subsurface_create(NULL, view, subsurface); } - wl_list_for_each(subsurface, &view->wlr_surface->subsurfaces_below, parent_link) { + wl_list_for_each(subsurface, &view->wlr_surface->subsurfaces_below, + parent_link) { subsurface_create(NULL, view, subsurface); }