GNOME 3.30 + GNOME 3.32 compatibility patch #1591

fossfreedom · 2018-10-08T09:52:47Z

This PR describes the GNOME 3.30 patch set Ubuntu 18.10 will be using for its release on the 18th Oct and is part of Debian Buster at the moment

Yes - I am aware this is not backwards compatible with 3.28 - so feel free to ignore/cherry-pick/use as a reference point etc etc.

I'll outline the decision points I made to enable budgie-desktop to work against mutter 3.30 and underlying stuff like Vala that has been incorporated in UB and Debian Buster. Hopefully this may be useful.

The TL;DR; I believe this patch set resolves all except one issue described later.

Our starting point is the end-of-august Git Master - an unsigned tarball has been generated via the mkrelease.sh script.
On top of the tarball is Iain Lane's initial mutter 3.30 patch
b5e9fd3 For all the GNOME based gsettings overrides UB uses :Budgie is now appended - this is new in the latest GLib that allows the initial separation of GNOME Shell and Budgie logins i.e. so that Budgie overrides do not impact the gsettings key value when logging into GNOME-Shell. This commit fixes an error in Iain's original offering.
825353e The vapi generated by Iain's patch had all the API's based on one mutter core header file. This initially caused whole session crashes when ALT+TABbing. This commit resolves that
c7be4c2 Vala 0.42 stable now no longer allows default getter values - this fixes the compilation issues of budgie-desktop
665076e Like 3 I have manually run through the whole VAPI and repointed the API calls to where their correct C Header files are located.
f422354 - For some reason Mutter 3.30 is more suspect now to workspace switching crashes. I have see many similar automatic reports on UB 17.10 and later - so this rare issue is not new. I nicked this commit from @alunux and I haven't seen any more automatic reports in this area. Proof of the pudding will be the much larger rollout of UB 18.10
2b996c8 again nicked from @alunux existing PR - just makes sure GVC points to the new upstream source location
b2d7a8b Dropped from GLib is the ability to overlay gsettings values i.e. how the separation used to be performed between the Budgie and GNOME equivalent gsettings keys. As mentioned in 2, GLib now uses the ":Budgie" syntax to provide session separation. This commit ensures Focus and button layout changes in budgie-settings are still respected - using GNOME schema keys - not the original Budgie schema keys.
897d8e4 In Mutter 3.30 the default workspace scroll animation is now vertical not horizontal. This commit resets this back to the horizontal animation that Budgie has always used.
Noticed a regression with the nm-applet icon changing colour when first connecting to the network on login. Doesn't occur when equiv patch is compiled for gtk 3.28

The one remaining issue I have not been able to resolve is Window border shading being left on the screen when the menu / Alt+Tab / notification popups are hidden. For the interim I have gsettings overridden the WM animations schema key to turn off budgie animations via the budgie-desktop debian package. I suspect UB and Debian end-users will raise issues here if they subsequently turn animations on in budgie-settings ... or have previously fiddled with that setting in the past and have now upgraded. Obviously if/when someone resolves this I will immediately backport this fix to 18.10 UB and Debian Buster.

This drops support for the old mutter versions. It's too much work to support them all.

alunux · 2018-10-10T09:44:42Z

With the current master branch, we also need to port this work e10d621

danielpinto8zz6 · 2018-12-13T11:15:46Z

@fossfreedom about the animations problem in popovers it couldn't be related to the popover code?
The widget not clearing the drawed area or something

fossfreedom · 2018-12-13T11:25:01Z

I don't think so - you see the remnants of the notification window and the alt+tab window.

Which make me think it is due to the bespoke animation code budgie uses.

danielpinto8zz6 · 2018-12-13T11:28:33Z

oh, ok, I'll see wm code, to check if I can find something

fossfreedom · 2018-12-13T11:52:44Z

indeed - that was an area I was fiddling with before I ran out of time on UB 18.10. It does look promising though from a first initial look. On Thu, 13 Dec 2018 at 11:40, Daniel Pinto <notifications@github.com<mailto:notifications@github.com>> wrote: https://github.com/solus-project/budgie-desktop/blob/master/src/wm/wm.vala#L1039 It should be related to that function no? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#1591 (comment)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AA8zkLHB9ZnH2mVM7aE4JceVPXG8K25_ks5u4jyXgaJpZM4XMmOD>.

danielpinto8zz6 · 2018-12-13T11:54:29Z

do you have any place we can talk easier? telegram, hangouts...

fossfreedom · 2018-12-13T12:03:44Z

IRC freenode #budgie-desktop-dev

…

