Release 1.8.1

- Fix Issue 27 (Add default config)

Bugs.md

@@ -341,3 +341,14 @@ The advantages are:
 Cagebreak has always used pandoc to compile man pages. Cagebreak now uses scdoc
 instead.
 
+### Issue 27
+
+  * github issue number: #8
+  * Fixed: 1.8.1
+
+```
+Apologies for opening two tickets instead of one, but I thought that these two suggestions are different enought they merit their own "issue".
+
+Would replicating the behaviour in ratpoison (if no config file is found, load predefined defaults) something you would be interested in? I personally found confusing when I first tried cagebreak that it wouldn't start without a config file, coming from ratpoison. Of course, other people's experience might be different.
+```
+

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.8.1 cagebreak
+
+  * sha 256: e3247281d21525413790e3feceae129d9b0559497615d3fdd64ec2fc4ab9ab3d
+  * sha 512: 8c7c2820be9d7c74e3f9e239c7da740ff41d7f11cd40953dbfbc59c04942077f08625f6d7ec37e6037fd9c4b6950fc4f9af23478080665fdda867c65e0a187bf
+
+1.8.1 cagebreak.1
+
+  * sha 256: 96997afdfde9c2719533799aa48c8f036610bb04bc719130d2ab3a3617b072ee
+  * sha 512: 0831f5d2e3b4f23fd5775df2b7f6486099d64962567222a8fb49e6a40e7d29ed36a7c2c16201bbdcc985ac74f1d0e034b530afbe0ce58d6a0c53d467cff0a6a0
+
+1.8.1 cagebreak-config.5
+
+  * sha 256: bd0e2eb02ba28ec1c8f2bd0fd5cd4c84af24b615fcc477414e49e68e1963cf1b
+  * sha 512: 7135a2b371294bfdc759a393c13fa0225f1789dba94bb09e96ae689796215b8030280d6cc09c9d1fe139f000f5a4748efd16bb3e5d3b9fcc74a19259802f20ef
+
 1.8.0 cagebreak
 
   * sha 256: ac84aa4a08c311da79ca29d92eef4254cb625674b255dbb75621ee6b171a1d79

cagebreak.c

@@ -192,7 +192,7 @@ set_configuration(struct cg_server *server,
 	if(config_file == NULL) {
 		wlr_log(WLR_ERROR, "Could not open config file \"%s\"",
 		        config_file_path);
-		return -1;
+		return 1;
 	}
 	char line[MAX_LINE_SIZE * sizeof(char)];
 	for(unsigned int line_num = 1;
@@ -557,7 +557,17 @@ main(int argc, char *argv[]) {
 			ret = 1;
 			goto end;
 		}
-		if(set_configuration(&server, config_file) != 0) {
+		int conf_ret = set_configuration(&server, config_file);
+
+		// Configurtion file not found
+		if(conf_ret == 1) {
+			char *default_conf = "/etc/xdg/cagebreak/config";
+			wlr_log(WLR_ERROR, "Loading default configuration file: \"%s\"",
+			        default_conf);
+			conf_ret = set_configuration(&server, default_conf);
+		}
+
+		if(conf_ret != 0) {
 			free(config_file);
 			ret = 1;
 			goto end;

examples/config

@@ -75,14 +75,14 @@ definekey top XF86MonBrightnessUp exec xbacklight -inc 1
 ######################
 #Output configuration
 ######################
-output eDP-1 pos 0 0 res 1366x768 rate 60
-output eDP-1 disable
-output eDP-1 enable
+#output eDP-1 pos 0 0 res 1366x768 rate 60
+#output eDP-1 disable
+#output eDP-1 enable
 
 #####################
 #Input configuration
 #####################
 
-input 1234:0:Device_Ident click_method clickfinger
-input type:pointer scroll_method two_finger
-input * calibration_matrix 1 2 3 4 5 6
+#input 1234:0:Device_Ident click_method clickfinger
+#input type:pointer scroll_method two_finger
+#input * calibration_matrix 1 2 3 4 5 6

keybinding.c

@@ -201,7 +201,8 @@ swap_tile(struct cg_tile *tile,
 		view_maximize(swap_tile->view, swap_tile);
 		view_damage_whole(swap_tile->view);
 	} else {
-		wlr_output_damage_add_box(tile->workspace->output->damage, &tile->tile);
+		wlr_output_damage_add_box(tile->workspace->output->damage,
+		                          &swap_tile->tile);
 	}
 
 	seat_set_focus(server->seat, swap_tile->view);

man/cagebreak-config.5.md

@@ -1,4 +1,4 @@
-cagebreak-config(1) "Version 1.8.0" "Cagebreak Manual"
+cagebreak-config(1) "Version 1.8.1" "Cagebreak Manual"
 
 # NAME
 

man/cagebreak.1.md

@@ -1,4 +1,4 @@
-cagebreak(1) "Version 1.8.0" "Cagebreak Manual"
+cagebreak(1) "Version 1.8.1" "Cagebreak Manual"
 
 # NAME
 

meson.build

@@ -1,5 +1,5 @@
 project('cagebreak', 'c',
-  version: '1.8.0',
+  version: '1.8.1',
   license: 'MIT',
   default_options: [
     'c_std=c11',
@@ -209,8 +209,8 @@ reproducible_build_versions = {
   'wlroots': '0.14.1',
   'xkbcommon': '1.3.1',
   'fontconfig': '2.13.94',
-  'libinput': '1.19.0',
-  'libevdev': '1.11.0',
+  'libinput': '1.19.2',
+  'libevdev': '1.12.0',
   'libudev': '249',
   'pixman': '0.40.0',
   'pango': '1.48.10',
@@ -258,6 +258,8 @@ executable(
   c_args: fuzz_compile_args,
 )
 
+install_data('examples/config', install_dir : '/etc/xdg/cagebreak')
+
 if get_option('man-pages')
   scdoc = find_program('scdoc')
   sh = find_program('sh')
@@ -268,7 +270,7 @@ if get_option('man-pages')
     output : 'cagebreak.1',
     input : 'man/cagebreak.1.md',
 	capture : true,
-    command : [sh, '-c', 'export SOURCE_DATE_EPOCH=1632645085 ; @0@ < @INPUT@'.format(scdoc.path())],
+    command : [sh, '-c', 'export SOURCE_DATE_EPOCH=1636733005 ; @0@ < @INPUT@'.format(scdoc.path())],
     install: true,
     install_dir: mandir1
     )
@@ -277,7 +279,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=1632645085 ; @0@ < @INPUT@'.format(scdoc.path())],
+    command : [sh, '-c', 'export SOURCE_DATE_EPOCH=1636733005 ; @0@ < @INPUT@'.format(scdoc.path())],
     install: true,
     install_dir: mandir5
     )