Merge branch 'main' into lenemter/fix-pip

Author: lenemter

plugins/pip/Main.vala

@@ -36,7 +36,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
         var display = wm.get_display ();
         var settings = new GLib.Settings ("io.elementary.desktop.wm.keybindings");
 
-        display.add_keybinding ("pip", settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) on_initiate);
+        display.add_keybinding ("pip", settings, IGNORE_AUTOREPEAT, on_initiate);
     }
 
     public override void destroy () {
@@ -50,7 +50,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
     }
 
     [CCode (instance_pos = -1)]
-    private void on_initiate (Meta.Display display, Meta.Window? window, Clutter.KeyEvent event,
+    private void on_initiate (Meta.Display display, Meta.Window? window, Clutter.KeyEvent? event,
         Meta.KeyBinding binding) {
         selection_area = new SelectionArea (wm);
         selection_area.selected.connect (on_selection_actor_selected);

src/Widgets/WindowSwitcher/WindowSwitcher.vala

@@ -274,7 +274,7 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget {
     [CCode (instance_pos = -1)]
     public void handle_switch_windows (
         Meta.Display display, Meta.Window? window,
-        Clutter.KeyEvent event, Meta.KeyBinding binding
+        Clutter.KeyEvent? event, Meta.KeyBinding binding
     ) {
         if (gesture_controller.recognizing) {
             return;

src/WindowManager.vala

@@ -247,12 +247,12 @@ namespace Gala {
                 window_switcher = new WindowSwitcher (this);
                 ui_group.add_child (window_switcher);
 
-                Meta.KeyBinding.set_custom_handler ("switch-applications", (Meta.KeyHandlerFunc) window_switcher.handle_switch_windows);
-                Meta.KeyBinding.set_custom_handler ("switch-applications-backward", (Meta.KeyHandlerFunc) window_switcher.handle_switch_windows);
-                Meta.KeyBinding.set_custom_handler ("switch-windows", (Meta.KeyHandlerFunc) window_switcher.handle_switch_windows);
-                Meta.KeyBinding.set_custom_handler ("switch-windows-backward", (Meta.KeyHandlerFunc) window_switcher.handle_switch_windows);
-                Meta.KeyBinding.set_custom_handler ("switch-group", (Meta.KeyHandlerFunc) window_switcher.handle_switch_windows);
-                Meta.KeyBinding.set_custom_handler ("switch-group-backward", (Meta.KeyHandlerFunc) window_switcher.handle_switch_windows);
+                Meta.KeyBinding.set_custom_handler ("switch-applications", window_switcher.handle_switch_windows);
+                Meta.KeyBinding.set_custom_handler ("switch-applications-backward", window_switcher.handle_switch_windows);
+                Meta.KeyBinding.set_custom_handler ("switch-windows", window_switcher.handle_switch_windows);
+                Meta.KeyBinding.set_custom_handler ("switch-windows-backward", window_switcher.handle_switch_windows);
+                Meta.KeyBinding.set_custom_handler ("switch-group", window_switcher.handle_switch_windows);
+                Meta.KeyBinding.set_custom_handler ("switch-group-backward", window_switcher.handle_switch_windows);
             }
 
             if (plugin_manager.window_overview_provider == null
@@ -288,23 +288,23 @@ namespace Gala {
             /*keybindings*/
             var keybinding_settings = new GLib.Settings ("io.elementary.desktop.wm.keybindings");
 
-            display.add_keybinding ("switch-to-workspace-first", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_switch_to_workspace_end);
-            display.add_keybinding ("switch-to-workspace-last", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_switch_to_workspace_end);
-            display.add_keybinding ("move-to-workspace-first", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_move_to_workspace_end);
-            display.add_keybinding ("move-to-workspace-last", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_move_to_workspace_end);
-            display.add_keybinding ("cycle-workspaces-next", keybinding_settings, Meta.KeyBindingFlags.NONE, (Meta.KeyHandlerFunc) handle_cycle_workspaces);
-            display.add_keybinding ("cycle-workspaces-previous", keybinding_settings, Meta.KeyBindingFlags.NONE, (Meta.KeyHandlerFunc) handle_cycle_workspaces);
-            display.add_keybinding ("panel-main-menu", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_applications_menu);
+            display.add_keybinding ("switch-to-workspace-first", keybinding_settings, IGNORE_AUTOREPEAT, handle_switch_to_workspace_end);
+            display.add_keybinding ("switch-to-workspace-last", keybinding_settings, IGNORE_AUTOREPEAT, handle_switch_to_workspace_end);
+            display.add_keybinding ("move-to-workspace-first", keybinding_settings, IGNORE_AUTOREPEAT, handle_move_to_workspace_end);
+            display.add_keybinding ("move-to-workspace-last", keybinding_settings, IGNORE_AUTOREPEAT, handle_move_to_workspace_end);
+            display.add_keybinding ("cycle-workspaces-next", keybinding_settings, NONE, handle_cycle_workspaces);
+            display.add_keybinding ("cycle-workspaces-previous", keybinding_settings, NONE, handle_cycle_workspaces);
+            display.add_keybinding ("panel-main-menu", keybinding_settings, IGNORE_AUTOREPEAT, handle_applications_menu);
 
-            display.add_keybinding ("toggle-multitasking-view", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, () => {
+            display.add_keybinding ("toggle-multitasking-view", keybinding_settings, IGNORE_AUTOREPEAT, () => {
                 if (multitasking_view.is_opened ()) {
                     multitasking_view.close ();
                 } else {
                     multitasking_view.open ();
                 }
             });
 
-            display.add_keybinding ("expose-all-windows", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, () => {
+            display.add_keybinding ("expose-all-windows", keybinding_settings, IGNORE_AUTOREPEAT, () => {
                 if (window_overview.is_opened ()) {
                     window_overview.close ();
                 } else {
@@ -322,17 +322,17 @@ namespace Gala {
 
             Meta.KeyBinding.set_custom_handler ("switch-to-workspace-up", () => {});
             Meta.KeyBinding.set_custom_handler ("switch-to-workspace-down", () => {});
-            Meta.KeyBinding.set_custom_handler ("switch-to-workspace-left", (Meta.KeyHandlerFunc) handle_switch_to_workspace);
-            Meta.KeyBinding.set_custom_handler ("switch-to-workspace-right", (Meta.KeyHandlerFunc) handle_switch_to_workspace);
+            Meta.KeyBinding.set_custom_handler ("switch-to-workspace-left", handle_switch_to_workspace);
+            Meta.KeyBinding.set_custom_handler ("switch-to-workspace-right", handle_switch_to_workspace);
 
             Meta.KeyBinding.set_custom_handler ("move-to-workspace-up", () => {});
             Meta.KeyBinding.set_custom_handler ("move-to-workspace-down", () => {});
-            Meta.KeyBinding.set_custom_handler ("move-to-workspace-left", (Meta.KeyHandlerFunc) handle_move_to_workspace);
-            Meta.KeyBinding.set_custom_handler ("move-to-workspace-right", (Meta.KeyHandlerFunc) handle_move_to_workspace);
+            Meta.KeyBinding.set_custom_handler ("move-to-workspace-left", handle_move_to_workspace);
+            Meta.KeyBinding.set_custom_handler ("move-to-workspace-right", handle_move_to_workspace);
 
             for (int i = 1; i < 13; i++) {
-                Meta.KeyBinding.set_custom_handler ("switch-to-workspace-%d".printf (i), (Meta.KeyHandlerFunc) handle_switch_to_workspace);
-                Meta.KeyBinding.set_custom_handler ("move-to-workspace-%d".printf (i), (Meta.KeyHandlerFunc) handle_move_to_workspace);
+                Meta.KeyBinding.set_custom_handler ("switch-to-workspace-%d".printf (i), handle_switch_to_workspace);
+                Meta.KeyBinding.set_custom_handler ("move-to-workspace-%d".printf (i), handle_move_to_workspace);
             }
 
             unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
@@ -427,7 +427,7 @@ namespace Gala {
         }
 
         [CCode (instance_pos = -1)]
-        private void handle_cycle_workspaces (Meta.Display display, Meta.Window? window, Clutter.KeyEvent event,
+        private void handle_cycle_workspaces (Meta.Display display, Meta.Window? window, Clutter.KeyEvent? event,
             Meta.KeyBinding binding) {
             var direction = (binding.get_name () == "cycle-workspaces-next" ? 1 : -1);
             unowned var manager = display.get_workspace_manager ();
@@ -441,15 +441,16 @@ namespace Gala {
             }
 
             if (active_workspace_index != index) {
-                manager.get_workspace_by_index (index).activate (event.get_time ());
+                var timestamp = event != null ? event.get_time () : Meta.CURRENT_TIME;
+                manager.get_workspace_by_index (index).activate (timestamp);
             } else {
                 InternalUtils.bell_notify (display);
             }
         }
 
         [CCode (instance_pos = -1)]
         private void handle_move_to_workspace (Meta.Display display, Meta.Window? window,
-            Clutter.KeyEvent event, Meta.KeyBinding binding) {
+            Clutter.KeyEvent? event, Meta.KeyBinding binding) {
             if (window == null) {
                 return;
             }
@@ -470,31 +471,35 @@ namespace Gala {
             }
 
             if (target_workspace != null) {
-                move_window (window, target_workspace, event.get_time ());
+                var timestamp = event != null ? event.get_time () : Meta.CURRENT_TIME;
+                move_window (window, target_workspace, timestamp);
             }
         }
 
         [CCode (instance_pos = -1)]
         private void handle_move_to_workspace_end (Meta.Display display, Meta.Window? window,
-            Clutter.KeyEvent event, Meta.KeyBinding binding) {
-            if (window == null)
+            Clutter.KeyEvent? event, Meta.KeyBinding binding) {
+            if (window == null) {
                 return;
+            }
 
+            var timestamp = event != null ? event.get_time (): Meta.CURRENT_TIME;
             unowned Meta.WorkspaceManager manager = display.get_workspace_manager ();
             var index = (binding.get_name () == "move-to-workspace-first" ? 0 : manager.get_n_workspaces () - 1);
             unowned var workspace = manager.get_workspace_by_index (index);
             window.change_workspace (workspace);
-            workspace.activate_with_focus (window, event.get_time ());
+            workspace.activate_with_focus (window, timestamp);
         }
 
         [CCode (instance_pos = -1)]
         private void handle_switch_to_workspace (Meta.Display display, Meta.Window? window,
-            Clutter.KeyEvent event, Meta.KeyBinding binding) {
+            Clutter.KeyEvent? event, Meta.KeyBinding binding) {
+            var timestamp = event != null ? event.get_time () : Meta.CURRENT_TIME;
             unowned var name = binding.get_name ();
 
             if (name == "switch-to-workspace-left" || name == "switch-to-workspace-right") {
                 var direction = (name == "switch-to-workspace-left" ? Meta.MotionDirection.LEFT : Meta.MotionDirection.RIGHT);
-                switch_to_next_workspace (direction, event.get_time ());
+                switch_to_next_workspace (direction, timestamp);
             } else {
                 unowned var workspace_manager = get_display ().get_workspace_manager ();
 
@@ -506,21 +511,21 @@ namespace Gala {
                     return;
                 }
 
-                workspace.activate (event.get_time ());
+                workspace.activate (timestamp);
             }
         }
 
         [CCode (instance_pos = -1)]
         private void handle_switch_to_workspace_end (Meta.Display display, Meta.Window? window,
-            Clutter.KeyEvent event, Meta.KeyBinding binding) {
+            Clutter.KeyEvent? event, Meta.KeyBinding binding) {
             unowned Meta.WorkspaceManager manager = display.get_workspace_manager ();
             var index = (binding.get_name () == "switch-to-workspace-first" ? 0 : manager.n_workspaces - 1);
-            manager.get_workspace_by_index (index).activate (event.get_time ());
+            manager.get_workspace_by_index (index).activate (event != null ? event.get_time () : Meta.CURRENT_TIME);
         }
 
         [CCode (instance_pos = -1)]
         private void handle_applications_menu (Meta.Display display, Meta.Window? window,
-            Clutter.KeyEvent event, Meta.KeyBinding binding) {
+            Clutter.KeyEvent? event, Meta.KeyBinding binding) {
             launch_action (ActionKeys.PANEL_MAIN_MENU_ACTION);
         }
 

src/Zoom.vala

@@ -31,8 +31,8 @@ public class Gala.Zoom : Object, GestureTarget, RootTarget {
         unowned var display = wm.get_display ();
         var schema = new GLib.Settings ("io.elementary.desktop.wm.keybindings");
 
-        display.add_keybinding ("zoom-in", schema, Meta.KeyBindingFlags.NONE, (Meta.KeyHandlerFunc) zoom_in);
-        display.add_keybinding ("zoom-out", schema, Meta.KeyBindingFlags.NONE, (Meta.KeyHandlerFunc) zoom_out);
+        display.add_keybinding ("zoom-in", schema, NONE, zoom_in);
+        display.add_keybinding ("zoom-out", schema, NONE, zoom_out);
 
         gesture_controller = new GestureController (ZOOM, wm) {
             snap = false
@@ -64,13 +64,13 @@ public class Gala.Zoom : Object, GestureTarget, RootTarget {
 
     [CCode (instance_pos = -1)]
     private void zoom_in (Meta.Display display, Meta.Window? window,
-        Clutter.KeyEvent event, Meta.KeyBinding binding) {
+        Clutter.KeyEvent? event, Meta.KeyBinding binding) {
         zoom (SHORTCUT_DELTA, true);
     }
 
     [CCode (instance_pos = -1)]
     private void zoom_out (Meta.Display display, Meta.Window? window,
-        Clutter.KeyEvent event, Meta.KeyBinding binding) {
+        Clutter.KeyEvent? event, Meta.KeyBinding binding) {
         zoom (-SHORTCUT_DELTA, true);
     }