On Thu, 13 Dec 2018 at 11:54, Daniel Pinto ***@***.***> wrote: do you have any place we can talk easier? telegram, hangouts... — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or mute the thread.

JockeTF · 2018-12-16T13:52:51Z

Thanks, I'm running on this branch. Works great so far!

Ste74 · 2018-12-26T22:45:27Z

Well,, @fossfreedom i can do a shot into Manjaro?

fossfreedom · 2018-12-26T23:09:00Z

@Ste74 I haven't had time to give this any sort of extensive testing - but @JockeTF comments gives me hope that all is ok !

Ste74 · 2018-12-26T23:12:13Z

@fossfreedom i started the building so i can testing also in our community 😉

JockeTF · 2018-12-26T23:28:10Z

--> @fossfreedom @Ste74

It runs mostly fine, but I have experienced a few more crashes compared to b2d7a8b which I was running before. These aren't annoying unless you get logged out after a few crashes.

For example, Budge Panel crashes when starting Budgie Settings. This may be because of wonky or old settings though. Haven't looked into the reason for that, but at least make sure you test messing about with Budgie Settings, @Ste74!

Same thing goes with dragging and dropping things to Budgie Panel, and switching workspaces when Guake is open and set to hide on lose focus. Again though, I haven't looked into the reasons for this.

fossfreedom · 2018-12-26T23:59:53Z

ok - the budgie-settings thing is a merge issue. Easy enough to fix. Will do that friday. On Wed, 26 Dec 2018 at 23:28, Joakim Soderlund <notifications@github.com<mailto:notifications@github.com>> wrote:

…

--> @fossfreedom<https://github.com/fossfreedom> @Ste74<https://github.com/Ste74> It runs mostly fine, but I have experienced a few more crashes compared to b2d7a8b<b2d7a8b> which I was running before. These aren't annoying unless you get logged out after a few crashes. For example, Budge Panel crashes when starting Budgie Settings. This may be because of wonky or old settings though. Haven't looked into the reason for that, but at least make sure you test messing about with Budgie Settings, @Ste74<https://github.com/Ste74>! Same thing goes with dragging and dropping things to Budgie Panel, and switching workspaces when Guake<https://github.com/Guake/guake/> is open and set to hide on lose focus. Again though, I haven't looked into the reasons for this. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#1591 (comment)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AA8zkA5ItAecwrvfJDipSmZUNZbRpN7Jks5u9AYLgaJpZM4XMmOD>.

JoshStrobl · 2019-02-27T14:01:38Z

Yeah - if you don't want to separate GNOME Shell from Budgie - sure that's fine, can lose the :Budgie suffix. For UB we'll just use an override to keep that separation.

Yea, I'm referring to the override file. I just wanted to know if it was a requirement or not, I didn't see anything about the suffix / vendor bit being required in the GLib changelogs is all, hence the inquiry.

okey dokey. Can just readd the keys. Thoughts on trying to keep both the budgie keys and equivalent gnome keys in sync? Or don't worry about that?

The equivalent keys should be kept in sync. Most of src/daemon/settings.wm does that when we change the respective Budgie keys, like button-layout as an example. I don't have any issues with doing that leg work though.

I'm still fuzzy on how to keep both mutter 3.28 and mutter 3.30/.32 support at the same time.

My biggest issue with the original patch from Iain was it did away with all backwards compatibility for the prior stack (so the proposal was 3.30, with no support for 3.28). This patch satisfies backwards compatibility by supporting both 3.30 and 3.32.

I would've used a mix of Structs since Vala has no form of typedef or type aliases, as well as implementing a class to handle getting the monitor and screen, with #ifdefs for handling the cases where older ABIs had MetaScreen, compositor setting, etc. It would've overall meant less Mutter version-specific ABI code in wm.vala.

3v1n0 · 2019-03-06T11:07:18Z

@fossfreedom can you merge again with my branch, so that you can get the auto-generated vapis?

fossfreedom · 2019-03-06T11:26:59Z

Marco, haven't had alot of time to spend on this. I had a quick look over the weekend at trying to retrofit the new bits to retain both Mutter 3.30 and Mutter 3.32 compilation ability but rather failed miserably. I know enough about meson to be dangerous - but your new bits are a little over my head. Solus Project would like to retain a cross version compilation ability and intend (a little later) to retrofit the ability also to compile against Mutter 3.28. For the moment I have merged your changes into a separate 3.32 only branch - https://github.com/UbuntuBudgie/budgie-desktop/tree/mutter332 On Wed, 6 Mar 2019 at 11:07, Marco Trevisan <notifications@github.com<mailto:notifications@github.com>> wrote: @fossfreedom<https://github.com/fossfreedom> can you merge again with my branch, so that you can get the auto-generated vapis? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#1591 (comment)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AA8zkBstaRu9y_Koj7KM-4BOF2uN1CWHks5vT6FvgaJpZM4XMmOD>.

