From f31509f4dfc851ac928fd4a3c2d7240f82c94afe Mon Sep 17 00:00:00 2001 From: Cagebreak Signing Key 7 Date: Fri, 12 Nov 2021 18:12:10 +0100 Subject: [PATCH] Release 1.8.1 - Fix Issue 27 (Add default config) --- Bugs.md | 11 +++++++++++ README.md | 15 +++++++++++++++ cagebreak.c | 14 ++++++++++++-- examples/config | 12 ++++++------ keybinding.c | 3 ++- man/cagebreak-config.5.md | 2 +- man/cagebreak.1.md | 2 +- meson.build | 12 +++++++----- signatures/1.8.0-cagebreak-config.5.sig | Bin 0 -> 566 bytes signatures/1.8.0-cagebreak.1.sig | Bin 0 -> 566 bytes signatures/1.8.0.sig | Bin 0 -> 566 bytes signatures/cagebreak-config.5.sig | Bin 566 -> 566 bytes signatures/cagebreak.1.sig | Bin 566 -> 566 bytes signatures/cagebreak.sig | Bin 566 -> 566 bytes 14 files changed, 55 insertions(+), 16 deletions(-) create mode 100644 signatures/1.8.0-cagebreak-config.5.sig create mode 100644 signatures/1.8.0-cagebreak.1.sig create mode 100644 signatures/1.8.0.sig diff --git a/Bugs.md b/Bugs.md index c9d9197..244056d 100644 --- a/Bugs.md +++ b/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. +``` + diff --git a/README.md b/README.md index 3008d93..a99d6fe 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.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 diff --git a/cagebreak.c b/cagebreak.c index 0738b67..838078f 100644 --- a/cagebreak.c +++ b/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; diff --git a/examples/config b/examples/config index 0ecf20b..f701684 100644 --- a/examples/config +++ b/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 diff --git a/keybinding.c b/keybinding.c index 5d802fe..f7761cd 100644 --- a/keybinding.c +++ b/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); diff --git a/man/cagebreak-config.5.md b/man/cagebreak-config.5.md index 321d6bf..4bffac7 100644 --- a/man/cagebreak-config.5.md +++ b/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 diff --git a/man/cagebreak.1.md b/man/cagebreak.1.md index 309be7c..ccbe02f 100644 --- a/man/cagebreak.1.md +++ b/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 diff --git a/meson.build b/meson.build index e8a2cfd..15806f5 100644 --- a/meson.build +++ b/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 ) diff --git a/signatures/1.8.0-cagebreak-config.5.sig b/signatures/1.8.0-cagebreak-config.5.sig new file mode 100644 index 0000000000000000000000000000000000000000..c33bf84d9accbd04cca9426eac3d91dc33604f84 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+QYm%>XjF(OTWxqo5S8LN|6>GT#0%1_dRR9VJ5b{@R z(`FTGxwqsH0JD;Fcemn6^SY>!r!$^IcZ_7=!le3F%&GbQ@i{az=tMD zp0SVH&aNKOu4vh~w+HyO|LJ6;!6ep8!5T2W%CS-pVG&<45g@Dgu36Z`!6ax|+Sw^&vpLKAM-l>lECW+VQ=3yjFGgPnb zJ9`P;qSVd&JSZHXjF(OTWxqo5S8LN|6>GT#0%1_dQ2+`F5b{@R z(`FTGxi-cR{TEiiucp;EP3jEprrM$ZM_fZqrWPN&0K?en`1W=d0HPQr+LjgYjRm)# zn>t#2X0)c6XWbU@j;R)2lF9uepP9e;&hHRy!exjIQwN4F!1c{>Hv+5 zE#_`|Y~aw@>Bk6o%i{QGF2QH%LBODOPiszs`!h1O1ZhsbE2gNBg|nEtNKdhQk{AHy&-O$yQfSiOhJCYRE3n-fU39%A>Z&%k;; zqXXK*ytgCS1_rm3xIvF^j}z8#zpwOC8V;_D@?z!80yNMwG0i9SPcYeIWJ;zw zUCh%`GQ2@JqH3=HY%;Ji9U;)p)uAcA+OILn88ma38x%Af>BTT_F$}3c3AVL_g9sMS Ex@pE2H2?qr literal 0 HcmV?d00001 diff --git a/signatures/1.8.0.sig b/signatures/1.8.0.sig new file mode 100644 index 0000000000000000000000000000000000000000..a7634a92693b30deb71ef71ca850c6d5cee432f8 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+QYm%>XjF(OTWxqo5S8LN|6>GT#0%1_dP5=rC5b{@R z(`FTGxodn6|9my%M3BiqldlUGnKP0S5JEIrZ%!Df&_|c^VtW@N1YPd_I$3t?X|pw2cSK4Ku>dJMllkR^pua z6fp!g+MDg3K>kL0!r?wG#X)#VgDg{2gbVh&Z2L z9NWkx{%nb>_!3(ia^Nt&y;@Dxx1^bXnc)5aVFW7=PMAq0+TbtQRiKw_sv&1VtI51n z#wNSeWlkz!vMj1Rwo(mJIP%iP+Sf>^%aDQz5{Sd++aJk?eibqa^NK+47`5T@1;;Fb zQ;Y`F=+^-+sO#lD@ literal 0 HcmV?d00001 diff --git a/signatures/cagebreak-config.5.sig b/signatures/cagebreak-config.5.sig index c33bf84d9accbd04cca9426eac3d91dc33604f84..a8dcddbb8fac719c3a8dff1262b4491f841c1ee0 100644 GIT binary patch delta 542 zcmV+(0^$9(1hxc_BY%#cegFyy5b{@R(`FTGxuLEP|4`&cLypF@_=!^Y6WMzO^hgwA z?*+8@Dy$)Vm7@m96jT!h<2A#{CdXKtCE&242O$oniCtN3j3GAMKT;B$q&Qezo5Yn5 z2spXjB*>uXpqJP-M(16>8#AO?SAj$3QII~;WVL(+CiHR&0)PJfyLDc)$(^)>9H3f7 zt{rsgg-xH5tbjLI?~rbC5d6p5sI|I|)bT0BeKq?t#4eQnVG9X1IgO?ds()us%+I9L z^aL?jSz*Qo7GFHZel4)s@T~XN1+QVEk~qx^kAhrGi_f(OL6Jg0P$H*9&T3aEv;-s( zp|gYna(I$~%YU$cPIP!s@*=(8uk!%;r#Ci%I;>{%OGVBm3d!dGrRQ#)GPlCjku4a} zDFCWtwo{IbIG<5x65psrCdQ{C@t&&ucUJIP-bIzy)g z8Hs>*40KYYafLPC78eBs_5BPtj7lb1upEYxDQ3Ekn%2C$g?z%6Y+-Z2%&v<%Z|5N6 gmC4hyQ5Sq0Et2JhKu>mS;VGKHgY`=1R+}^5Af~trk^lez delta 542 zcmV+(0^$9(1hxc_BY#lHRR9VJ5b{@R(`FTGxwqsH0JD;Fcemn6^SY>!r!$^IcZ_7= z!le3F%&GbQ@i{az=tMDp0SVH&aNKOu4vh~w|@utwg2g4q`@TCOTij2 zzRIyu4`C5sG7%uG7Iq-<*N8x#`QGPg9ul8Cqa9ZI6H7MR1B#NP>G&PHXA@Aq062&w z;B_7dTSVc+(f2WRaw!CaR@)@?%#&IAh0Ybb&y)-G2Snnlo;f;?P!W+3l8>LEze59- zKQMuXLJ{<@_^*f=du&kSN-vBb@^T2D^)1b=;>BP@Bs;tzB&{G z5*=Aaw2z;4aFE`qj`k*r*XQP8Buz6^ukAZ~3EiU9&42tnC>+RQJfnZ+Bn4plhoZU+ zXiwXCi%a@G{9%)9%ra%%Gv8cr|L zfDe+&7^=n^u5yVqlAyb7r@X0S;f)P=Fqtrz6u=FMJjQmdtug?^Y8WY0&Hq>S!YUs0 g6m&6}r5ExQ&{h`!RhS9E21%TB0Egqg8Ks!Q-o+IV6#xJL diff --git a/signatures/cagebreak.1.sig b/signatures/cagebreak.1.sig index 5b92ae876f29b78f3eb76342734bcb65cd350051..1ded6a279c2371a23ec98a1686c1f19371049416 100644 GIT binary patch delta 542 zcmV+(0^$9(1hxc_BY%#cc>oFt5b{@R(`FTGx!orZ|7$1CSrns?s|bmbwH!qeK~h#H zaMK7TOE7h-v3JIpA7XFy4;OdZ14yKN(!xZNltcN>5hx<08>j_3lK3O|qemqvQR|c5 z^4T6pg8i4vVl$}}KpqyzJ&*^xnT5>cS!`sN6;Fvq_@|AW1b>IWn@K@DAG>_L8my0; zKVuID&;`q+-Qed$;9y2Y4Y0t=n!YE#Xn^q3L3zKYlddGkNc(m{rZY?ovHt#2X0)c6XWbU@j;R)2lF9uepP94yWy9A{(nTc{K~cSzV<{86Jyai?it8=>1HMY!}s{0{Pl(>$!1lBPNY zoU>$PB!3>mT2?zDh~-LI+q_6BRe~q-8&xe|sZd;ytyK#kR??D9>cO5`0m}(#egMX= zy5F}HzYxRz$$!~R|HtM1Bh|#Z^mKt7_>?^B?AvZlMA5zfe#Qi|7^nWksr)8T7yOvCt{;th>?iME> z!!R^W3eo>qy@$#sm(p^Z6G*lmV)v@gzBTT_F$}3c3AVL_g9sMSx=5`MKL7v# diff --git a/signatures/cagebreak.sig b/signatures/cagebreak.sig index a7634a92693b30deb71ef71ca850c6d5cee432f8..ecd7a2566e766615ecc9c10e737a02ac53bfdfae 100644 GIT binary patch delta 542 zcmV+(0^$9(1hxc_BY%#cYyb)g5b{@R(`FTGx!T(h0H){{?qPG=ZpU$mlpWat9^EbI z{c8Lyy;kt1*rm4`Zn-JdM*sf#Fi(%sPDmIpoyiay;`|OpiqTRlr;+8wBa}3SO8i75 zFYA;Yv7K+zvGnd{dMA$AeU1kS*z!7IzR4+K>}FuDI`$qP<$sD2}UJ z2Js4GuBT(6UVnsCOT#w1Ype`|bR%gmg`DuLr_Yv#el*ExyIUy`ev2w}lt$9;g;7sb zAciNblts)Fq<97>)8tv%i*ie%B02-# znnn_On;KMEmO_cb>!nXJIa5&bmzSP4*-GFt3o3*kMSmPI{gB}NqDi3r)S$J;23Unt zp#K%^Iy8#TXKrSu2MIS+*|iqZrFKbQQXID!Hq)H!tUa-iIed|s`{`WgrFS{wA ggsG0*DHqv!$eYA*GQJEM60Wwi`us@?n#+x}kVpj(MgRZ+ delta 542 zcmV+(0^$9(1hxc_BY#lHP5=rC5b{@R(`FTGxodn6|9my%M3BiqldlUGnKP0S5JEIr zZ%!Df&_|c^VtWi+%BXvc%;fP@*6x+e^_T`{HB?NzckaNRu}nEVa>dn;Dj1gr+gxG;)>4F3;H z|5OtwtprYAoPUy1PVp;xUU(CFJt`HbY~MOIU1hfF4t+o8BCSW=m%4f&r1{huMy-pA z{VQjlT_$|-W}M#jHh>!Vkqd<@JWs4YP#sk8Q71DST(Nt0N(}8+vy)_nbD}OUBEV~6 zBM}1x9p_1*9r{97q6oz+%oqF}XPt;RpI;o?$R+-4iGQp35?dQ`;4r?uT20lrq?v%3 z;Qjz%1S=0tm`Nqt;4j%#pqFf_A!k9W$-Gp?CcD&SPAXusEUG-VQVmi#^3uiH*GQ<# zkb(&kh{NaGAIXP)6*39)ia_rewc+vw$1H(Uj0V%_*8wl(OTN08VdC$VE%0I^x;dpu g&h!776BlC8jPbp}Oi&ASE5p)mU^LXm{;@b8inmw+R{#J2