diff --git a/README.md b/README.md index 7b722f4..169431b 100644 --- a/README.md +++ b/README.md @@ -204,6 +204,21 @@ For every release after 1.0.5, hashes will be provided. For every release after 1.7.0, hashes will be provided for man pages too. +1.7.3 cagebreak + + * sha 256: 8adb4911d9603fec5b8eb4f67a09be95b8f0b37e50d4ab579191da78df18f70b + * sha 512: eddaecd7b577b9fe77b1ed4d341074f7f860967568392d0479543ea8860b4289df3eb5645885e18e35260b14843663ae50f98103f8016e857237a397632322a6 + +1.7.3 cagebreak.1 + + * sha 256: bcc623e42c86ab65bc2f8cb7e4377ca0d816ddc281527b7caeded62753e943b8 + * sha 512: b4290e1040bd6a299d478ad6b695de75cf030d0d274340b43d3ed4382cf6877f824cd4ed9d7020bfb55afe276c62de7fc07c3fbee6f6485c6440a024115afe12 + +1.7.3 cagebreak-config.5 + + * sha 256: b9789b6abd473e9afb33d4e2c7822f7d8f3c10e9eb3fb70c47b713f6331c626a + * sha 512: c49e01cfc4a4ed272f054bea8f2845f0e3f1609cf85d1a0ce14c1b67dc207df153b11bc20ceef09c855d467f0e013e54623ce9f70c217c4278607fc54d0e3206 + 1.7.2 cagebreak * sha 256: 40f4642e8e8caee338055079b046f6e0b790c87226ee307b27a64fcb2a6c6472 @@ -331,6 +346,13 @@ For every release after 1.0.5, a GPG signature will be provided in `signatures`. The current signature is called `cagebreak.sig`, whereas all older signatures will be named after their release version. +Due to errors in the release process, the releases 1.7.1 and 1.7.2 did not include the release +signatures in the appropriate folder of the git repository. However, signatures were provided +as release-artefacts at the time of release. The signatures were introduced into the +repository with 1.7.3. The integrity of cagebreak is still the same because the signatures were +provided as release-artefacts (which were themselves signed) and the hashes in README.md +are part of a signed release tag. + #### Signing Keys All releases are signed by at least one of the following collection of diff --git a/man/cagebreak-config.5.md b/man/cagebreak-config.5.md index 557cbac..c3447fd 100644 --- a/man/cagebreak-config.5.md +++ b/man/cagebreak-config.5.md @@ -1,4 +1,4 @@ -cagebreak-config(1) "Version 1.7.2" "Cagebreak Manual" +cagebreak-config(1) "Version 1.7.3" "Cagebreak Manual" # NAME diff --git a/man/cagebreak.1.md b/man/cagebreak.1.md index d0e67db..2b4514f 100644 --- a/man/cagebreak.1.md +++ b/man/cagebreak.1.md @@ -1,4 +1,4 @@ -cagebreak(1) "Version 1.7.2" "Cagebreak Manual" +cagebreak(1) "Version 1.7.3" "Cagebreak Manual" # NAME diff --git a/meson.build b/meson.build index 2e5c248..9e73902 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('cagebreak', 'c', - version: '1.7.2', + version: '1.7.3', license: 'MIT', default_options: [ 'c_std=c11', @@ -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') @@ -198,13 +198,13 @@ reproducible_build_versions = { 'wayland_server': '1.19.0', 'wayland_client': '1.19.0', 'wayland_cursor': '1.19.0', - 'wlroots': '0.13.0', + 'wlroots': '0.14.0', 'xkbcommon': '1.3.0', 'fontconfig': '2.13.93', 'pixman': '0.40.0', - 'pango': '1.48.4', + 'pango': '1.48.5', 'cairo': '1.17.4', - 'pangocairo': '1.48.4', + 'pangocairo': '1.48.5', 'math': '-1' } @@ -257,7 +257,7 @@ if get_option('man-pages') output : 'cagebreak.1', input : 'man/cagebreak.1.md', capture : true, - command : [sh, '-c', 'export SOURCE_DATE_EPOCH=1621324686 ; @0@ < @INPUT@'.format(scdoc.path())], + command : [sh, '-c', 'export SOURCE_DATE_EPOCH=1624989203 ; @0@ < @INPUT@'.format(scdoc.path())], install: true, install_dir: mandir1 ) @@ -266,7 +266,7 @@ if get_option('man-pages') output : 'cagebreak-config.5', input : 'man/cagebreak-config.5.md', capture : true, - command : [sh, '-c', 'export SOURCE_DATE_EPOCH=1621324686 ; @0@ < @INPUT@'.format(scdoc.path())], + command : [sh, '-c', 'export SOURCE_DATE_EPOCH=1624989203 ; @0@ < @INPUT@'.format(scdoc.path())], install: true, install_dir: mandir5 ) diff --git a/message.c b/message.c index acf1ffc..2ff2075 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/signatures/1.7.1-cagebreak-config.5.sig b/signatures/1.7.1-cagebreak-config.5.sig new file mode 100644 index 0000000..048473e Binary files /dev/null and b/signatures/1.7.1-cagebreak-config.5.sig differ diff --git a/signatures/1.7.1-cagebreak.1.sig b/signatures/1.7.1-cagebreak.1.sig new file mode 100644 index 0000000..35c9e1f Binary files /dev/null and b/signatures/1.7.1-cagebreak.1.sig differ diff --git a/signatures/1.7.1.sig b/signatures/1.7.1.sig new file mode 100644 index 0000000..e54765f Binary files /dev/null and b/signatures/1.7.1.sig differ diff --git a/signatures/1.7.2-cagebreak-config.5.sig b/signatures/1.7.2-cagebreak-config.5.sig new file mode 100644 index 0000000..a6facb1 Binary files /dev/null and b/signatures/1.7.2-cagebreak-config.5.sig differ diff --git a/signatures/1.7.2-cagebreak.1.sig b/signatures/1.7.2-cagebreak.1.sig new file mode 100644 index 0000000..17ef4b3 Binary files /dev/null and b/signatures/1.7.2-cagebreak.1.sig differ diff --git a/signatures/1.7.2.sig b/signatures/1.7.2.sig new file mode 100644 index 0000000..5fd3ee9 Binary files /dev/null and b/signatures/1.7.2.sig differ diff --git a/signatures/cagebreak-config.5.sig b/signatures/cagebreak-config.5.sig index a6facb1..7461360 100644 Binary files a/signatures/cagebreak-config.5.sig and b/signatures/cagebreak-config.5.sig differ diff --git a/signatures/cagebreak.1.sig b/signatures/cagebreak.1.sig index 17ef4b3..95b9fad 100644 Binary files a/signatures/cagebreak.1.sig and b/signatures/cagebreak.1.sig differ diff --git a/signatures/cagebreak.sig b/signatures/cagebreak.sig index 5fd3ee9..c0e3497 100644 Binary files a/signatures/cagebreak.sig and b/signatures/cagebreak.sig differ diff --git a/view.c b/view.c index 410a746..19ae2ad 100644 --- a/view.c +++ b/view.c @@ -337,7 +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, 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); }