3v1n0 · 2019-03-06T14:25:52Z

@fossfreedom so... I've pushed to my branch a version that generates Vapi for both libmutter-3 and libmutter-4, it works fine and I've added a custom vapi file to avoid source changes or ifdeffs, so this version should continue working generating proper VAPIs depending on the mutter version is used.

This is not supporting libmutter-2 at the moment, but I think you can add that with few lines more in the same way is done for 3 and 4.

So please, give it a look, because right now budgie is completely wrong in using the system cogl and clutter VAPIs which have already diverged from mutter forks, while it's better if it generates the VAPIs at build time using the proper gir files with some customizations if needed, instead of shipping big vapi files.

PS: what is done here should actually be applied to the other VAPIs that are inside budgie, but not something I'll touch for now.

JoshStrobl · 2019-03-06T15:42:09Z

while it's better if it generates the VAPIs at build time using the proper gir files with some customizations if needed, instead of shipping big vapi files.

I use the VAPIs as a reference point sometimes in development. I'd much rather we ship them than generate at build time.

3v1n0 · 2019-03-06T17:32:56Z

@JoshStrobl

well, a part that if you develop, I guess you're also building and in such case are in the build directory, but if you really want the built vapi can be instead wrote in the source directory, and then when something new is generated or has changed, you can commit it and push straight forward without having to care to stay in sync manually.

So, this method isn't really touching this, in general though I think the vapi generation should automatized by meson, instead of having to deal with those bits at every mutter abi change.

fossfreedom · 2019-03-07T15:33:49Z

All - just a heads up. Keyboard shortcuts like CTRL + ALT + T and all custom keyboard shortcuts are broken with the new (almost) stable mutter/gnome-settings-daemon 3.32

No idea what is going on - will need investigation. Seems to be ok with vanilla GNOME-Shell so I'm guessing something in the budgie shim will need reworking.

EDIT: Saw this in journalctl

Mar 07 15:53:46 dad-VirtualBox gsd-media-keys[4270]: g_variant_get_va: assertion 'value != NULL' failed
Mar 07 15:53:46 dad-VirtualBox gsd-media-keys[4270]: g_variant_unref: assertion 'value != NULL' failed
Mar 07 15:53:46 dad-VirtualBox gsd-media-keys[4270]: Failed to grab accelerators: GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs: Type of message, “(a(suu))”, does not match expected type “(a(su))” (16)

3v1n0 · 2019-03-08T00:52:17Z

The signature for the registration method has changed, so needs to be updated.

tista500 · 2019-03-08T08:13:15Z

@fossfreedom,

These changes landed in 3.31.9x cycle:

Mutter: https://gitlab.gnome.org/GNOME/mutter/commit/00ca387ec7f6a864a35e0baee8c69cc71d60641e

Gnome-Shell: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/156/diffs

And G-S-D might also have similar changes for following the Mutter 3.31.9x change...

Regards.

fossfreedom · 2019-03-08T08:21:19Z

Thx. Solved. Just now need to tidy up the changes made. Will push when done. On Fri, 8 Mar 2019, 08:13 Tista, <notifications@github.com<mailto:notifications@github.com>> wrote: @fossfreedom<https://github.com/fossfreedom>, These changes landed in 3.31.9x cycle: Mutter: https://gitlab.gnome.org/GNOME/mutter/commit/00ca387ec7f6a864a35e0baee8c69cc71d60641e Gnome-Shell: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/156/diffs And G-S-D might also have similar changes for following the Mutter 3.31.9x change... Regards. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#1591 (comment)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AA8zkF9PZ_Vd8cj7ClgVscRlxDdjbb67ks5vUhuggaJpZM4XMmOD>.

JockeTF · 2019-03-16T12:41:07Z

Runs well for me on GNOME 3.32!

Thanks again!

JoshStrobl · 2019-03-18T10:22:48Z

src/daemon/settings.vala

@@ -285,8 +285,7 @@ public class SettingsManager {
        }

        this.xoverrides.set_value("overrides", xset);
-        this.wm_settings.set_string("button-layout", wm_set);


Let's preserve the setting of our key as per our earlier conversation in this PR.

JoshStrobl · 2019-03-18T10:26:11Z

