From c7c0c46fbeb3f7bc51cc129369db9dcdb27e9b94 Mon Sep 17 00:00:00 2001 From: Cagebreak Signing Key 3 Date: Sun, 16 Aug 2020 23:23:02 +0200 Subject: [PATCH] Release 1.3.4 - Fix dependency versions - Improve code quality --- README.md | 5 +++++ keybinding.c | 1 + man/cagebreak-config.5.md | 2 +- man/cagebreak.1.md | 2 +- meson.build | 8 ++++---- signatures/1.3.3.sig | Bin 0 -> 566 bytes signatures/cagebreak.sig | Bin 566 -> 566 bytes view.c | 15 +++++++-------- 8 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 signatures/1.3.3.sig diff --git a/README.md b/README.md index e96c3ba..fd4dbac 100644 --- a/README.md +++ b/README.md @@ -180,6 +180,11 @@ ninja -C build For every release after 1.0.5, hashes will be provided. +1.3.4 + + * sha 256: ea9f634b8f6e2b9f191745a25abff4969eb7ea19cb3186b79a6138904aedeb1c + * sha 512: 9094f9c92acbff8fd95d38e7458c5184804f8913fa8c405bc2b6a0a220fe478b06cfeadbae41bd5ef84bde8d5642c249df9dada953e39c25926aa650c30a5309 + 1.3.3 * sha 256: 801851ceb52afac333a1decdd236ddef55555f8b36f865e8b3a831975a496f0d diff --git a/keybinding.c b/keybinding.c index 054f638..ce80ba5 100644 --- a/keybinding.c +++ b/keybinding.c @@ -833,6 +833,7 @@ keybinding_configure_output(struct cg_server *server, if(strcmp(cfg->output_name, it->output_name) == 0) { wl_list_remove(&it->link); free(it->output_name); + free(it); } } wl_list_insert(&server->output_config, &cfg->link); diff --git a/man/cagebreak-config.5.md b/man/cagebreak-config.5.md index 969f56d..8d4f274 100644 --- a/man/cagebreak-config.5.md +++ b/man/cagebreak-config.5.md @@ -1,4 +1,4 @@ -% CAGEBREAK-CONFIG(1) Version 1.3.3 | Cagebreak Manual +% CAGEBREAK-CONFIG(1) Version 1.3.4 | Cagebreak Manual # NAME diff --git a/man/cagebreak.1.md b/man/cagebreak.1.md index 0ae8733..b205722 100644 --- a/man/cagebreak.1.md +++ b/man/cagebreak.1.md @@ -1,4 +1,4 @@ -% CAGEBREAK(1) Version 1.3.3 | Cagebreak Manual +% CAGEBREAK(1) Version 1.3.4 | Cagebreak Manual # NAME diff --git a/meson.build b/meson.build index 53edb52..23a3ccc 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('cagebreak', 'c', - version: '1.3.3', + version: '1.3.4', license: 'MIT', default_options: [ 'c_std=c11', @@ -53,7 +53,7 @@ if is_freebsd ) endif -wlroots = dependency('wlroots', version: '>= 0.9.1') +wlroots = dependency('wlroots', version: '>= 0.11.0') wayland_protos = dependency('wayland-protocols', version: '>=1.14') wayland_server = dependency('wayland-server') wayland_cursor = dependency('wayland-cursor') @@ -199,9 +199,9 @@ reproducible_build_versions = { 'xkbcommon': '0.10.0', 'fontconfig': '2.13.91', 'pixman': '0.40.0', - 'pango': '1.44.7', + 'pango': '1.46.0', 'cairo': '1.17.3', - 'pangocairo': '1.44.7', + 'pangocairo': '1.46.0', 'math': '-1' } diff --git a/signatures/1.3.3.sig b/signatures/1.3.3.sig new file mode 100644 index 0000000000000000000000000000000000000000..467b8fa7d513b4fa4667e7c1be0ccf486b2e93b2 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+6HLHmt3S1SZD7Rm95KPD1rPrth0$&#I=l}`{5Ofes z$K0jYs43|X0JV&Jah3qi^*SX#R{o#`6%1*XePQ5pW80&sPtHGIG6QI*>GluOhC+^6 z(Qh%M$hVS;Ga~y@FV4&ZS{3Hw(CuTJw{uIN2gvMK187PfnMYw|hsq9@)2YiXtB>ez zTDeb~-4H7Jiagd(dd&>hRZq}2@1^b`Q;U9m!H^!e@t5rVdiirsAWHpE9<{AhITBKI z42PD5PyDdm%nOR%>}l~K5RFl7o`ei)0%S4q>wT?&CwytMO#7t>E0PEae9T>AF-%kQ zO$>E<6h%`$9+|OsxXc6rS$>uhMQ<6@EMr`w8%!cRS`P!jh+OeFd>8(bLjS zlA_%&g(ZQzQ95AjTt3$zq5Uy5DbPik$WXD@l%T4~2e0Nz*sHv0n7uYJg#|$v76HhW znYi~`E^nGJm!eR4DT|$hj=}8bfX=-2G<_Ltuf)dT+z#SB&B0ilS E;Y_j+V*mgE literal 0 HcmV?d00001 diff --git a/signatures/cagebreak.sig b/signatures/cagebreak.sig index 467b8fa7d513b4fa4667e7c1be0ccf486b2e93b2..6809315d89c19e3a7b1af6367c83dc0ebbf154ab 100644 GIT binary patch delta 542 zcmV+(0^$9(1hxc_BY!!eumB1P5Ofes$K0jYsN4$>0I`>E*IlOG>AV}(GQ0bo_-BZ0|Xadp}l>_lTC0uO#;xpZUo1X^CB2{_79I945jWxv4D36vdh zDfR-XIbGt=@`ZAOUzT)0wpYT#IGdcp*;cFhC<2QRLB|{Jjei?+B*GvfdgCD26c*C! z1Pe{vG;_nE=Eg_;{iZ~TmsS7u#vULKmv!F3PS=aL89vQ4vNU5XjD@&K7WeED4->W;oUs||7oubP;-{qD@A%)Kh!Dx&irV*qM5R39{ry_6^-{W z8+e+`nV{y<+yXyFo6@9K_n9e9x?{pJvYt<@rn=V(VCm*~c@YSQ0f=SL1Tj)gD75)H z#HuVGu{Fi-&)9#d$}RU9oh_$jAxdv=(LyW7Yxt?ea(@IK(V%?nkSXx@jiVQu z!BMUCnF`1u4cQ%2NwL*5D6NCr92o?w#|e>!ju_M6cJl5@ZFMwx+9{Af=^fpKG4sr2?9Zzp2RutSGluOhC+^6(Qh%M$hVS;Ga~y@FV4&ZS{3Hw(CuTJw{uIN z2gvMK187PfnMYw|hsq9@)2YiXtB>ezTDeb~-4H7Jiagd(dVkFf)>Ti?H}9qHAybQf zeZi0(xAB+k{d)OxP9RGCP#(3dR5=n-bPR`3_r_A7=^phoJ<4X&ul}?Gb6z_^TudCjfH7Ffsc=NFhwE0@M_q?*6aR zZdet5JP`W{@SS%%<|@LHr*M4*u_@8h(oT}1-7keDfxA&UVC!5y*C3(&F*GUAMVZJ@ zvDcKKs>uhh=1SPBylI%dHZg?-K^PVR$d#G6_ggM+ntw2tqELA$i=Bgxz~9ARry=;r zPl;lRJ@MNbFPa@bWw(NClaG^nt7GSP`kvHewj<-#13k?wWjHle`_P0~V(5LgN?0?# z|F9FA_dD%Ua{@^tg*&sa-fLS`AYku)8 gG)GPBWfzp}X=-2G<_Ltuf)dT+z#SB&B0ilS;hHiE9RL6T diff --git a/view.c b/view.c index 167ed7e..a975d73 100644 --- a/view.c +++ b/view.c @@ -276,15 +276,14 @@ view_unmap(struct cg_view *view) { struct cg_view *prev = view_get_prev_view(view); wlr_output_damage_add_box(view_tile->workspace->output->damage, &view_tile->tile); - if((view->workspace->server->seat->seat->keyboard_state - .focused_surface == NULL || - view->workspace->server->seat->seat->keyboard_state - .focused_surface == view->wlr_surface) && - view->workspace->server->curr_output - ->workspaces[view->workspace->server->curr_output - ->curr_workspace] - ->focused_tile == view_tile) { + if(view == view->workspace->server->seat->focused_view) { seat_set_focus(view->workspace->server->seat, prev); + } else if(view->workspace->server->seat->seat->keyboard_state + .focused_surface == view->wlr_surface) { + wlr_seat_keyboard_clear_focus( + view->workspace->server->seat->seat); + seat_set_focus(view->workspace->server->seat, + view->workspace->server->seat->focused_view); } else { view_tile->view = prev; if(prev != NULL) {