From 91a9409b1ddc574eea952c99f2e1aadf851e952a Mon Sep 17 00:00:00 2001
From: Guacamolie <guac@amolie.nl>
Date: Sun, 13 Oct 2024 15:52:44 +0200
Subject: [PATCH] js: Update Meta.KeyHandlerFunc arguments

The Meta keybinding API now exposes the Clutter event to GJS, which was
previously hidden due to it being a gpointer. Since this moves the
binding argument one argument to the right on the GJS side, any code
that was using the binding argument needs to be updated.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3502>
---
 js/ui/screenshot.js      |  2 +-
 js/ui/status/keyboard.js |  2 +-
 js/ui/windowManager.js   | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/ui/screenshot.js b/js/ui/screenshot.js
index 2071f613b..352b407e8 100644
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -1422,7 +1422,7 @@ export const ScreenshotUI = GObject.registerClass({
             new Gio.Settings({schema_id: 'org.gnome.shell.keybindings'}),
             Meta.KeyBindingFlags.IGNORE_AUTOREPEAT | Meta.KeyBindingFlags.PER_WINDOW,
             restrictedModes,
-            async (_display, window, _binding) => {
+            async (_display, window, _event, _binding) => {
                 try {
                     const actor = window.get_compositor_private();
                     const content = actor.paint_to_content(null);
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index c0153ef8d..031d5935c 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -426,7 +426,7 @@ export class InputSourceManager extends Signals.EventEmitter {
         return true;
     }
 
-    _switchInputSource(display, window, binding) {
+    _switchInputSource(display, window, event, binding) {
         if (this._mruSources.length < 2)
             return;
 
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 6e498dd5f..5175191d9 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -1665,7 +1665,7 @@ export class WindowManager {
         this._windowMenuManager.showWindowMenuForWindow(window, menu, rect);
     }
 
-    _startSwitcher(display, window, binding) {
+    _startSwitcher(display, window, event, binding) {
         let constructor = null;
         switch (binding.get_name()) {
         case 'switch-applications':
@@ -1704,7 +1704,7 @@ export class WindowManager {
             tabPopup.destroy();
     }
 
-    _startA11ySwitcher(display, window, binding) {
+    _startA11ySwitcher(display, window, event, binding) {
         Main.ctrlAltTabManager.popup(binding.is_reversed(), binding.get_name(), binding.get_mask());
     }
 
@@ -1720,7 +1720,7 @@ export class WindowManager {
         return apps[n];
     }
 
-    _switchToApplication(display, window, binding) {
+    _switchToApplication(display, window, event, binding) {
         const [, , , target] = binding.get_name().split('-');
         const app = this._getNthFavoriteApp(target - 1);
         if (app) {
@@ -1729,7 +1729,7 @@ export class WindowManager {
         }
     }
 
-    _openNewApplicationWindow(display, window, binding) {
+    _openNewApplicationWindow(display, window, event, binding) {
         const [, , , , target] = binding.get_name().split('-');
         const app = this._getNthFavoriteApp(target - 1);
         if (app)
@@ -1744,7 +1744,7 @@ export class WindowManager {
         Main.panel.toggleQuickSettings();
     }
 
-    _showWorkspaceSwitcher(display, window, binding) {
+    _showWorkspaceSwitcher(display, window, event, binding) {
         let workspaceManager = display.get_workspace_manager();
 
         if (!Main.sessionMode.hasWorkspaces)