From a0ef72c6eb0ef432b6ad768d8a03423b6f581611 Mon Sep 17 00:00:00 2001 From: Cagebreak Signing Key 7 Date: Mon, 6 Dec 2021 21:16:22 +0100 Subject: [PATCH] Release 1.8.2 - Fix Issue 28 - Update year in copyright notices --- Bugs.md | 12 +++++++ LICENSE | 2 +- README.md | 15 ++++++++ idle_inhibit_v1.c | 2 +- input_manager.c | 2 +- ipc_server.c | 2 +- man/cagebreak-config.5.md | 4 +-- man/cagebreak.1.md | 4 +-- meson.build | 10 +++--- output.c | 2 +- render.c | 2 +- seat.c | 2 +- server.c | 2 +- signatures/1.8.1-cagebreak-config.5.sig | Bin 0 -> 566 bytes signatures/1.8.1-cagebreak.1.sig | Bin 0 -> 566 bytes signatures/1.8.2.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 util.c | 2 +- view.c | 44 +++++------------------- view.h | 1 - workspace.c | 2 +- xdg_shell.c | 19 +--------- xwayland.c | 2 +- 25 files changed, 57 insertions(+), 74 deletions(-) create mode 100644 signatures/1.8.1-cagebreak-config.5.sig create mode 100644 signatures/1.8.1-cagebreak.1.sig create mode 100644 signatures/1.8.2.sig diff --git a/Bugs.md b/Bugs.md index 244056d..328450d 100644 --- a/Bugs.md +++ b/Bugs.md @@ -352,3 +352,15 @@ Apologies for opening two tickets instead of one, but I thought that these two s 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. ``` +### Issue 28 + + * github issue number: #10 + * Fixed: 1.8.2 + +``` +I'm using v. 1.8.1 and am experiencing a screen refresh lag, particularly on Firefox: + +When I type in anything, the text is refreshed and becomes visible only following mouse movement. I don't experience this with the same setup when I use Sway as the compositor. +``` + +Cagebreak had an error with damage tracking. diff --git a/LICENSE b/LICENSE index bd31b7d..538d78c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2020-2021 The Cagebreak authors +Copyright (c) 2020-2022 The Cagebreak authors Copyright (c) 2018-2020 Jente Hidskes Copyright (c) 2019 The Sway authors diff --git a/README.md b/README.md index a99d6fe..ef88746 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.2 cagebreak + + * sha 256: f4d275d48ba3d999969f8cb3c8142d27aa8e8d362106ee7575e4b13c02173b2a + * sha 512: 72b11cb966b0978133b9848c2a7f57574c599c7fe895ca9f1cba16930216e1ac8aeae86d976593fc01b15e94ecc1430666f474654cf2fe41eda8c1181bf03f3d + +1.8.2 cagebreak.1 + + * sha 256: 51ee97a7c0b86268cf7622f84f7b1813df8e4a7838c00aae412a611d3693e87a + * sha 512: 5ce826afbee9cbc1129f37463f5b6d4dfc060583f6f7816dd5039b18d66a2b7e22f7293a4aa03acc4e6c690886d0297fef5b9f85d720a4467becfd833b59a160 + +1.8.2 cagebreak-config.5 + + * sha 256: 7c780ba85211ba40c7535b3f10f12312f9edeaa10030228ba21a96724469a325 + * sha 512: 9a56ba16c2aed6f17d4098e54900a5d25602f986e3606dd6ed26563c1920c66404b210dbca9f41bfcc3284bf5a42b750263bcaa2317320f8725e8f9c66e8b893 + 1.8.1 cagebreak * sha 256: e3247281d21525413790e3feceae129d9b0559497615d3fdd64ec2fc4ab9ab3d diff --git a/idle_inhibit_v1.c b/idle_inhibit_v1.c index 7da2dd7..8ebc768 100644 --- a/idle_inhibit_v1.c +++ b/idle_inhibit_v1.c @@ -1,7 +1,7 @@ /* * Cagebreak: A Wayland tiling compositor. * - * Copyright (C) 2020 The Cagebreak Authors + * Copyright (C) 2020-2022 The Cagebreak Authors * Copyright (C) 2018-2019 Jente Hidskes * * See the LICENSE file accompanying this file. diff --git a/input_manager.c b/input_manager.c index 10f94fa..2157b43 100644 --- a/input_manager.c +++ b/input_manager.c @@ -1,7 +1,7 @@ /* * Cagebreak: A Wayland tiling compositor. * - * Copyright (C) 2020 The Cagebreak Authors + * Copyright (C) 2020-2022 The Cagebreak Authors * Copyright (C) 2018-2020 Jente Hidskes * * See the LICENSE file accompanying this file. diff --git a/ipc_server.c b/ipc_server.c index a7c6f21..7301867 100644 --- a/ipc_server.c +++ b/ipc_server.c @@ -1,7 +1,7 @@ /* * Cagebreak: A Wayland tiling compositor. * - * Copyright (C) 2020 The Cagebreak Authors + * Copyright (C) 2020-2022 The Cagebreak Authors * Copyright (C) 2018-2020 Jente Hidskes * * See the LICENSE file accompanying this file. diff --git a/man/cagebreak-config.5.md b/man/cagebreak-config.5.md index 4bffac7..670c58e 100644 --- a/man/cagebreak-config.5.md +++ b/man/cagebreak-config.5.md @@ -1,4 +1,4 @@ -cagebreak-config(1) "Version 1.8.1" "Cagebreak Manual" +cagebreak-config(1) "Version 1.8.2" "Cagebreak Manual" # NAME @@ -286,7 +286,7 @@ See GitHub Issues: # LICENSE -Copyright (c) 2020-2021 The Cagebreak authors +Copyright (c) 2020-2022 The Cagebreak authors Copyright (c) 2018-2020 Jente Hidskes Copyright (c) 2019 The Sway authors diff --git a/man/cagebreak.1.md b/man/cagebreak.1.md index ccbe02f..cfb0a22 100644 --- a/man/cagebreak.1.md +++ b/man/cagebreak.1.md @@ -1,4 +1,4 @@ -cagebreak(1) "Version 1.8.1" "Cagebreak Manual" +cagebreak(1) "Version 1.8.2" "Cagebreak Manual" # NAME @@ -75,7 +75,7 @@ See GitHub Issues: # LICENSE -Copyright (c) 2020-2021 The Cagebreak authors +Copyright (c) 2020-2022 The Cagebreak authors Copyright (c) 2018-2020 Jente Hidskes Copyright (c) 2019 The Sway authors diff --git a/meson.build b/meson.build index 15806f5..b81b261 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('cagebreak', 'c', - version: '1.8.1', + version: '1.8.2', license: 'MIT', default_options: [ 'c_std=c11', @@ -213,9 +213,9 @@ reproducible_build_versions = { 'libevdev': '1.12.0', 'libudev': '249', 'pixman': '0.40.0', - 'pango': '1.48.10', + 'pango': '1.50.0', 'cairo': '1.17.4', - 'pangocairo': '1.48.10', + 'pangocairo': '1.50.0', 'math': '-1' } @@ -270,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=1636733005 ; @0@ < @INPUT@'.format(scdoc.path())], + command : [sh, '-c', 'export SOURCE_DATE_EPOCH=1638785664 ; @0@ < @INPUT@'.format(scdoc.path())], install: true, install_dir: mandir1 ) @@ -279,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=1636733005 ; @0@ < @INPUT@'.format(scdoc.path())], + command : [sh, '-c', 'export SOURCE_DATE_EPOCH=1638785664 ; @0@ < @INPUT@'.format(scdoc.path())], install: true, install_dir: mandir5 ) diff --git a/output.c b/output.c index 028f8b8..8feaec9 100644 --- a/output.c +++ b/output.c @@ -1,7 +1,7 @@ /* * Cagebreak: A Wayland tiling compositor. * - * Copyright (C) 2020 The Cagebreak Authors + * Copyright (C) 2020-2022 The Cagebreak Authors * Copyright (C) 2018-2020 Jente Hidskes * Copyright (C) 2019 The Sway authors * diff --git a/render.c b/render.c index 80c769b..ca4a2d2 100644 --- a/render.c +++ b/render.c @@ -1,7 +1,7 @@ /* * Cagebreak: A Wayland tiling compositor. * - * Copyright (C) 2020 The Cagebreak Authors + * Copyright (C) 2020-2022 The Cagebreak Authors * Copyright (C) 2018-2020 Jente Hidskes * Copyright (C) 2019 The Sway authors * diff --git a/seat.c b/seat.c index 91ab374..280b3ea 100644 --- a/seat.c +++ b/seat.c @@ -1,7 +1,7 @@ /* * Cagebreak: A Wayland tiling compositor. * - * Copyright (C) 2020 The Cagebreak Authors + * Copyright (C) 2020-2022 The Cagebreak Authors * Copyright (C) 2018-2020 Jente Hidskes * * See the LICENSE file accompanying this file. diff --git a/server.c b/server.c index 1ad23e6..e5b6137 100644 --- a/server.c +++ b/server.c @@ -1,7 +1,7 @@ /* * Cagebreak: A Wayland tiling compositor. * - * Copyright (C) 2020 The Cagebreak Authors + * Copyright (C) 2020-2022 The Cagebreak Authors * Copyright (C) 2018-2019 Jente Hidskes * * See the LICENSE file accompanying this file. diff --git a/signatures/1.8.1-cagebreak-config.5.sig b/signatures/1.8.1-cagebreak-config.5.sig new file mode 100644 index 0000000000000000000000000000000000000000..a8dcddbb8fac719c3a8dff1262b4491f841c1ee0 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+QYm%>XjF(OTWxqo5S8LN|6>GT#0%4AyegFyy5b{@R z(`FTGxuLEP|4`&cLypF@_=!^Y6WMzO^hgwA?*+8@Dy$)Vm7@m96jT!h<2A#{CdXKt zCE&242O$oniCtN3j3GAMKT;B$q&Qezo5Yn52spXjB*>uXpqJP-M(16>8#AO?SAj$3 zQII~;WVL(+CiHR&0{;EGbzZc|owS4;pjt()9dzl1O`npifHzq0kZy7i{Kwj;wYrYf z@hQc9HTyHfE|mUZ3kfzkjiwK(e`in3&!p4z1Tk1yVa5g)Up&TsEwI_}toPOhuVJE+ zIL!->f?Q0C&$S0ZkwQRFBBw;oYF8+<1SAomvxEY2c#?t3uzyZ;cu?{pz2C3%0Qsjk zHi0^!qt&27||&Js$;fOj*K{;QD@{!*~33EnKO%z=+q3h z=<;@2iHE?l?eu)Iq-mFx2X8NBr5CHy{-@oa+{IByh1^*m-;Cg@InL8E@^t#X`?F2F zfJA^EjI)FUIxvvAhS>|h+F3Y4As=!-6G^9u*u6-ob5>KHNuOlCIxQN6L=3t4 z6{K0vi=eJiF;m^|YtPE(@H@$07CJ+x1sREecMNn=q;Z8c-xe1I1oiz4H;hUqS+E?2 zk|}1oj+)lIyoG$imTX~jz|5|TI&bG7mS;VGKHgY`=1R+}^5 EAl|$ZhyVZp literal 0 HcmV?d00001 diff --git a/signatures/1.8.1-cagebreak.1.sig b/signatures/1.8.1-cagebreak.1.sig new file mode 100644 index 0000000000000000000000000000000000000000..1ded6a279c2371a23ec98a1686c1f19371049416 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+QYm%>XjF(OTWxqo5S8LN|6>GT#0%4Ayc>oFt5b{@R z(`FTGx!orZ|7$1CSrns?s|bmbwH!qeK~h#HaMK7TOE7h-v3JIpA7XFy4;OdZ14yKN z(!xZNltcN>5hx<08>j_3lK3O|qemqvQR|c5^4T6pg8i4vVl$}}KpqyzJ&*^xnT5>c zS!`sN6;Fvq_@|AW1c$$yNkKdxyL`PGtdE>OV-E(<2slS_DSo7^Ge%s(6ed^5$aFsiw}q zPDcJkDxN6RHR$etsF1I|1Z;Qt;!#qi4i}O$oQ)WMae=#nlYbLm?sp^~-=-6tCLvGS zpMPpZ#U5IgJd*DCr;aJUtb}sE3h>$uM@Gv^Eo>zof0Nc>V|x252492nB1J2U0I%=s zGH8>Z+zs%+B#?`GR3?egEw|(hX^t#2EUIGi9=xS5VrSzB) zxxR|n1$py7&eB1Kh-{Z*{^NowXjF(OTWxqo5S8LN|6>GT#0%4AyYyb)g5b{@R z(`FTGx!T(h0H){{?qPG=ZpU$mlpWat9^EbI{c8Lyy;kt1*rm4`Zn-JdM*sf#Fi(%s zPDmIpoyiay;`|OpiqTRlr;+8wBa}3SO8i75FYA;Yv7K+zvGnd{dMA$AeU1kS*z!7I zzR4+K>}FuDI`$qP<(@8+d}cU=>Sfo6PU6J9)4CN$b)+);f3gf0KQJKEAT3wWwjBfifp5G6cfrxDu zeigvv$zH8E2x=;*YN|pzK=FKpfazQ)j;mV+@d{(Er(>aBgj7qzHoI%A41;tdX)lGG z@T{lLmWF;b$!WV=DG+{(Ds+@a((i>)PgEd=C#;l3%oC(|1}1p&cgQ7gTYrJbvb3pr zwd*U^2n-gn=2x#p?!43FS=oznOQIq=1K*lP5_+2&R9TiniNfopPck`EQ1X|To;KM^ z;4%v;gdas5G5wI>{Gv&q{nVhf#|Bu1Q=tD9?K(7y&S!3BrUwZ(RN1u_(xrAuUs4>m z7&gKOJ|^7+8)ACXIIcGymF{E5h>ReJ}Q!NQlav`zPR` zt{A@OUb0ec*j}*6kA3S-L;m+WSTDONpoFQ8-6`35$eYA*GQJEM60Wwi`us@?n#+x} EkZ=JPJOBUy literal 0 HcmV?d00001 diff --git a/signatures/cagebreak-config.5.sig b/signatures/cagebreak-config.5.sig index a8dcddbb8fac719c3a8dff1262b4491f841c1ee0..ee831f34180a3a1a6e550daa8af0771ea5b7043d 100644 GIT binary patch delta 542 zcmV+(0^$9(1hxc_BY&=KtpExM5b{@R(`FTGxgfO=0ItNOUOYhumTMlu%Hu1cO*sO@ zH7RNJ9K5<%$u6D_`7J(o%ztq0pi0^6pn8wU3aWTLvC9h_mRaeoa#FegPZg%6{ppB8 zGjHXnL>6)*YM@7Xh2~8OplT6&-^m%;g-|wDJs+S;I>9p}segsh6pMqEUygy9;(0d- zYm6_MCj#+uHwJor0E=6&%_1dsIPC*5?*zD4`Z@rx-%NZ2WHv-;j1TPG6%&bA)j0PV z2a>)&bY7%^t}6zg9dX?F%||@kIA6;iidBk0hF~V_r8D2l4lffhr7}3w>zi&*7(bBl z`%mnhMG~8v4}Yj|^n#dGR7){#zuo&`GupJ6au&A)kS8IP>-sb#4~!y2Yea-&>u2Z{ zMa=2nt~b8&r~ct`om=iO@bn%BQ6|%(~Q4P6Pim+tK!LXBA)RlR?5mI9{M>K$H09%Xir7BV_}sX9K&RC4F)l5<*#Ksts_z?P_P gW{BxssuvGhg*M#2j#Vb`3CA}nCd%RcX-?0WmTW8sqW}N^ 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 diff --git a/signatures/cagebreak.1.sig b/signatures/cagebreak.1.sig index 1ded6a279c2371a23ec98a1686c1f19371049416..e4133eb28d3b10e4f566ea58267ec02a7b7976dd 100644 GIT binary patch delta 542 zcmV+(0^$9(1hxc_BY&=KssIWJ5b{@R(`FTGxq+Dv{yDkmKMvV5FYPhA3d4w~)7M2! zE0{DSNr!&NBv`?VAVXx0`;nkfXnCD{TJQGKtaLN1dkGQ=I@yUw|_-Z9o$sW*OjjhQ~&?~ 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?ovHt4sIdQZ1dh*xOcYCpyBO$2&yGw39yS9g5I&=TCPPJ{@=#* zdKHwc>aSS1sQENv0{MIO|2Ana3kNmtjT{qHGicfMUf0E47k^K?iF2bFJM#vnv7Xxn z#e3xuGU`^-V|r|C!uBT60+8qrz9$6G4UsA=M?Kk;#r_stB_K(^)emvrm-8K^wr_Rg zf@@bC4k~WoQ-A5C6VmRT?A>vcY>S%puddg)AM@rZ%(R%wyPU3w%4!B84Aw)drM2v# zlV=s6S-#0l?0<0>0~QlML+{HHSP5kMt;+sLO92P%cOrO%=GPUPeyXnMYS}%_Q`;z6 zlCY|iSl1&UO0v9QVH&%a5qJ5=#14u0(eHVvSplw^;R4n~`+Lw0Quh2BkbDsmxZPwKh=Kufz 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+ diff --git a/util.c b/util.c index 83b7e66..1e7fa7c 100644 --- a/util.c +++ b/util.c @@ -1,7 +1,7 @@ /* * Cagebreak: A Wayland tiling compositor. * - * Copyright (C) 2020 The Cagebreak Authors + * Copyright (C) 2020-2022 The Cagebreak Authors * Copyright (C) 2019 The Sway authors * * See the LICENSE file accompanying this file. diff --git a/view.c b/view.c index 19ae2ad..09fc463 100644 --- a/view.c +++ b/view.c @@ -1,7 +1,7 @@ /* * Cagebreak: A Wayland tiling compositor. * - * Copyright (C) 2020 The Cagebreak Authors + * Copyright (C) 2020-2022 The Cagebreak Authors * Copyright (C) 2018-2020 Jente Hidskes * * See the LICENSE file accompanying this file. @@ -51,10 +51,9 @@ view_get_prev_view(struct cg_view *view) { void view_damage_child(struct cg_view_child *child, bool whole) { - int x, y; - child->get_coords(child, &x, &y); - output_damage_surface(child->view->workspace->output, child->wlr_surface, - x + child->view->ox, y + child->view->oy, whole); + if(child->view != NULL) { + view_damage_part(child->view); + } } static void @@ -138,30 +137,6 @@ subsurface_handle_destroy(struct wl_listener *listener, void *_data) { subsurface_destroy(view_child); } -static void -subsurface_get_coords(struct cg_view_child *child, int *x, int *y) { - struct wlr_surface *surface = child->wlr_surface; - *x = *y = 0; - - if(child->parent && child->parent->get_coords) { - int sx, sy; - child->parent->get_coords(child->parent, &sx, &sy); - *x += sx; - *y += sy; - } else { - while(surface && wlr_surface_is_subsurface(surface)) { - struct wlr_subsurface *subsurface = - wlr_subsurface_from_wlr_surface(surface); - if(subsurface == NULL) { - break; - } - *x += subsurface->current.x; - *y += subsurface->current.y; - surface = subsurface->parent; - } - } -} - static void subsurface_create(struct cg_view_child *parent, struct cg_view *view, struct wlr_subsurface *wlr_subsurface) { @@ -173,7 +148,6 @@ subsurface_create(struct cg_view_child *parent, struct cg_view *view, view_child_init(&subsurface->view_child, parent, view, wlr_subsurface->surface); subsurface->view_child.destroy = subsurface_destroy; - subsurface->view_child.get_coords = subsurface_get_coords; subsurface->wlr_subsurface = wlr_subsurface; subsurface->destroy.notify = subsurface_handle_destroy; @@ -279,6 +253,11 @@ view_unmap(struct cg_view *view) { if(view->wlr_surface == NULL) { return; } + + struct cg_view_child *child, *tmp; + wl_list_for_each_safe(child, tmp, &view->children, link) { + child->destroy(child); + } #if CG_HAS_XWAYLAND if((view->type != CG_XWAYLAND_VIEW || xwayland_view_should_manage(view))) #endif @@ -323,11 +302,6 @@ view_unmap(struct cg_view *view) { wl_list_remove(&view->new_subsurface.link); view->wlr_surface = NULL; - - struct cg_view_child *child, *tmp; - wl_list_for_each_safe(child, tmp, &view->children, link) { - child->destroy(child); - } } void diff --git a/view.h b/view.h index add26b0..62a1f32 100644 --- a/view.h +++ b/view.h @@ -62,7 +62,6 @@ struct cg_view_child { struct wl_listener new_subsurface; void (*destroy)(struct cg_view_child *child); - void (*get_coords)(struct cg_view_child *child, int *x, int *y); }; struct cg_subsurface { diff --git a/workspace.c b/workspace.c index 36bea40..1b701e8 100644 --- a/workspace.c +++ b/workspace.c @@ -1,7 +1,7 @@ /* * Cagebreak: A Wayland tiling compositor. * - * Copyright (C) 2020 The Cagebreak Authors + * Copyright (C) 2020-2022 The Cagebreak Authors * Copyright (C) 2018-2019 Jente Hidskes * * See the LICENSE file accompanying this file. diff --git a/xdg_shell.c b/xdg_shell.c index 0e76dc4..7972b5f 100644 --- a/xdg_shell.c +++ b/xdg_shell.c @@ -1,7 +1,7 @@ /* * Cagebreak: A Wayland tiling compositor. * - * Copyright (C) 2020 The Cagebreak Authors + * Copyright (C) 2020-2022 The Cagebreak Authors * Copyright (C) 2018-2019 Jente Hidskes * * See the LICENSE file accompanying this file. @@ -119,22 +119,6 @@ popup_unconstrain(struct cg_xdg_popup *popup) { wlr_xdg_popup_unconstrain_from_box(popup->wlr_popup, &output_toplevel_box); } -static void -xdg_popup_get_coords(struct cg_view_child *child, int *x, int *y) { - if(!child) { - return; - } - struct cg_xdg_popup *popup = (struct cg_xdg_popup *)child; - struct wlr_xdg_surface *surface = popup->wlr_popup->base; - - int x_offset = -surface->geometry.x; - int y_offset = -surface->geometry.y; - - wlr_xdg_popup_get_toplevel_coords( - surface->popup, x_offset + surface->popup->geometry.x, - y_offset + surface->popup->geometry.y, x, y); -} - static void xdg_popup_create(struct cg_view *view, struct wlr_xdg_popup *wlr_popup) { struct cg_xdg_popup *popup = calloc(1, sizeof(struct cg_xdg_popup)); @@ -143,7 +127,6 @@ xdg_popup_create(struct cg_view *view, struct wlr_xdg_popup *wlr_popup) { } popup->wlr_popup = wlr_popup; - popup->view_child.get_coords = xdg_popup_get_coords; view_child_init(&popup->view_child, NULL, view, wlr_popup->base->surface); popup->view_child.destroy = xdg_popup_destroy; popup->destroy.notify = handle_xdg_popup_destroy; diff --git a/xwayland.c b/xwayland.c index b790527..daf3658 100644 --- a/xwayland.c +++ b/xwayland.c @@ -1,7 +1,7 @@ /* * Cagebreak: A Wayland tiling compositor. * - * Copyright (C) 2020 The Cagebreak Authors + * Copyright (C) 2020-2022 The Cagebreak Authors * Copyright (C) 2018-2020 Jente Hidskes * * See the LICENSE file accompanying this file.