Release 1.3.4

- Fix dependency versions - Improve code quality
project-repo · Aug 16, 2020 · c7c0c46 · c7c0c46
1 parent c20e63b
commit c7c0c46
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/signatures/cagebreak.sig b/signatures/cagebreak.sig
diff --git 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) {