elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-12-26 02:33:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update DBus API for Mutter 3.36 media keys (#753)

Browse Source
This commit is contained in:
David Hewitt 2020-03-12 22:53:50 +00:00 committed by GitHub
parent 2732d81c22
commit d9434d0be6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/DBusAccelerator.vala
View File

@ -18,6 +18,9 @@
namespace Gala { namespace Gala {
public struct Accelerator { public struct Accelerator {
public string name; public string name;
#if HAS_MUTTER336
public uint grab_flags;
#endif
public Meta.KeyBindingFlags flags; public Meta.KeyBindingFlags flags;
} }
@ -69,7 +72,11 @@ namespace Gala {
} }
} }
#if HAS_MUTTER336
public uint grab_accelerator (string accelerator, uint grab_flags, uint flags) throws DBusError, IOError {
#else
public uint grab_accelerator (string accelerator, uint flags) throws DBusError, IOError { public uint grab_accelerator (string accelerator, uint flags) throws DBusError, IOError {
#endif
uint? action = grabbed_accelerators[accelerator]; uint? action = grabbed_accelerators[accelerator];
if (action == null) { if (action == null) {
@ -92,7 +99,11 @@ namespace Gala {
uint[] actions = {}; uint[] actions = {};
foreach (unowned Accelerator? accelerator in accelerators) { foreach (unowned Accelerator? accelerator in accelerators) {
#if HAS_MUTTER336
actions += grab_accelerator (accelerator.name, accelerator.grab_flags, accelerator.flags);
#else
actions += grab_accelerator (accelerator.name, accelerator.flags); actions += grab_accelerator (accelerator.name, accelerator.flags);
#endif
} }
return actions; return actions;
@ -128,8 +139,15 @@ namespace Gala {
if (parameters.contains ("label")) if (parameters.contains ("label"))
label = parameters["label"].get_string (); label = parameters["label"].get_string ();
int32 level = 0; int32 level = 0;
#if HAS_MUTTER336
if (parameters.contains ("level")) {
var double_level = parameters["level"].get_double ();
level = (int)(double_level * 100);
}
#else
if (parameters.contains ("level")) if (parameters.contains ("level"))
level = parameters["level"].get_int32 (); level = parameters["level"].get_int32 ();
#endif
//if (monitor_index > -1) //if (monitor_index > -1)
// message ("MediaFeedback requested for specific monitor %i which is not supported", monitor_index); // message ("MediaFeedback requested for specific monitor %i which is not supported", monitor_index);