src/panel/settings/settings_wm.vala

        budgie_wm_settings = new GLib.Settings("com.solus-project.budgie-wm");
-        budgie_wm_settings.bind("attach-modal-dialogs", switch_dialogs,  "active", SettingsBindFlags.DEFAULT);


Should maintain use of budgie_wm_settings instead of using gnome_wm_settings for attach-modal-dialogs and edge-tiling. We can just additionally change the gnome_wm_settings value in our switch_dialogs and switch_settings functions.

JoshStrobl · 2019-03-18T10:26:18Z

src/panel/settings/settings_wm.vala

        budgie_wm_settings.bind("button-style", combo_layouts,  "active-id", SettingsBindFlags.DEFAULT);
        budgie_wm_settings.bind("center-windows", center_windows, "active", SettingsBindFlags.DEFAULT);
        budgie_wm_settings.bind("disable-night-light-on-fullscreen", disable_night_light, "active", SettingsBindFlags.DEFAULT);
-        budgie_wm_settings.bind("edge-tiling", switch_tiling,  "active", SettingsBindFlags.DEFAULT);


Should maintain use of budgie_wm_settings instead of using gnome_wm_settings for attach-modal-dialogs and edge-tiling. We can just additionally change the gnome_wm_settings value in our switch_dialogs and switch_settings functions.

peyloride · 2019-03-25T18:54:28Z

@fossfreedom Thanks for your hard work! I've successfully compiled and using your branch on brand new Fedora 29.

JoshStrobl · 2019-04-22T14:31:43Z

There's still changes here I'd like to see addressed. Any chance you could take a look at your patch / branch @fossfreedom?

fossfreedom · 2019-04-22T14:51:43Z

Josh, Sorry for the late reply ... for the last few weeks have been snowed under with 19.04 release stuff. Hope that stuff will die down soon.

…

On Mon, 22 Apr 2019, 15:31 Joshua Strobl, ***@***.***> wrote: There's still changes here I'd like to see addressed. Any chance you could take a look at your patch / branch @fossfreedom <https://github.com/fossfreedom>? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1591 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAHTHED4PPAJ4XXVT3H5XD3PRXD5LANCNFSM4FZSMOBQ> .

JoshStrobl · 2019-04-22T15:11:48Z

It's alright, completely understandable that you folks would be busy. Congratulations on the new release! I've just updated the GNOME Stack on Solus locally to GNOME 3.32 and wanting to start landing the patches and validate now that I have the stack to do so. If the patch isn't sorted by tomorrow, it's not a problem, I can land it and fix it post-merge.

iainlane and others added 10 commits August 6, 2018 17:50

Port to mutter-3 from GNOME 3.30

58a281d

This drops support for the old mutter versions. It's too much work to support them all.

Merge remote-tracking branch 'upstream/master' into mutter330reduxII

0938c69

Correct GNOME button-layout schema path

b5e9fd3

Make sure vapi workspace def use real c header filenames

825353e

Vala 0.41.92 does not allow custom getter default values

c7be4c2

Point vapi cheaders to their upstream equiv

665076e

Add null guards to prevent occasional workspace switching crashes

f422354

Update GVC submodule

2b996c8

Ensure focus and button-layout keys are updated

b2d7a8b

Override new mutter vertical workspace layout

897d8e4

JockeTF mentioned this pull request Oct 8, 2018

Build errors #1590

Closed

fossfreedom mentioned this pull request Nov 16, 2018

Notification window does not disappear properly. #1622

Closed

fossfreedom added 3 commits December 15, 2018 23:00

Merge with latest upstream changes

c861c94

Remove more Meta.Screen changes

7b02061

Switch to GNOME equivs for focus-mode and remove schema deprecations

64d7f07

Merge remote-tracking branch 'upstream/master' into mutter330reduxII

53f2cc5

Reinstate focus-mode original code

7b1c114

fossfreedom added 3 commits March 1, 2019 20:40

Don't use vendor overrides

2731079

Readd original schema

868ce37

Code cleanup to remove commented out getters

acec210

fossfreedom added 3 commits March 8, 2019 09:40

Merge branch 'master' into mutter330reduxII

cab610d

Regenerate VAPIS

de47fe8

Make shim code GSD 3.32 compliant, retaining backward compatibility

36b793b

Merge branch 'master' into mutter330reduxII

c61ccfc

JoshStrobl suggested changes Mar 18, 2019

View reviewed changes

JoshStrobl mentioned this pull request Mar 30, 2019

Fix several syntax issues to allow build with vala 0.42/0.44 and later #1786

Closed

2 tasks

