deps: Update libxfce4windowing VAPI

In the latest version, only the Xfw namespace/prefix is supported, so
this switches everything over to it. This has the added benefit of being
way quicker and easier to type.

Signed-off-by: Evan Maddock <[email protected]>

Author: EbonJaeger

meson.build

@@ -63,7 +63,7 @@ dep_canberra = dependency('libcanberra')
 dep_canberra_gtk3 = dependency('libcanberra-gtk3')
 
 # Needed for window tracking
-dep_xfce4windowing = dependency('libxfce4windowing-0', version: '>= 4.19.7')
+dep_xfce4windowing = dependency('libxfce4windowing-0', version: '>= 4.20.1')
 
 # Needed for upower interaction
 dep_upower = dependency('upower-glib', version: '>= 0.99.8')

src/daemon/manager.vala

@@ -22,15 +22,15 @@ namespace Budgie {
 	 */
 	[SingleInstance]
 	public class WaylandClient : GLib.Object {
-		private unowned libxfce4windowing.Monitor? primary_monitor=null;
+		private unowned Xfw.Monitor? primary_monitor=null;
 
 		public bool is_initialised() { return primary_monitor != null; }
 		public unowned Gdk.Monitor gdk_monitor {get; private set; }
 		public Gdk.Rectangle monitor_res { get; private set; }
 
 		public WaylandClient() {
 			if (primary_monitor != null) return;
-			libxfce4windowing.Screen.get_default().monitors_changed.connect(on_monitors_changed);
+			Xfw.Screen.get_default().monitors_changed.connect(on_monitors_changed);
 			on_monitors_changed();
 		}
 
@@ -42,7 +42,7 @@ namespace Budgie {
 			   don't try indefinitely
 			*/
 			Timeout.add(200, ()=> {
-				primary_monitor = libxfce4windowing.Screen.get_default().get_primary_monitor();
+				primary_monitor = Xfw.Screen.get_default().get_primary_monitor();
 				if (primary_monitor != null || loop++ > 10) {
 					monitor_res = primary_monitor.get_logical_geometry();
 					gdk_monitor = primary_monitor.get_gdk_monitor();

src/daemon/tabswitcher.vala

@@ -12,7 +12,7 @@
 
 using Gdk;
 using Gtk;
-using libxfce4windowing;
+using Xfw;
 
 namespace Budgie {
 	public const string SHOW_ALL_WINDOWS_KEY = "show-all-windows-tabswitcher";
@@ -47,18 +47,18 @@ namespace Budgie {
 	public class TabSwitcherWidget : Gtk.FlowBoxChild {
 		private Gtk.Image image;
 		private uint64 activation_timestamp;
-		private libxfce4windowing.Application? application;
+		private Xfw.Application? application;
 		private DesktopAppInfo? info;
 		public string id;
 		public string title;
 
-		public unowned libxfce4windowing.Window? window = null;
+		public unowned Xfw.Window? window = null;
 
 		public signal void closed(TabSwitcherWidget widget);
-		public signal void window_activated(libxfce4windowing.Window window);
+		public signal void window_activated(Xfw.Window window);
 		public signal void workspace_changed();
 
-		public TabSwitcherWidget(Budgie.AppSystem app_system, libxfce4windowing.Window? win) {
+		public TabSwitcherWidget(Budgie.AppSystem app_system, Xfw.Window? win) {
 			Object();
 			window = win;
 			ulong uid = (ulong) window.x11_get_xid();
@@ -68,7 +68,7 @@ namespace Budgie {
 			application = win.get_application();
 
 			// Running under X11
-			if (libxfce4windowing.windowing_get() == libxfce4windowing.Windowing.X11) {
+			if (Xfw.windowing_get() == Xfw.Windowing.X11) {
 				info = app_system.query_window_by_xid((ulong)uid);
 			}
 
@@ -82,8 +82,8 @@ namespace Budgie {
 
 			window.state_changed.connect((changed_mask, new_state) => {
 				if (
-					(libxfce4windowing.WindowState.ACTIVE in changed_mask) &&
-					(libxfce4windowing.WindowState.ACTIVE in new_state)
+					(Xfw.WindowState.ACTIVE in changed_mask) &&
+					(Xfw.WindowState.ACTIVE in new_state)
 				) {
 					activation_timestamp = get_time();
 					window_activated(window);
@@ -127,11 +127,11 @@ namespace Budgie {
 		[GtkChild]
 		private unowned Label window_title;
 
-		private libxfce4windowing.Workspace? active_workspace = null;
-		private unowned libxfce4windowing.WorkspaceGroup? workspace_group = null;
+		private Xfw.Workspace? active_workspace = null;
+		private unowned Xfw.WorkspaceGroup? workspace_group = null;
 		private Gdk.Screen? default_screen;
-		private libxfce4windowing.Screen xfce_screen;
-		private unowned libxfce4windowing.WorkspaceManager workspace_manager;
+		private Xfw.Screen xfce_screen;
+		private unowned Xfw.WorkspaceManager workspace_manager;
 		private Budgie.AppSystem? app_system = null;
 
 		private Gdk.Monitor primary_monitor;
@@ -163,7 +163,7 @@ namespace Budgie {
 
 			default_screen = Gdk.Screen.get_default();
 
-			xfce_screen = libxfce4windowing.Screen.get_default();
+			xfce_screen = Xfw.Screen.get_default();
 
 			xfce_screen.get_windows().foreach(add_window);
 			xfce_screen.window_opened.connect(add_window);
@@ -212,7 +212,7 @@ namespace Budgie {
 			window_box.invalidate_filter(); // Re-filter
 		}
 
-		private void add_window(libxfce4windowing.Window window) {
+		private void add_window(Xfw.Window window) {
 			if (window.is_skip_pager() || window.is_skip_tasklist()) return;
 
 			var window_widget = new TabSwitcherWidget(app_system, window);
@@ -333,7 +333,7 @@ namespace Budgie {
 			update_sizing();
 		}
 
-		private void set_window_as_activated(libxfce4windowing.Window window) {
+		private void set_window_as_activated(Xfw.Window window) {
 			string id = ((ulong) window.x11_get_xid()).to_string();
 			unowned List<string> entries = recency.find_custom(id, strcmp);
 			recency.remove_link(entries);
@@ -356,15 +356,15 @@ namespace Budgie {
 			move_switcher();
 		}
 
-		private bool window_on_active_workspace(libxfce4windowing.Window window) {
-			unowned libxfce4windowing.Workspace? win_workspace = window.get_workspace(); // Get workspace
+		private bool window_on_active_workspace(Xfw.Window window) {
+			unowned Xfw.Workspace? win_workspace = window.get_workspace(); // Get workspace
 			if (active_workspace == null || win_workspace == null) return true;
 			return win_workspace.get_id() == active_workspace.get_id();
 		}
 
 		/* Switch focus to the item with the xid */
 		public void focus_item(bool backwards) {
-			unowned libxfce4windowing.Window? active_window = xfce_screen.get_active_window();
+			unowned Xfw.Window? active_window = xfce_screen.get_active_window();
 			TabSwitcherWidget? widget = active_window != null ? ids.get(((ulong) active_window.x11_get_xid()).to_string()) : null;
 
 			// Visible, each input should cycle to previous / next

src/dialogs/polkit/polkitdialog.vala

@@ -149,7 +149,7 @@ namespace Budgie {
 			combobox_idents.set_id_column(0);
 
 			// center dialog on the primary screen
-			var primary_monitor = libxfce4windowing.Screen.get_default().get_primary_monitor();
+			var primary_monitor = Xfw.Screen.get_default().get_primary_monitor();
 			GtkLayerShell.init_for_window(this);
 			GtkLayerShell.set_layer(this, GtkLayerShell.Layer.TOP);
 			GtkLayerShell.set_monitor(this, primary_monitor.get_gdk_monitor());

src/dialogs/screenshot/screenshot.vala

@@ -43,14 +43,14 @@ namespace Budgie {
 	 */
 	 [SingleInstance]
 	 public class WaylandClient : GLib.Object {
-		 private unowned libxfce4windowing.Monitor? primary_monitor=null;
+		 private unowned Xfw.Monitor? primary_monitor=null;
 
 		 public unowned Gdk.Monitor gdk_monitor {get; private set; }
 		 public int scale { get; private set; }
 
 		 public WaylandClient() {
 			 if (primary_monitor != null) return;
-			 libxfce4windowing.Screen.get_default().monitors_changed.connect(on_monitors_changed);
+			 Xfw.Screen.get_default().monitors_changed.connect(on_monitors_changed);
 			 on_monitors_changed();
 		 }
 
@@ -62,7 +62,7 @@ namespace Budgie {
 				don't try indefinitely
 			 */
 			 Timeout.add_seconds(1, ()=> {
-				 primary_monitor = libxfce4windowing.Screen.get_default().get_primary_monitor();
+				 primary_monitor = Xfw.Screen.get_default().get_primary_monitor();
 				 if (primary_monitor != null || loop++ > 10) {
 					 gdk_monitor = primary_monitor.get_gdk_monitor();
 					 scale = (int)primary_monitor.get_scale();

src/panel/applets/icon-tasklist/IconTasklistApplet.vala

@@ -455,7 +455,7 @@ public class IconTasklistApplet : Budgie.Applet {
 		button.update();
 	}
 
-	private void on_active_window_changed(libxfce4windowing.Window? old_active_window, libxfce4windowing.Window? new_active_window) {
+	private void on_active_window_changed(Xfw.Window? old_active_window, Xfw.Window? new_active_window) {
 		foreach (IconButton button in buttons.get_values()) {
 			if (new_active_window != null && button.has_window(new_active_window)) {
 				button.set_active_window(true);

src/panel/applets/icon-tasklist/widgets/ButtonPopover.vala

@@ -184,7 +184,7 @@ public class ButtonPopover : Gtk.Popover {
 		}
 	}
 
-	public void add_window(libxfce4windowing.Window window) {
+	public void add_window(Xfw.Window window) {
 		var window_item = new WindowItem(window);
 
 		window_item.page_switch_clicked.connect(() => {
@@ -204,7 +204,7 @@ public class ButtonPopover : Gtk.Popover {
 		windows.add(window_item);
 	}
 
-	public void remove_window(libxfce4windowing.Window window) {
+	public void remove_window(Xfw.Window window) {
 		string window_id = window.get_class_ids()[0];
 		WindowItem? window_item = null;
 
@@ -239,15 +239,15 @@ public class ButtonPopover : Gtk.Popover {
 }
 
 private class WindowControls : Gtk.Box {
-	public libxfce4windowing.Window window { get; construct; }
+	public Xfw.Window window { get; construct; }
 
 	private Gtk.Button? maximize_button;
 	private Gtk.Button? minimize_button;
 	private Gtk.Button? return_button;
 
 	public signal void return_clicked();
 
-	public WindowControls(libxfce4windowing.Window window) {
+	public WindowControls(Xfw.Window window) {
 		Object(window: window, orientation: Gtk.Orientation.VERTICAL, spacing: 0);
 	}
 
@@ -302,7 +302,7 @@ private class WindowControls : Gtk.Box {
 		});
 
 		window.state_changed.connect((changed_mask, new_state) => {
-			if (libxfce4windowing.WindowState.MAXIMIZED in changed_mask) {
+			if (Xfw.WindowState.MAXIMIZED in changed_mask) {
 				update_maximize_label();
 			}
 		});
@@ -354,7 +354,7 @@ private class WindowControls : Gtk.Box {
 }
 
 private class WindowItem : Gtk.ListBoxRow {
-	public libxfce4windowing.Window window { get; construct; }
+	public Xfw.Window window { get; construct; }
 
 	private Gtk.Label? name_label;
 	private Gtk.Button? name_button;
@@ -363,7 +363,7 @@ private class WindowItem : Gtk.ListBoxRow {
 
 	public signal void page_switch_clicked();
 
-	public WindowItem(libxfce4windowing.Window window) {
+	public WindowItem(Xfw.Window window) {
 		Object(window: window);
 	}
 

src/panel/applets/icon-tasklist/widgets/IconButton.vala

@@ -135,7 +135,7 @@ public class IconButton : Gtk.ToggleButton {
 	 *
 	 * Throws: if the button geometry could not be set
 	 */
-	private void set_window_button_geometry(libxfce4windowing.Window window) throws Error {
+	private void set_window_button_geometry(Xfw.Window window) throws Error {
 		int x, y;
 		var toplevel = get_toplevel();
 
@@ -162,7 +162,7 @@ public class IconButton : Gtk.ToggleButton {
 		// Nothing to do if there are no open windows
 		if (window_group == null) return Gdk.EVENT_STOP;
 
-		unowned libxfce4windowing.Window target_window = null;
+		unowned Xfw.Window target_window = null;
 
 		// Get the currently active window in the group
 		unowned var active_window = window_group?.get_active_window();
@@ -220,13 +220,13 @@ public class IconButton : Gtk.ToggleButton {
 		int width = definite_allocation.width;
 		int height = definite_allocation.height;
 
-		List<unowned libxfce4windowing.Window> windows;
+		List<unowned Xfw.Window> windows;
 
 		// Get the windows in this group, if any
 		if (window_group != null && window_group.has_windows()) {
 			windows = window_group.get_windows();
 		} else {
-			windows = new List<unowned libxfce4windowing.Window>();
+			windows = new List<unowned Xfw.Window>();
 		}
 
 		// No indicators if there are no windows
@@ -387,13 +387,13 @@ public class IconButton : Gtk.ToggleButton {
 		int width = definite_allocation.width;
 		int height = definite_allocation.height;
 
-		List<unowned libxfce4windowing.Window> windows;
+		List<unowned Xfw.Window> windows;
 
 		// Get the windows in this group, if any
 		if (window_group != null && window_group.has_windows()) {
 			windows = window_group.get_windows();
 		} else {
-			windows = new List<unowned libxfce4windowing.Window>();
+			windows = new List<unowned Xfw.Window>();
 		}
 
 		// No windows, no indicators
@@ -501,7 +501,7 @@ public class IconButton : Gtk.ToggleButton {
 		}
 	}
 
-	public bool has_window(libxfce4windowing.Window window) {
+	public bool has_window(Xfw.Window window) {
 		return window_group != null && window_group.has_window(window);
 	}
 
@@ -599,11 +599,11 @@ public class IconButton : Gtk.ToggleButton {
 			popover.add_window(window);
 
 			window.state_changed.connect((changed_mask, new_state) => {
-				if (!(libxfce4windowing.WindowState.URGENT in changed_mask)) {
+				if (!(Xfw.WindowState.URGENT in changed_mask)) {
 					return;
 				}
 
-				urgent = (new_state & libxfce4windowing.WindowState.URGENT) != 0;
+				urgent = (new_state & Xfw.WindowState.URGENT) != 0;
 
 				set_urgent(urgent);
 			});

src/panel/applets/show-desktop/ShowDesktopApplet.vala

@@ -18,7 +18,7 @@ public class ShowDesktopPlugin : Budgie.Plugin, Peas.ExtensionBase {
 public class ShowDesktopApplet : Budgie.Applet {
 	protected Gtk.ToggleButton widget;
 	protected Gtk.Image img;
-	private libxfce4windowing.Screen xfce_screen;
+	private Xfw.Screen xfce_screen;
 
 	public ShowDesktopApplet() {
 		widget = new Gtk.ToggleButton();
@@ -28,7 +28,7 @@ public class ShowDesktopApplet : Budgie.Applet {
 		widget.add(img);
 		widget.set_tooltip_text(_("Toggle the desktop"));
 
-		xfce_screen = libxfce4windowing.Screen.get_default();
+		xfce_screen = Xfw.Screen.get_default();
 
 		xfce_screen.window_opened.connect((window) => {
 			if (window.is_skip_pager() || window.is_skip_tasklist()) return;
@@ -48,7 +48,7 @@ public class ShowDesktopApplet : Budgie.Applet {
 				try {
 					window.set_minimized(!showing_desktop);
 				} catch (Error e) {
-					// Note: This is intentionally set to debug instead of warning because libxfce4windowing will create noise otherwise
+					// Note: This is intentionally set to debug instead of warning because Xfw will create noise otherwise
 					// Unminimize operations can end up being noisy when they fail due to the window not yet reporting the capability to support CAN_MINIMIZE
 					// https://gitlab.xfce.org/xfce/libxfce4windowing/-/blob/main/libxfce4windowing/xfw-window-x11.c#L363
 					debug("Failed to change state of window \"%s\": %s", window.get_name(), e.message);

src/panel/applets/workspaces/WindowIcon.vala

@@ -14,7 +14,7 @@ namespace Workspaces {
 	public const string FALLBACK_ICON_NAME = "image-missing";
 
 	public class WindowIcon : Gtk.Button {
-		public libxfce4windowing.Window window { get; construct; }
+		public Xfw.Window window { get; construct; }
 
 		construct {
 			this.set_relief(Gtk.ReliefStyle.NONE);
@@ -63,7 +63,7 @@ namespace Workspaces {
 			this.show_all();
 		}
 
-		public WindowIcon(libxfce4windowing.Window window) {
+		public WindowIcon(Xfw.Window window) {
 			Object(window: window);
 		}