Move to extended behavior

Author: leolost2605

protocol/pantheon-desktop-shell-v1.xml

@@ -102,15 +102,6 @@
 
   <interface name="io_elementary_pantheon_widget_v1" version="1">
     <request name="destroy" type="destructor"/>
-
-    <request name="focus">
-      <description summary="request keyboard focus">
-        Request keyboard focus, taking it away from any other window.
-        Keyboard focus must always be manually be requested and is
-        - in contrast to normal windows - never automatically granted
-        by the compositor.
-      </description>
-    </request>
   </interface>
 
   <interface name="io_elementary_pantheon_extended_behavior_v1" version="1">
@@ -120,5 +111,21 @@
         Tell the shell to keep the surface above on all workspaces
       </description>
     </request>
+
+    <request name="make_centered">
+      <description summary="requests to keep the surface centered">
+        Request to keep the surface centered. This will cause keyboard focus
+        to not be granted automatically but having to be requested via focus.
+      </description>
+    </request>
+
+    <request name="focus">
+      <description summary="request keyboard focus">
+        Request keyboard focus, taking it away from any other window.
+        Keyboard focus must always be manually be requested and is
+        - in contrast to normal windows - never automatically granted
+        by the compositor.
+      </description>
+    </request>
   </interface>
 </protocol>

protocol/pantheon-desktop-shell.vapi

@@ -48,7 +48,6 @@ namespace Pantheon.Desktop {
         [CCode (cheader_filename = "pantheon-desktop-shell-server-protocol.h", cname = "io_elementary_pantheon_widget_v1_interface")]
         public static Wl.Interface iface;
         public Destroy destroy;
-        public Focus focus;
     }
 
     [CCode (cheader_filename = "pantheon-desktop-shell-server-protocol.h", cname = "struct io_elementary_pantheon_extended_behavior_v1_interface")]
@@ -57,6 +56,8 @@ namespace Pantheon.Desktop {
         public static Wl.Interface iface;
         public Destroy destroy;
         public SetKeepAbove set_keep_above;
+        public MakeCentered make_centered;
+        public Focus focus;
     }
 
     [CCode (has_target = false, has_typedef = false)]
@@ -76,5 +77,7 @@ namespace Pantheon.Desktop {
     [CCode (has_target = false, has_typedef = false)]
     public delegate void SetKeepAbove (Wl.Client client, Wl.Resource resource);
     [CCode (has_target = false, has_typedef = false)]
+    public delegate void MakeCentered (Wl.Client client, Wl.Resource resource);
+    [CCode (has_target = false, has_typedef = false)]
     public delegate void Destroy (Wl.Client client, Wl.Resource resource);
 }

src/PantheonShell.vala

@@ -62,12 +62,13 @@ namespace Gala {
 
         wayland_pantheon_widget_interface = {
             destroy_widget_surface,
-            focus_widget,
         };
 
         wayland_pantheon_extended_behavior_interface = {
             destroy_extended_behavior_surface,
             set_keep_above,
+            make_centered,
+            focus_extended_behavior,
         };
 
         PanelSurface.quark = GLib.Quark.from_string ("-gala-wayland-panel-surface-data");
@@ -196,15 +197,6 @@ namespace Gala {
             widget_surface,
             (GLib.DestroyNotify) WidgetSurface.on_wayland_surface_disposed
         );
-
-        Meta.Window? window;
-        wayland_surface.get ("window", out window, null);
-        if (window == null) {
-            warning ("Failed to make window a widget as requested because Meta.Window was null.");
-            return;
-        }
-
-        ShellClientsManager.get_instance ().make_widget (window);
     }
 
     internal static void get_extended_behavior (Wl.Client client, Wl.Resource resource, uint32 output, Wl.Resource surface_resource) {
@@ -281,14 +273,14 @@ namespace Gala {
         focus (panel_surface.wayland_surface);
     }
 
-    internal static void focus_widget (Wl.Client client, Wl.Resource resource) {
-        unowned WidgetSurface? widget_surface = resource.get_user_data<WidgetSurface> ();
-        if (widget_surface.wayland_surface == null) {
+    internal static void focus_extended_behavior (Wl.Client client, Wl.Resource resource) {
+        unowned ExtendedBehaviorSurface? extended_behavior_surface = resource.get_user_data<ExtendedBehaviorSurface> ();
+        if (extended_behavior_surface.wayland_surface == null) {
             warning ("Window tried to focus but wayland surface is null.");
             return;
         }
 
-        focus (widget_surface.wayland_surface);
+        focus (extended_behavior_surface.wayland_surface);
     }
 
     internal static void focus (Object wayland_surface) {
@@ -351,6 +343,21 @@ namespace Gala {
         window.make_above ();
     }
 
+    internal static void make_centered (Wl.Client client, Wl.Resource resource) {
+        unowned ExtendedBehaviorSurface? eb_surface = resource.get_user_data<ExtendedBehaviorSurface> ();
+        if (eb_surface.wayland_surface == null) {
+            return;
+        }
+
+        Meta.Window? window;
+        eb_surface.wayland_surface.get ("window", out window, null);
+        if (window == null) {
+            return;
+        }
+
+        ShellClientsManager.get_instance ().make_centered (window);
+    }
+
     internal static void destroy_panel_surface (Wl.Client client, Wl.Resource resource) {
         resource.destroy ();
     }

src/ShellClients/ShellClientsManager.vala

@@ -26,7 +26,7 @@ public class Gala.ShellClientsManager : Object {
     private ManagedClient[] protocol_clients = {};
 
     private GLib.HashTable<Meta.Window, PanelWindow> windows = new GLib.HashTable<Meta.Window, PanelWindow> (null, null);
-    private GLib.HashTable<Meta.Window, WidgetWindow> widget_windows = new GLib.HashTable<Meta.Window, WidgetWindow> (null, null);
+    private GLib.HashTable<Meta.Window, CenteredWindow> centered_windows = new GLib.HashTable<Meta.Window, CenteredWindow> (null, null);
 
     private ShellClientsManager (WindowManager wm) {
         Object (wm: wm);
@@ -91,13 +91,13 @@ public class Gala.ShellClientsManager : Object {
         windows[window].set_hide_mode (hide_mode);
     }
 
-    public void make_widget (Meta.Window window) {
-        if (window in widget_windows) {
+    public void make_centered (Meta.Window window) {
+        if (window in centered_windows) {
             return;
         }
 
         make_dock (window);
 
-        widget_windows[window] = new WidgetWindow (wm, window);
+        centered_windows[window] = new CenteredWindow (wm, window);
     }
 }

src/ShellClients/WidgetWindow.vala

@@ -40,13 +40,13 @@ gala_bin_sources = files(
     'HotCorners/Barrier.vala',
     'HotCorners/HotCorner.vala',
     'HotCorners/HotCornerManager.vala',
+    'ShellClients/CenteredWindow.vala',
     'ShellClients/HideTracker.vala',
     'ShellClients/ManagedClient.vala',
     'ShellClients/NotificationsClient.vala',
     'ShellClients/PanelClone.vala',
     'ShellClients/PanelWindow.vala',
     'ShellClients/ShellClientsManager.vala',
-    'ShellClients/WidgetWindow.vala',
     'Widgets/DwellClickTimer.vala',
     'Widgets/IconGroup.vala',
     'Widgets/IconGroupContainer.vala',