worldofpeace mentioned this pull request Apr 13, 2019

Keyboard shortcuts and media keys broken with gnome-settings-daemon 3.32 elementary/gala#518

Closed

JoshStrobl merged commit 414508a into solus-project:master Apr 23, 2019

m5x mentioned this pull request May 8, 2019

Budgie desktop clearlinux/distribution#628

Open

worldofpeace mentioned this pull request May 8, 2019

fails to compile against latest mutter (3.29.4+) elementary/gala#303

Closed

fossfreedom deleted the mutter330reduxII branch April 8, 2021 20:55

aral mentioned this pull request Aug 16, 2021

"meta/screen.h: No such file or directory" compiling error markstory/gala-alt-tab-plus#12

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GNOME 3.30 + GNOME 3.32 compatibility patch #1591

GNOME 3.30 + GNOME 3.32 compatibility patch #1591

fossfreedom commented Oct 8, 2018 •

edited

Loading

alunux commented Oct 10, 2018

danielpinto8zz6 commented Dec 13, 2018

fossfreedom commented Dec 13, 2018

danielpinto8zz6 commented Dec 13, 2018

fossfreedom commented Dec 13, 2018 via email

danielpinto8zz6 commented Dec 13, 2018

fossfreedom commented Dec 13, 2018 via email

JockeTF commented Dec 16, 2018

Ste74 commented Dec 26, 2018

fossfreedom commented Dec 26, 2018

Ste74 commented Dec 26, 2018

JockeTF commented Dec 26, 2018

fossfreedom commented Dec 26, 2018 via email

JoshStrobl commented Feb 27, 2019

3v1n0 commented Mar 6, 2019

fossfreedom commented Mar 6, 2019 via email

3v1n0 commented Mar 6, 2019

JoshStrobl commented Mar 6, 2019

3v1n0 commented Mar 6, 2019

fossfreedom commented Mar 7, 2019 •

edited

Loading

3v1n0 commented Mar 8, 2019

tista500 commented Mar 8, 2019

fossfreedom commented Mar 8, 2019 via email

JockeTF commented Mar 16, 2019

JoshStrobl Mar 18, 2019

JoshStrobl Mar 18, 2019

JoshStrobl Mar 18, 2019

peyloride commented Mar 25, 2019

JoshStrobl commented Apr 22, 2019

fossfreedom commented Apr 22, 2019 via email

JoshStrobl commented Apr 22, 2019

		budgie_wm_settings = new GLib.Settings("com.solus-project.budgie-wm");
		budgie_wm_settings.bind("attach-modal-dialogs", switch_dialogs, "active", SettingsBindFlags.DEFAULT);

GNOME 3.30 + GNOME 3.32 compatibility patch #1591

GNOME 3.30 + GNOME 3.32 compatibility patch #1591

Conversation

fossfreedom commented Oct 8, 2018 • edited Loading

alunux commented Oct 10, 2018

danielpinto8zz6 commented Dec 13, 2018

fossfreedom commented Dec 13, 2018

danielpinto8zz6 commented Dec 13, 2018

fossfreedom commented Dec 13, 2018 via email

danielpinto8zz6 commented Dec 13, 2018

fossfreedom commented Dec 13, 2018 via email

JockeTF commented Dec 16, 2018

Ste74 commented Dec 26, 2018

fossfreedom commented Dec 26, 2018

Ste74 commented Dec 26, 2018

JockeTF commented Dec 26, 2018

fossfreedom commented Dec 26, 2018 via email

JoshStrobl commented Feb 27, 2019

3v1n0 commented Mar 6, 2019

fossfreedom commented Mar 6, 2019 via email

3v1n0 commented Mar 6, 2019

JoshStrobl commented Mar 6, 2019

3v1n0 commented Mar 6, 2019

fossfreedom commented Mar 7, 2019 • edited Loading

3v1n0 commented Mar 8, 2019

tista500 commented Mar 8, 2019

fossfreedom commented Mar 8, 2019 via email

JockeTF commented Mar 16, 2019

JoshStrobl Mar 18, 2019

Choose a reason for hiding this comment

JoshStrobl Mar 18, 2019

Choose a reason for hiding this comment

JoshStrobl Mar 18, 2019

Choose a reason for hiding this comment

peyloride commented Mar 25, 2019

JoshStrobl commented Apr 22, 2019

fossfreedom commented Apr 22, 2019 via email

JoshStrobl commented Apr 22, 2019

fossfreedom commented Oct 8, 2018 •

edited

Loading

fossfreedom commented Mar 7, 2019 •

edited

Loading