cinnamonDbus: Have cinnamon-settings-daemon provide monitor

coordinates for the showOSD method, instead of a monitor index.

This index could be incorrect due to differences between how
Gdk figures monitor order and how muffin handles it now. Let
cinnamon/muffin figure it out based on those coordinates instead.

ref:
linuxmint/mint21-beta#121

requires:
linuxmint/cinnamon-settings-daemon@3d69c0e0a

Author: mtwebster

js/ui/cinnamonDBus.js

@@ -244,15 +244,17 @@ CinnamonDBus.prototype = {
             params[param] = params[param].deep_unpack();
 
         let monitorIndex = -1;
-        if (params.maybeGet('monitor') >= 0) {
-            monitorIndex = params['monitor'];
+        if (params.maybeGet('monitor_x') >= 0) {
+            let x = params['monitor_x'];
+            let y = params['monitor_y'];
+            monitorIndex = Main.layoutManager.findMonitorIndexAt(++x, ++y);
         }
 
         let icon = null;
         if (params['icon'])
             icon = Gio.Icon.new_for_string(params['icon']);
 
-        Main.osdWindowManager.show(monitorIndex, icon, params['level'], true);
+        Main.osdWindowManager.show(monitorIndex, icon, params['level'], false);
     },
 
     FlashArea: function(x, y, width, height) {

js/ui/layout.js

@@ -377,6 +377,11 @@ LayoutManager.prototype = {
         return this._chrome.findMonitorIndexForActor(actor);
     },
 
+    findMonitorIndexAt: function(x, y) {
+        let [index, monitor] = this._chrome._findMonitorForRect(x, y, 1, 1)
+        return index;
+    },
+
     /**
      * isTrackingChrome:
      * @actor (Clutter.Actor): the actor to check