File 0001-port-to-mutter330.patch of Package gala

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-port-to-mutter330.patch of Package gala

From: https://github.com/lavjamanxd/aur-alucryd/blob/mutter330/pantheon
Subject: [PATCH] port to mutter330

diff --git a/lib/Utils.vala b/lib/Utils.vala
index dbec7bc..f2cf8dc 100644
--- a/lib/Utils.vala
+++ b/lib/Utils.vala
@@ -187,8 +187,7 @@ namespace Gala
 		 */
 		public static Meta.Window get_next_window (Meta.Workspace workspace, bool backward = false)
 		{
-			var screen = workspace.get_screen ();
-			var display = screen.get_display ();
+			var display = workspace.get_display ();
 
 			var window = display.get_tab_next (Meta.TabList.NORMAL,
 				workspace, null, backward);
@@ -268,12 +267,16 @@ namespace Gala
 		 *
 		 * @param screen The screen to flash, if necessary
 		 */
-		public static void bell (Meta.Screen screen)
+		public static void bell (Meta.Display display)
 		{
 			if (Meta.Prefs.bell_is_audible ())
 				Gdk.beep ();
 			else
-				screen.get_display ().get_compositor ().flash_screen (screen);
+#if HAS_MUTTER330
+                display.get_compositor().flash_display(display);
+#else
+				display.get_compositor ().flash_screen ();
+#endif
 		}
 
 		/**
diff --git a/meson.build b/meson.build
index 5d2236b..3657c08 100644
--- a/meson.build
+++ b/meson.build
@@ -226,25 +226,26 @@ if mutter328_dep.found()
 		'-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API'], language: 'c')
 endif
 
-mutter330_dep = dependency('libmutter-2', version: ['>= 3.29.2', '< 3.31'], required: false)
+mutter330_dep = dependency('libmutter-3', version: ['>= 3.29.4', '< 3.31'], required: false)
 if mutter330_dep.found()
-	mutter_packages_command = [
-		'--pkg', 'libmutter-2',
-		'--pkg', 'mutter-cogl-2',
-		'--pkg', 'mutter-cogl-pango-2',
-		'--pkg', 'mutter-cogl-path-2',
-		'--pkg', 'mutter-clutter-2'
-	]
-	libmutter_dep = dependency('libmutter-2', version: '>= 3.29.2')
-	pkgconf.set('MUTTER_PKGS', 'libmutter-2 >= 3.29.2')
-	mutter_dep = [
-		libmutter_dep,
-		dependency('mutter-cogl-2'), dependency('mutter-cogl-pango-2'),
-		dependency('mutter-cogl-path-2'), dependency('mutter-clutter-2')
-	]
-	vala_flags += ['--define', 'HAS_MUTTER320', '--define', 'HAS_MUTTER322', '--define', 'HAS_MUTTER324', '--define', 'HAS_MUTTER326', '--define', 'HAS_MUTTER328', '--define', 'HAS_MUTTER330']
-	add_project_arguments(['-DCLUTTER_ENABLE_COMPOSITOR_API', '-DCLUTTER_ENABLE_EXPERIMENTAL_API',
-		'-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API'], language: 'c')
+        mutter_packages_command = [
+                '--pkg', 'libmutter-3',
+                '--pkg', 'mutter-cogl-3',
+                '--pkg', 'mutter-cogl-pango-3',
+                '--pkg', 'mutter-cogl-path-3',
+                '--pkg', 'mutter-clutter-3'
+        ]
+        libmutter_dep = dependency('libmutter-3', version: '>= 3.29.4')
+        pkgconf.set('MUTTER_PKGS', 'libmutter-3 >= 3.29.4')
+        mutter_dep = [
+                libmutter_dep,
+                dependency('mutter-cogl-3'), dependency('mutter-cogl-pango-3'),
+                dependency('mutter-cogl-path-3'), dependency('mutter-clutter-3')
+        ]
+        vala_flags += ['--define', 'HAS_MUTTER320', '--define', 'HAS_MUTTER322', '--define', 'HAS_MUTTER324', 
+'--define', 'HAS_MUTTER326', '--define', 'HAS_MUTTER328', '--define', 'HAS_MUTTER330']
+        compositor_c_args = ['-DCLUTTER_ENABLE_COMPOSITOR_API', '-DCLUTTER_ENABLE_EXPERIMENTAL_API',
+                '-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API']
 endif
 
 if mutter_dep.length() == 0
diff --git a/plugins/maskcorners/Main.vala b/plugins/maskcorners/Main.vala
index 670ac4f..f63f0ec 100644
--- a/plugins/maskcorners/Main.vala
+++ b/plugins/maskcorners/Main.vala
@@ -23,7 +23,7 @@ namespace Gala.Plugins.MaskCorners
 	public class Main : Gala.Plugin
 	{
 		Gala.WindowManager? wm = null;
-		Screen screen;
+		Display display;
 		Settings settings;
 
 		List<Actor>[] cornermasks;
@@ -32,7 +32,7 @@ namespace Gala.Plugins.MaskCorners
 		public override void initialize (Gala.WindowManager wm)
 		{
 			this.wm = wm;
-			screen = wm.get_screen ();
+			display = wm.get_display ();
 			settings = Settings.get_default ();
 
 			setup_cornermasks ();
@@ -56,35 +56,37 @@ namespace Gala.Plugins.MaskCorners
 			var scale = 1;
 #endif
 
-			int n_monitors = screen.get_n_monitors ();
+			int n_monitors = display.get_n_monitors ();
 			cornermasks = new List<Actor>[n_monitors];
 			corner_radius = settings.corner_radius * scale;
 
 			if (settings.only_on_primary) {
-				add_cornermasks (screen.get_primary_monitor ());
+				add_cornermasks (display.get_primary_monitor ());
 			} else {
 				for (int m = 0; m < n_monitors; m++)
 					add_cornermasks (m);
 			}
 
 			if (settings.disable_on_fullscreen)
-				screen.in_fullscreen_changed.connect (fullscreen_changed);
+			    display.in_fullscreen_changed.connect (fullscreen_changed);
 
-			screen.monitors_changed.connect (resetup_cornermasks);
+            var monitorManager = Meta.MonitorManager.get();
+			monitorManager.monitors_changed.connect (resetup_cornermasks);
 
 #if HAS_MUTTER322
-			screen.get_display ().gl_video_memory_purged.connect (resetup_cornermasks);
+			display.gl_video_memory_purged.connect (resetup_cornermasks);
 #endif
 		}
 
 		void destroy_cornermasks ()
 		{
 #if HAS_MUTTER322
-			screen.get_display ().gl_video_memory_purged.disconnect (resetup_cornermasks);
+			display.gl_video_memory_purged.disconnect (resetup_cornermasks);
 #endif
 
-			screen.monitors_changed.disconnect (resetup_cornermasks);
-			screen.in_fullscreen_changed.disconnect (fullscreen_changed);
+            var monitorManager = Meta.MonitorManager.get();
+			monitorManager.monitors_changed.disconnect (resetup_cornermasks);
+			display.in_fullscreen_changed.disconnect (fullscreen_changed);
 
 			foreach (unowned List<Actor> list in cornermasks) {
 				foreach (Actor actor in list)
@@ -100,9 +102,9 @@ namespace Gala.Plugins.MaskCorners
 
 		void fullscreen_changed ()
 		{
-			for (int i = 0; i < screen.get_n_monitors (); i++) {
+			for (int i = 0; i < display.get_n_monitors (); i++) {
 				foreach (Actor actor in cornermasks[i]) {
-					if (screen.get_monitor_in_fullscreen (i))
+					if (display.get_monitor_in_fullscreen (i))
 						actor.hide ();
 					else
 						actor.show ();
@@ -112,7 +114,7 @@ namespace Gala.Plugins.MaskCorners
 
 		void add_cornermasks (int monitor_no)
 		{
-			var monitor_geometry = screen.get_monitor_geometry (monitor_no);
+			var monitor_geometry = display.get_monitor_geometry (monitor_no);
 
 			Canvas canvas = new Canvas ();
 			canvas.set_size (corner_radius, corner_radius);
diff --git a/plugins/notify/Main.vala b/plugins/notify/Main.vala
index 6769114..360d24f 100644
--- a/plugins/notify/Main.vala
+++ b/plugins/notify/Main.vala
@@ -30,9 +30,9 @@ namespace Gala.Plugins.Notify
 		public override void initialize (Gala.WindowManager wm)
 		{
 			this.wm = wm;
-			var screen = wm.get_screen ();
+			var display = wm.get_display ();
 
-			stack = new NotificationStack (wm.get_screen ());
+			stack = new NotificationStack (display);
 			wm.ui_group.add_child (stack);
 			track_actor (stack);
 
@@ -43,8 +43,9 @@ namespace Gala.Plugins.Notify
 			server = new NotifyServer (stack);
 
 			update_position ();
-			screen.monitors_changed.connect (update_position);
-			screen.workareas_changed.connect (update_position);
+			var monitor_manager = Meta.MonitorManager.get ();
+			monitor_manager.monitors_changed.connect (update_position);
+			monitor_manager.workareas_changed.connect (update_position);
 
 			Bus.own_name (BusType.SESSION, "org.freedesktop.Notifications", BusNameOwnerFlags.NONE,
 				(connection) => {
@@ -64,9 +65,9 @@ namespace Gala.Plugins.Notify
 
 		void update_position ()
 		{
-			var screen = wm.get_screen ();
-			var primary = screen.get_primary_monitor ();
-			var area = screen.get_active_workspace ().get_work_area_for_monitor (primary);
+			var display = wm.get_display ();
+			var primary = display.get_primary_monitor ();
+			var area = display.get_workspace_manager ().get_active_workspace ().get_work_area_for_monitor (primary);
 
 			stack.x = area.x + area.width - stack.width;
 			stack.y = area.y;
diff --git a/plugins/notify/NormalNotification.vala b/plugins/notify/NormalNotification.vala
index cedaa4b..5e311af 100644
--- a/plugins/notify/NormalNotification.vala
+++ b/plugins/notify/NormalNotification.vala
@@ -181,13 +181,13 @@ namespace Gala.Plugins.Notify
 		public string body { get; construct set; }
 		public uint32 sender_pid { get; construct; }
 		public string[] notification_actions { get; construct set; }
-		public Screen screen { get; construct; }
+		public Display display { get; construct; }
 
 		Actor content_container;
 		NormalNotificationContent notification_content;
 		NormalNotificationContent? old_notification_content = null;
 
-		public NormalNotification (Screen screen, uint32 id, string summary, string body, Gdk.Pixbuf? icon,
+		public NormalNotification (Display display, uint32 id, string summary, string body, Gdk.Pixbuf? icon,
 			NotificationUrgency urgency, int32 expire_timeout, uint32 pid, string[] actions)
 		{
 			Object (
@@ -195,7 +195,7 @@ namespace Gala.Plugins.Notify
 				icon: icon,
 				urgency: urgency,
 				expire_timeout: expire_timeout,
-				screen: screen,
+				display: display,
 				summary: summary,
 				body: body,
 				sender_pid: pid,
@@ -303,9 +303,9 @@ namespace Gala.Plugins.Notify
 			unowned Meta.Window? window = get_window ();
 			if (window != null) {
 				unowned Meta.Workspace workspace = window.get_workspace ();
-				var time = screen.get_display ().get_current_time ();
+				var time = display.get_current_time ();
 
-				if (workspace != screen.get_active_workspace ())
+				if (workspace != display.get_workspace_manager().get_active_workspace ())
 					workspace.activate_with_focus (window, time);
 				else
 					window.activate (time);
@@ -319,7 +319,7 @@ namespace Gala.Plugins.Notify
 			if (sender_pid == 0)
 				return null;
 
-			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (screen)) {
+			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (display)) {
 				if (actor.is_destroyed ())
 					continue;
 
diff --git a/plugins/notify/NotificationStack.vala b/plugins/notify/NotificationStack.vala
index 9470507..3e91c24 100644
--- a/plugins/notify/NotificationStack.vala
+++ b/plugins/notify/NotificationStack.vala
@@ -29,11 +29,11 @@ namespace Gala.Plugins.Notify
 
 		public signal void animations_changed (bool running);
 
-		public Screen screen { get; construct; }
+		public Display display { get; construct; }
 
-		public NotificationStack (Screen screen)
+		public NotificationStack (Display display)
 		{
-			Object (screen: screen);
+			Object (display: display);
 		}
 
 		construct
diff --git a/plugins/notify/NotifyServer.vala b/plugins/notify/NotifyServer.vala
index 240f397..0d068ac 100644
--- a/plugins/notify/NotifyServer.vala
+++ b/plugins/notify/NotifyServer.vala
@@ -286,7 +286,7 @@ namespace Gala.Plugins.Notify
 						progress ? hints.@get ("value").get_int32 () : -1,
 						hints.@get (X_CANONICAL_PRIVATE_SYNCHRONOUS).get_string ());
 				else
-					notification = new NormalNotification (stack.screen, id, summary, body, pixbuf,
+					notification = new NormalNotification (stack.display, id, summary, body, pixbuf,
 						urgency, timeout, pid, actions);
 
 				notification.action_invoked.connect (notification_action_invoked_callback);
diff --git a/plugins/pip/Main.vala b/plugins/pip/Main.vala
index 0dca1fd..d9629a9 100644
--- a/plugins/pip/Main.vala
+++ b/plugins/pip/Main.vala
@@ -37,7 +37,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin
 	public override void initialize (Gala.WindowManager wm)
 	{
 		this.wm = wm;
-		var display = wm.get_screen ().get_display ();
+		var display = wm.get_display ();
 		var settings = new GLib.Settings (Config.SCHEMA + ".keybindings");
 
 		display.add_keybinding ("pip", settings, Meta.KeyBindingFlags.NONE, (Meta.KeyHandlerFunc) on_initiate);
@@ -55,8 +55,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin
 	}
 
 	[CCode (instance_pos = -1)]
-	void on_initiate (Meta.Display display, Meta.Screen screen,
-		Meta.Window? window, Clutter.KeyEvent event, Meta.KeyBinding binding)
+	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);
@@ -134,8 +133,8 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin
 
 	private Meta.WindowActor? get_window_actor_at (int x, int y)
 	{
-		var screen = wm.get_screen ();
-		unowned List<weak Meta.WindowActor> actors = Meta.Compositor.get_window_actors (screen);
+		var display = wm.get_display ();
+		unowned List<weak Meta.WindowActor> actors = Meta.Compositor.get_window_actors (display);
 
 		var copy = actors.copy ();
 		copy.reverse ();
@@ -159,8 +158,8 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin
 
 	private Meta.WindowActor? get_active_window_actor ()
 	{
-		var screen = wm.get_screen ();
-		unowned List<weak Meta.WindowActor> actors = Meta.Compositor.get_window_actors (screen);
+		var display = wm.get_display ();
+		unowned List<weak Meta.WindowActor> actors = Meta.Compositor.get_window_actors (display);
 
 		var copy = actors.copy ();
 		copy.reverse ();
diff --git a/plugins/pip/PopupWindow.vala b/plugins/pip/PopupWindow.vala
index 041ed5d..54f896d 100644
--- a/plugins/pip/PopupWindow.vala
+++ b/plugins/pip/PopupWindow.vala
@@ -298,7 +298,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor
 
 	private void update_window_focus ()
 	{
-		unowned Meta.Window focus_window = wm.get_screen ().get_display ().get_focus_window ();
+		unowned Meta.Window focus_window = wm.get_display ().get_focus_window ();
 		if ((focus_window != null && !get_window_is_normal (focus_window))
 			|| (previous_focus != null && !get_window_is_normal (previous_focus))) {
 			previous_focus = focus_window;
@@ -419,8 +419,8 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor
 
 	private void get_current_monitor_rect (out Meta.Rectangle rect)
 	{
-		var screen = wm.get_screen ();
-		rect = screen.get_monitor_geometry (screen.get_current_monitor ());
+		var display = wm.get_display ();
+		rect = display.get_monitor_geometry (display.get_current_monitor ());
 	}
 
 	private void get_target_window_size (out float width, out float height)
diff --git a/plugins/pip/SelectionArea.vala b/plugins/pip/SelectionArea.vala
index 5c86c39..00eaf47 100644
--- a/plugins/pip/SelectionArea.vala
+++ b/plugins/pip/SelectionArea.vala
@@ -42,7 +42,7 @@ public class Gala.Plugins.PIP.SelectionArea : Clutter.Actor
 		reactive = true;
 
 		int screen_width, screen_height;
-		wm.get_screen ().get_size (out screen_width, out screen_height);
+		wm.get_display ().get_size (out screen_width, out screen_height);
 		width = screen_width;
 		height = screen_height;
 
@@ -126,7 +126,7 @@ public class Gala.Plugins.PIP.SelectionArea : Clutter.Actor
 
 	public void close ()
 	{
-		wm.get_screen ().set_cursor (Meta.Cursor.DEFAULT);
+		wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
 
 		if (modal_proxy != null) {
 			wm.pop_modal (modal_proxy);
@@ -135,7 +135,7 @@ public class Gala.Plugins.PIP.SelectionArea : Clutter.Actor
 
 	public void start_selection ()
 	{
-		wm.get_screen ().set_cursor (Meta.Cursor.CROSSHAIR);
+		wm.get_display ().set_cursor (Meta.Cursor.CROSSHAIR);
 		grab_key_focus ();
 
 		modal_proxy = wm.push_modal ();
diff --git a/plugins/template/Main.vala b/plugins/template/Main.vala
index efa3ce3..f78a17b 100644
--- a/plugins/template/Main.vala
+++ b/plugins/template/Main.vala
@@ -49,8 +49,8 @@ namespace Gala.Plugins.Template
 			// we want to place it in the lower right of the primary monitor with a bit
 			// of padding. refer to vapi/libmutter.vapi in gala's source for something
 			// remotely similar to a documentation
-			var screen = wm.get_screen ();
-			var rect = screen.get_monitor_geometry (screen.get_primary_monitor ());
+			var display = wm.get_display ();
+			var rect = display.get_monitor_geometry (display.get_primary_monitor ());
 
 			red_box.x = rect.x + rect.width - red_box.width - PADDING;
 			red_box.y = rect.y + rect.height - red_box.height - PADDING;
diff --git a/plugins/zoom/Main.vala b/plugins/zoom/Main.vala
index 8457e10..1f6cb1f 100644
--- a/plugins/zoom/Main.vala
+++ b/plugins/zoom/Main.vala
@@ -30,7 +30,7 @@ namespace Gala.Plugins.Zoom
 		public override void initialize (Gala.WindowManager wm)
 		{
 			this.wm = wm;
-			var display = wm.get_screen ().get_display ();
+			var display = wm.get_display ();
 			var schema = new GLib.Settings (Config.SCHEMA + ".keybindings");
 
 			display.add_keybinding ("zoom-in", schema, 0, (Meta.KeyHandlerFunc) zoom_in);
@@ -42,7 +42,7 @@ namespace Gala.Plugins.Zoom
 			if (wm == null)
 				return;
 
-			var display = wm.get_screen ().get_display ();
+			var display = wm.get_display ();
 
 			display.remove_keybinding ("zoom-in");
 			display.remove_keybinding ("zoom-out");
@@ -53,15 +53,13 @@ namespace Gala.Plugins.Zoom
 		}
 
 		[CCode (instance_pos = -1)]
-		void zoom_in (Meta.Display display, Meta.Screen screen,
-			Meta.Window? window, Clutter.KeyEvent event, Meta.KeyBinding binding)
+		void zoom_in (Meta.Display display, Meta.Window? window, Clutter.KeyEvent event, Meta.KeyBinding binding)
 		{
 			zoom (true);
 		}
 
 		[CCode (instance_pos = -1)]
-		void zoom_out (Meta.Display display, Meta.Screen screen,
-			Meta.Window? window, Clutter.KeyEvent event, Meta.KeyBinding binding)
+		void zoom_out (Meta.Display display, Meta.Window? window, Clutter.KeyEvent event, Meta.KeyBinding binding)
 		{
 			zoom (false);
 		}
diff --git a/src/Background/Background.vala b/src/Background/Background.vala
index 4b934bb..d2e985e 100644
--- a/src/Background/Background.vala
+++ b/src/Background/Background.vala
@@ -25,7 +25,7 @@ namespace Gala
 		public signal void changed ();
 		public signal void loaded ();
 
-		public Meta.Screen screen { get; construct; }
+		public Meta.Display display { get; construct; }
 		public int monitor_index { get; construct; }
 		public BackgroundSource background_source { get; construct; }
 		public bool is_loaded { get; private set; default = false; }
@@ -38,10 +38,10 @@ namespace Gala
 		Cancellable cancellable;
 		uint update_animation_timeout_id = 0;
 
-		public Background (Meta.Screen screen, int monitor_index, string? filename,
+		public Background (Meta.Display display, int monitor_index, string? filename,
 				BackgroundSource background_source, GDesktop.BackgroundStyle style)
 		{
-			Object (screen: screen,
+			Object (display: display,
 					monitor_index: monitor_index,
 					background_source: background_source,
 					style: style,
@@ -50,7 +50,7 @@ namespace Gala
 
 		construct
 		{
-			background = new Meta.Background (screen);
+			background = new Meta.Background (display);
 			background.set_data<unowned Background> ("delegate", this);
 
 			file_watches = new Gee.HashMap<string,ulong> ();
@@ -145,7 +145,7 @@ namespace Gala
 		{
 			update_animation_timeout_id = 0;
 
-			animation.update (screen.get_monitor_geometry (monitor_index));
+			animation.update (display.get_monitor_geometry (monitor_index));
 			var files = animation.key_frame_files;
 
 			Clutter.Callback finish = () => {
diff --git a/src/Background/BackgroundCache.vala b/src/Background/BackgroundCache.vala
index 6126e3b..16ab74d 100644
--- a/src/Background/BackgroundCache.vala
+++ b/src/Background/BackgroundCache.vala
@@ -91,11 +91,11 @@ namespace Gala
 			return animation;
 		}
 
-		public BackgroundSource get_background_source (Meta.Screen screen, string settings_schema)
+		public BackgroundSource get_background_source (Meta.Display display, string settings_schema)
 		{
 			var background_source = background_sources[settings_schema];
 			if (background_source == null) {
-				background_source = new BackgroundSource (screen, settings_schema);
+				background_source = new BackgroundSource (display, settings_schema);
 				background_source.use_count = 1;
 				background_sources[settings_schema] = background_source;
 			} else
diff --git a/src/Background/BackgroundContainer.vala b/src/Background/BackgroundContainer.vala
index ceaf44c..5347f77 100644
--- a/src/Background/BackgroundContainer.vala
+++ b/src/Background/BackgroundContainer.vala
@@ -21,23 +21,23 @@ namespace Gala
 	{
 		public signal void changed ();
 
-		public Meta.Screen screen { get; construct; }
+		public Meta.Display display { get; construct; }
 
-		public BackgroundContainer (Meta.Screen screen)
+		public BackgroundContainer (Meta.Display display)
 		{
-			Object (screen: screen);
+			Object (display: display);
 		}
 
 		construct
 		{
-			screen.monitors_changed.connect (update);
+			Meta.MonitorManager.get().monitors_changed.connect (update);
 
 			update ();
 		}
 
 		~BackgroundContainer ()
 		{
-			screen.monitors_changed.disconnect (update);
+			Meta.MonitorManager.get().monitors_changed.disconnect (update);
 		}
 
 		void update ()
@@ -48,8 +48,8 @@ namespace Gala
 
 			destroy_all_children ();
 
-			for (var i = 0; i < screen.get_n_monitors (); i++) {
-				var background = new BackgroundManager (screen, i);
+			for (var i = 0; i < display.get_n_monitors (); i++) {
+				var background = new BackgroundManager (display, i);
 
 				add_child (background);
 
diff --git a/src/Background/BackgroundManager.vala b/src/Background/BackgroundManager.vala
index 4ab5c30..9e901b2 100644
--- a/src/Background/BackgroundManager.vala
+++ b/src/Background/BackgroundManager.vala
@@ -24,7 +24,7 @@ namespace Gala
 
 		public signal void changed ();
 
-		public Meta.Screen screen { get; construct; }
+		public Meta.Display display { get; construct; }
 		public int monitor_index { get; construct; }
 		public bool control_position { get; construct; }
 
@@ -32,14 +32,14 @@ namespace Gala
 		Meta.BackgroundActor background_actor;
 		Meta.BackgroundActor? new_background_actor = null;
 
-		public BackgroundManager (Meta.Screen screen, int monitor_index, bool control_position = true)
+		public BackgroundManager (Meta.Display display, int monitor_index, bool control_position = true)
 		{
-			Object (screen: screen, monitor_index: monitor_index, control_position: control_position);
+			Object (display: display, monitor_index: monitor_index, control_position: control_position);
 		}
 
 		construct
 		{
-			background_source = BackgroundCache.get_default ().get_background_source (screen, BACKGROUND_SCHEMA);
+			background_source = BackgroundCache.get_default ().get_background_source (display, BACKGROUND_SCHEMA);
 
 			background_actor = create_background_actor ();
 		}
@@ -125,13 +125,13 @@ namespace Gala
 		Meta.BackgroundActor create_background_actor ()
 		{
 			var background = background_source.get_background (monitor_index);
-			var background_actor = new Meta.BackgroundActor (screen, monitor_index);
+			var background_actor = new Meta.BackgroundActor (display, monitor_index);
 
 			background_actor.background = background.background;
 
 			insert_child_below (background_actor, null);
 
-			var monitor = screen.get_monitor_geometry (monitor_index);
+			var monitor = display.get_monitor_geometry (monitor_index);
 
 			background_actor.set_size (monitor.width, monitor.height);
 
diff --git a/src/Background/BackgroundSource.vala b/src/Background/BackgroundSource.vala
index 1548a0d..878d239 100644
--- a/src/Background/BackgroundSource.vala
+++ b/src/Background/BackgroundSource.vala
@@ -21,23 +21,23 @@ namespace Gala
 	{
 		public signal void changed ();
 
-		public Meta.Screen screen { get; construct; }
+		public Meta.Display display { get; construct; }
 		public Settings settings { get; construct; }
 
 		internal int use_count { get; set; default = 0; }
 
 		Gee.HashMap<int,Background> backgrounds;
 
-		public BackgroundSource (Meta.Screen screen, string settings_schema)
+		public BackgroundSource (Meta.Display display, string settings_schema)
 		{
-			Object (screen: screen, settings: new Settings (settings_schema));
+			Object (display: display, settings: new Settings (settings_schema));
 		}
 
 		construct
 		{
 			backgrounds = new Gee.HashMap<int,Background> ();
 
-			screen.monitors_changed.connect (monitors_changed);
+			Meta.MonitorManager.get().monitors_changed.connect (monitors_changed);
 
 			settings_hash_cache = get_current_settings_hash_cache ();
 			settings.changed.connect (settings_changed);
@@ -45,7 +45,7 @@ namespace Gala
 
 		void monitors_changed ()
 		{
-			var n = screen.get_n_monitors ();
+			var n = display.get_n_monitors ();
 			var i = 0;
 
 			foreach (var background in backgrounds.values) {
@@ -82,7 +82,7 @@ namespace Gala
 				monitor_index = 0;
 
 			if (!backgrounds.has_key (monitor_index)) {
-				var background = new Background (screen, monitor_index, filename, this, (GDesktop.BackgroundStyle) style);
+				var background = new Background (display, monitor_index, filename, this, (GDesktop.BackgroundStyle) style);
 				background.changed.connect (background_changed);
 				backgrounds[monitor_index] = background;
 			}
@@ -99,7 +99,7 @@ namespace Gala
 
 		public void destroy ()
 		{
-			screen.monitors_changed.disconnect (monitors_changed);
+			Meta.MonitorManager.get().monitors_changed.disconnect (monitors_changed);
 
 			foreach (var background in backgrounds) {
 				background.changed.disconnect (background_changed);
diff --git a/src/Background/SystemBackground.vala b/src/Background/SystemBackground.vala
index a125777..229821d 100644
--- a/src/Background/SystemBackground.vala
+++ b/src/Background/SystemBackground.vala
@@ -25,9 +25,9 @@ namespace Gala
 
 		public signal void loaded ();
 
-		public SystemBackground (Meta.Screen screen)
+		public SystemBackground (Meta.Display display)
 		{
-			Object (meta_screen: screen, monitor: 0);
+			Object (meta_display: display, monitor: 0);
 		}
 
 		construct
@@ -35,7 +35,7 @@ namespace Gala
 			var path = InternalUtils.get_system_background_path ();
 
 			if (system_background == null) {
-				system_background = new Meta.Background (meta_screen);
+				system_background = new Meta.Background (meta_display);
 				system_background.set_color (DEFAULT_BACKGROUND_COLOR);
 
 				system_background.set_file (File.new_for_path (path), GDesktop.BackgroundStyle.WALLPAPER);
diff --git a/src/DBusAccelerator.vala b/src/DBusAccelerator.vala
index fcd01a4..d1d46ef 100644
--- a/src/DBusAccelerator.vala
+++ b/src/DBusAccelerator.vala
@@ -47,7 +47,7 @@ namespace Gala
 			wm = _wm;
 			grabbed_accelerators = new HashTable<string, uint> (str_hash, str_equal);
 
-			wm.get_screen ().get_display ().accelerator_activated.connect (on_accelerator_activated);
+			wm.get_display ().accelerator_activated.connect (on_accelerator_activated);
 		}
 
 		void on_accelerator_activated (uint action, uint device_id, uint timestamp)
@@ -68,7 +68,7 @@ namespace Gala
 			uint? action = grabbed_accelerators[accelerator];
 
 			if (action == null) {
-				action = wm.get_screen ().get_display ().grab_accelerator (accelerator);
+				action = wm.get_display ().grab_accelerator (accelerator);
 				if (action > 0) {
 					grabbed_accelerators[accelerator] = action;
 				}
@@ -94,7 +94,7 @@ namespace Gala
 
 			foreach (unowned string accelerator in grabbed_accelerators.get_keys ()) {
 				if (grabbed_accelerators[accelerator] == action) {
-					ret = wm.get_screen ().get_display ().ungrab_accelerator (action);
+					ret = wm.get_display ().ungrab_accelerator (action);
 					grabbed_accelerators.remove (accelerator);
 					break;
 				}
diff --git a/src/InternalUtils.vala b/src/InternalUtils.vala
index 04f8125..5abed8c 100644
--- a/src/InternalUtils.vala
+++ b/src/InternalUtils.vala
@@ -71,14 +71,12 @@ namespace Gala
 		/**
 		 * set the area where clutter can receive events
 		 **/
-		public static void set_input_area (Screen screen, InputArea area)
+		public static void set_input_area (Display display, InputArea area)
 		{
-			var display = screen.get_display ();
-
 			X.Xrectangle[] rects = {};
 			int width, height;
-			screen.get_size (out width, out height);
-			var geometry = screen.get_monitor_geometry (screen.get_primary_monitor ());
+			display.get_size (out width, out height);
+			var geometry = display.get_monitor_geometry (display.get_primary_monitor ());
 
 			switch (area) {
 				case InputArea.FULLSCREEN:
@@ -110,12 +108,22 @@ namespace Gala
 					break;
 				case InputArea.NONE:
 				default:
-					Util.empty_stage_input_region (screen);
+#if HAS_MUTTER330
+		Util.empty_stage_input_region (display);
+#else
+		Util.empty_stage_input_region (screen);
+#endif
+
+
 					return;
 			}
 
-			var xregion = X.Fixes.create_region (display.get_xdisplay (), rects);
-			Util.set_stage_input_region (screen, xregion);
+			var xregion = X.Fixes.create_region (display.get_x11_display (), rects);
+#if HAS_MUTTER330
+		Util.set_stage_input_region (display, xregion);
+#else
+		Util.set_stage_input_region (screen, xregion);
+#endif
 		}
 
 		public static string get_system_background_path ()
@@ -147,7 +155,7 @@ namespace Gala
 
 			new_window.change_workspace_by_index (index, false);
 
-			unowned List<WindowActor> actors = Compositor.get_window_actors (new_window.get_screen ());
+			unowned List<WindowActor> actors = Compositor.get_window_actors (new_window.get_display ());
 			foreach (unowned Meta.WindowActor actor in actors) {
 				if (actor.is_destroyed ())
 					continue;
diff --git a/src/ScreenshotManager.vala b/src/ScreenshotManager.vala
index a57d7f9..265c2dd 100644
--- a/src/ScreenshotManager.vala
+++ b/src/ScreenshotManager.vala
@@ -48,7 +48,7 @@ namespace Gala
 			debug ("Taking screenshot");
 
 			int width, height;
-			wm.get_screen ().get_size (out width, out height);
+			wm.get_display ().get_size (out width, out height);
 
 			var image = take_screenshot (0, 0, width, height, include_cursor);
 			success = save_image (image, filename, out filename_used);
@@ -70,7 +70,7 @@ namespace Gala
 		{
 			debug ("Taking window screenshot");
 
-			var window = wm.get_screen ().get_display ().get_focus_window ();
+			var window = wm.get_display ().get_focus_window ();
 			var window_actor = (Meta.WindowActor) window.get_compositor_private ();
 			unowned Meta.ShapedTexture window_texture = (Meta.ShapedTexture) window_actor.get_texture ();
 
@@ -187,7 +187,7 @@ namespace Gala
 
 		Cairo.ImageSurface composite_stage_cursor (Cairo.ImageSurface image, Cairo.RectangleInt image_rect)
 		{
-			unowned Meta.CursorTracker cursor_tracker = Meta.CursorTracker.get_for_screen (wm.get_screen ());
+			unowned Meta.CursorTracker cursor_tracker = Meta.CursorTracker.get_for_display (wm.get_display ());
 
 			int x, y;
 			cursor_tracker.get_pointer (out x, out y, null);
diff --git a/src/Widgets/IconGroup.vala b/src/Widgets/IconGroup.vala
index 29abe31..6a6e4fc 100644
--- a/src/Widgets/IconGroup.vala
+++ b/src/Widgets/IconGroup.vala
@@ -324,7 +324,7 @@ namespace Gala
 		 */
 		void close ()
 		{
-			var time = workspace.get_screen ().get_display ().get_current_time ();
+			var time = workspace.get_display ().get_current_time ();
 			foreach (var window in workspace.list_windows ()) {
 				var type = window.window_type;
 				if (!window.is_on_all_workspaces () && (type == WindowType.NORMAL
@@ -391,12 +391,13 @@ namespace Gala
 
 			// it's not safe to to call meta_workspace_index() here, we may be still animating something
 			// while the workspace is already gone, which would result in a crash.
-			var screen = workspace.get_screen ();
-			var workspace_index = screen.get_workspaces ().index (workspace);
+			var display = workspace.get_display ();
+			var workspace_manager = display.get_workspace_manager();
+			var workspace_index = workspace_manager.get_workspaces ().index (workspace);
 
 			if (n_windows < 1) {
 				if (!Prefs.get_dynamic_workspaces ()
-					|| workspace_index != screen.get_n_workspaces () - 1)
+					|| workspace_index != workspace_manager.get_n_workspaces () - 1)
 					return false;
 
 				var buffer = new Granite.Drawing.BufferSurface (SIZE * scale, SIZE * scale);
diff --git a/src/Widgets/IconGroupContainer.vala b/src/Widgets/IconGroupContainer.vala
index 6f5f7c2..7269488 100644
--- a/src/Widgets/IconGroupContainer.vala
+++ b/src/Widgets/IconGroupContainer.vala
@@ -32,11 +32,11 @@ namespace Gala
 
 		public signal void request_reposition ();
 
-		public Screen screen { get; construct; }
+		public Display display { get; construct; }
 
-		public IconGroupContainer (Screen screen)
+		public IconGroupContainer (Display display)
 		{
-			Object (screen: screen);
+			Object (display: display);
 
 			layout_manager = new BoxLayout ();
 		}
diff --git a/src/Widgets/MonitorClone.vala b/src/Widgets/MonitorClone.vala
index 96681ce..b7b2f29 100644
--- a/src/Widgets/MonitorClone.vala
+++ b/src/Widgets/MonitorClone.vala
@@ -31,32 +31,32 @@ namespace Gala
 	{
 		public signal void window_selected (Window window);
 
-		public Screen screen { get; construct; }
+		public Display display { get; construct; }
 		public int monitor { get; construct; }
 
 		WindowCloneContainer window_container;
 		BackgroundManager background;
 
-		public MonitorClone (Screen screen, int monitor)
+		public MonitorClone (Display display, int monitor)
 		{
-			Object (screen: screen, monitor: monitor);
+			Object (display: display, monitor: monitor);
 		}
 
 		construct
 		{
 			reactive = true;
 
-			background = new BackgroundManager (screen, monitor, false);
+			background = new BackgroundManager (display, monitor, false);
 			background.set_easing_duration (MultitaskingView.ANIMATION_DURATION);
 
 			window_container = new WindowCloneContainer ();
 			window_container.window_selected.connect ((w) => { window_selected (w); });
-			screen.restacked.connect (window_container.restack_windows);
+			display.restacked.connect (window_container.restack_windows);
 
-			screen.window_entered_monitor.connect (window_entered);
-			screen.window_left_monitor.connect (window_left);
+			display.window_entered_monitor.connect (window_entered);
+			display.window_left_monitor.connect (window_left);
 
-			foreach (unowned Meta.WindowActor window_actor in Meta.Compositor.get_window_actors (screen)) {
+			foreach (unowned Meta.WindowActor window_actor in Meta.Compositor.get_window_actors (display)) {
 				if (window_actor.is_destroyed ())
 					continue;
 
@@ -77,9 +77,9 @@ namespace Gala
 
 		~MonitorClone ()
 		{
-			screen.window_entered_monitor.disconnect (window_entered);
-			screen.window_left_monitor.disconnect (window_left);
-			screen.restacked.disconnect (window_container.restack_windows);
+			display.window_entered_monitor.disconnect (window_entered);
+			display.window_left_monitor.disconnect (window_left);
+			display.restacked.disconnect (window_container.restack_windows);
 		}
 
 		/**
@@ -87,7 +87,7 @@ namespace Gala
 		 */
 		public void update_allocation ()
 		{
-			var monitor_geometry = screen.get_monitor_geometry (monitor);
+			var monitor_geometry = display.get_monitor_geometry (monitor);
 
 			set_position (monitor_geometry.x, monitor_geometry.y);
 			set_size (monitor_geometry.width, monitor_geometry.height);
diff --git a/src/Widgets/MultitaskingView.vala b/src/Widgets/MultitaskingView.vala
index 5f720ce..b966492 100644
--- a/src/Widgets/MultitaskingView.vala
+++ b/src/Widgets/MultitaskingView.vala
@@ -33,7 +33,7 @@ namespace Gala
 
 		public WindowManager wm { get; construct; }
 
-		Meta.Screen screen;
+		Meta.Display display;
 		ModalProxy modal_proxy;
 		bool opened = false;
 		bool animating = false;
@@ -58,12 +58,12 @@ namespace Gala
 			clip_to_allocation = true;
 
 			opened = false;
-			screen = wm.get_screen ();
+			display = wm.get_display ();
 
 			workspaces = new Actor ();
 			workspaces.set_easing_mode (AnimationMode.EASE_OUT_QUAD);
 
-			icon_groups = new IconGroupContainer (screen);
+			icon_groups = new IconGroupContainer (display);
 			icon_groups.request_reposition.connect (() => reposition_icon_groups (true));
 
 			dock_clones = new Actor ();
@@ -72,18 +72,20 @@ namespace Gala
 			add_child (workspaces);
 			add_child (dock_clones);
 
-			foreach (var workspace in screen.get_workspaces ())
+			var workspace_manager = display.get_workspace_manager();
+
+			foreach (var workspace in workspace_manager.get_workspaces ())
 				add_workspace (workspace.index ());
 
-			screen.workspace_added.connect (add_workspace);
-			screen.workspace_removed.connect (remove_workspace);
-			screen.workspace_switched.connect_after ((from, to, direction) => {
+			workspace_manager.workspace_added.connect (add_workspace);
+			workspace_manager.workspace_removed.connect (remove_workspace);
+			workspace_manager.workspace_switched.connect_after ((from, to, direction) => {
 				update_positions (opened);
 			});
 
 			window_containers_monitors = new List<MonitorClone> ();
 			update_monitors ();
-			screen.monitors_changed.connect (update_monitors);
+			Meta.MonitorManager.get().monitors_changed.connect (update_monitors);
 
 			Prefs.add_listener ((pref) => {
 				if (pref == Preference.WORKSPACES_ONLY_ON_PRIMARY) {
@@ -96,7 +98,7 @@ namespace Gala
 					return;
 
 				Idle.add (() => {
-					unowned List<Workspace> existing_workspaces = screen.get_workspaces ();
+					unowned List<Workspace> existing_workspaces = display.get_workspace_manager().get_workspaces ();
 
 					foreach (var child in workspaces.get_children ()) {
 						unowned WorkspaceClone workspace_clone = (WorkspaceClone) child;
@@ -127,14 +129,14 @@ namespace Gala
 			foreach (var monitor_clone in window_containers_monitors)
 				monitor_clone.destroy ();
 
-			var primary = screen.get_primary_monitor ();
+			var primary = display.get_primary_monitor ();
 
 			if (InternalUtils.workspaces_only_on_primary ()) {
-				for (var monitor = 0; monitor < screen.get_n_monitors (); monitor++) {
+				for (var monitor = 0; monitor < display.get_n_monitors (); monitor++) {
 					if (monitor == primary)
 						continue;
 
-					var monitor_clone = new MonitorClone (screen, monitor);
+					var monitor_clone = new MonitorClone (display, monitor);
 					monitor_clone.window_selected.connect (window_selected);
 					monitor_clone.visible = opened;
 
@@ -143,7 +145,7 @@ namespace Gala
 				}
 			}
 
-			var primary_geometry = screen.get_monitor_geometry (primary);
+			var primary_geometry = display.get_monitor_geometry (primary);
 
 			set_position (primary_geometry.x, primary_geometry.y);
 			set_size (primary_geometry.width, primary_geometry.height);
@@ -205,11 +207,11 @@ namespace Gala
 				// smooth scroll delay still active
 				return false;
 
-			var active_workspace = screen.get_active_workspace ();
+			var active_workspace = display.get_workspace_manager().get_active_workspace ();
 			var new_workspace = active_workspace.get_neighbor (direction);
 
 			if (active_workspace != new_workspace)
-				new_workspace.activate (screen.get_display ().get_current_time ());
+				new_workspace.activate (display.get_current_time ());
 
 			return false;
 		}
@@ -224,7 +226,7 @@ namespace Gala
 		void update_positions (bool animate)
 		{
 			var scale = InternalUtils.get_ui_scaling_factor ();
-			var active_index = screen.get_active_workspace ().index ();
+			var active_index = display.get_workspace_manager().get_active_workspace ().index ();
 			var active_x = 0.0f;
 
 			foreach (var child in workspaces.get_children ()) {
@@ -254,7 +256,7 @@ namespace Gala
 
 		void reposition_icon_groups (bool animate)
 		{
-			var active_index = screen.get_active_workspace ().index ();
+			var active_index = display.get_workspace_manager().get_active_workspace ().index ();
 
 			if (animate) {
 				icon_groups.save_easing_state ();
@@ -277,7 +279,7 @@ namespace Gala
 
 		void add_workspace (int num)
 		{
-			var workspace = new WorkspaceClone (screen.get_workspace_by_index (num));
+			var workspace = new WorkspaceClone (display.get_workspace_manager().get_workspace_by_index (num));
 			workspace.window_selected.connect (window_selected);
 			workspace.selected.connect (activate_workspace);
 
@@ -295,7 +297,7 @@ namespace Gala
 			WorkspaceClone? workspace = null;
 
 			// FIXME is there a better way to get the removed workspace?
-			unowned List<Meta.Workspace> existing_workspaces = screen.get_workspaces ();
+			unowned List<Meta.Workspace> existing_workspaces = display.get_workspace_manager().get_workspaces ();
 
 			foreach (var child in workspaces.get_children ()) {
 				unowned WorkspaceClone clone = (WorkspaceClone) child;
@@ -328,9 +330,9 @@ namespace Gala
 		 */
 		void activate_workspace (WorkspaceClone clone, bool close_view)
 		{
-			close_view = close_view && screen.get_active_workspace () == clone.workspace;
+			close_view = close_view && display.get_workspace_manager().get_active_workspace () == clone.workspace;
 
-			clone.workspace.activate (screen.get_display ().get_current_time ());
+			clone.workspace.activate (display.get_current_time ());
 
 			if (close_view)
 				toggle ();
@@ -390,7 +392,7 @@ namespace Gala
 		{
 			foreach (var child in workspaces.get_children ()) {
 				unowned WorkspaceClone workspace_clone = (WorkspaceClone) child;
-				if (workspace_clone.workspace == screen.get_active_workspace ()) {
+				if (workspace_clone.workspace == display.get_workspace_manager().get_active_workspace ()) {
 					return workspace_clone;
 				}
 			}
@@ -400,10 +402,10 @@ namespace Gala
 
 		void window_selected (Meta.Window window)
 		{
-			var time = screen.get_display ().get_current_time ();
+			var time = display.get_current_time ();
 			var workspace = window.get_workspace ();
 
-			if (workspace != screen.get_active_workspace ())
+			if (workspace != display.get_workspace_manager().get_active_workspace ())
 				workspace.activate (time);
 			else {
 				window.activate (time);
@@ -482,7 +484,7 @@ namespace Gala
 
 			// find active workspace clone and raise it, so there are no overlaps while transitioning
 			WorkspaceClone? active_workspace = null;
-			var active = screen.get_active_workspace ();
+			var active = display.get_workspace_manager().get_active_workspace ();
 			foreach (var child in workspaces.get_children ()) {
 				unowned WorkspaceClone workspace = (WorkspaceClone) child;
 				if (workspace.workspace == active) {
@@ -512,7 +514,7 @@ namespace Gala
 			dock_clones.get_transformed_position (out clone_offset_x, out clone_offset_y);
 
 			if (opening) {
-				foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (screen)) {
+				foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (display)) {
 					const int MAX_OFFSET = 100;
 
 					if (actor.is_destroyed ())
@@ -524,10 +526,10 @@ namespace Gala
 					if (window.window_type != WindowType.DOCK)
 						continue;
 
-					if (screen.get_monitor_in_fullscreen (monitor))
+					if (display.get_monitor_in_fullscreen (monitor))
 						continue;
 
-					var monitor_geom = screen.get_monitor_geometry (monitor);
+					var monitor_geom = display.get_monitor_geometry (monitor);
 
 					var window_geom = window.get_frame_rect ();
 					var top = monitor_geom.y + MAX_OFFSET > window_geom.y;
diff --git a/src/Widgets/SelectionArea.vala b/src/Widgets/SelectionArea.vala
index 30d8616..3785fa1 100644
--- a/src/Widgets/SelectionArea.vala
+++ b/src/Widgets/SelectionArea.vala
@@ -42,7 +42,7 @@ namespace Gala
             reactive = true;
 
             int screen_width, screen_height;
-            wm.get_screen ().get_size (out screen_width, out screen_height);
+            wm.get_display ().get_size (out screen_width, out screen_height);
             width = screen_width;
             height = screen_height;
 
@@ -121,7 +121,7 @@ namespace Gala
 
         public void close ()
         {
-            wm.get_screen ().set_cursor (Meta.Cursor.DEFAULT);
+            wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
 
             if (modal_proxy != null) {
                 wm.pop_modal (modal_proxy);
@@ -130,7 +130,7 @@ namespace Gala
 
         public void start_selection ()
         {
-            wm.get_screen ().set_cursor (Meta.Cursor.CROSSHAIR);
+            wm.get_display ().set_cursor (Meta.Cursor.CROSSHAIR);
             grab_key_focus ();
 
             modal_proxy = wm.push_modal ();
@@ -167,4 +167,4 @@ namespace Gala
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Widgets/WindowClone.vala b/src/Widgets/WindowClone.vala
index 26fd34d..14b2cea 100644
--- a/src/Widgets/WindowClone.vala
+++ b/src/Widgets/WindowClone.vala
@@ -270,7 +270,7 @@ namespace Gala
 		bool should_fade ()
 		{
 			return (overview_mode
-				&& window.get_workspace () != window.get_screen ().get_active_workspace ()) || window.minimized;
+				&& window.get_workspace () != window.get_display ().get_workspace_manager().get_active_workspace ()) || window.minimized;
 		}
 
 		void on_all_workspaces_changed ()
@@ -289,7 +289,7 @@ namespace Gala
 		{
 			var outer_rect = window.get_frame_rect ();
 
-			var monitor_geom = window.get_screen ().get_monitor_geometry (window.get_monitor ());
+			var monitor_geom = window.get_display ().get_monitor_geometry (window.get_monitor ());
 			var offset_x = monitor_geom.x;
 			var offset_y = monitor_geom.y;
 
@@ -458,10 +458,10 @@ namespace Gala
 		 */
 		void close_window ()
 		{
-			var screen = window.get_screen ();
-			check_confirm_dialog_cb = screen.window_entered_monitor.connect (check_confirm_dialog);
+			var display = window.get_display ();
+			check_confirm_dialog_cb = display.window_entered_monitor.connect (check_confirm_dialog);
 
-			window.@delete (screen.get_display ().get_current_time ());
+			window.@delete (display.get_current_time ());
 		}
 
 		void check_confirm_dialog (int monitor, Meta.Window new_window)
@@ -472,7 +472,7 @@ namespace Gala
 					return false;
 				});
 
-				SignalHandler.disconnect (window.get_screen (), check_confirm_dialog_cb);
+				SignalHandler.disconnect (window.get_display (), check_confirm_dialog_cb);
 				check_confirm_dialog_cb = 0;
 			}
 		}
@@ -491,7 +491,7 @@ namespace Gala
 				clone.destroy ();
 
 			if (check_confirm_dialog_cb != 0) {
-				SignalHandler.disconnect (window.get_screen (), check_confirm_dialog_cb);
+				SignalHandler.disconnect (window.get_display (), check_confirm_dialog_cb);
 				check_confirm_dialog_cb = 0;
 			}
 
@@ -583,7 +583,7 @@ namespace Gala
 			// for an icon group, we only do animations if there is an actual movement possible
 			if (icon_group != null
 				&& icon_group.workspace == window.get_workspace ()
-				&& window.get_monitor () == window.get_screen ().get_primary_monitor ())
+				&& window.get_monitor () == window.get_display ().get_primary_monitor ())
 				return;
 
 			var scale = hovered ? 0.4 : 1.0;
@@ -619,7 +619,7 @@ namespace Gala
 		void drag_end (Actor destination)
 		{
 			Meta.Workspace workspace = null;
-			var primary = window.get_screen ().get_primary_monitor ();
+			var primary = window.get_display ().get_primary_monitor ();
 
 			if (destination is IconGroup) {
 				workspace = ((IconGroup) destination).workspace;
diff --git a/src/Widgets/WindowCloneContainer.vala b/src/Widgets/WindowCloneContainer.vala
index bfa32b1..2f1c5af 100644
--- a/src/Widgets/WindowCloneContainer.vala
+++ b/src/Widgets/WindowCloneContainer.vala
@@ -144,9 +144,8 @@ namespace Gala
 		 * Sort the windows z-order by their actual stacking to make intersections
 		 * during animations correct.
 		 */
-		public void restack_windows (Screen screen)
+		public void restack_windows (Display display)
 		{
-			unowned Meta.Display display = screen.get_display ();
 			var children = get_children ();
 
 			GLib.SList<unowned Meta.Window> windows = new GLib.SList<unowned Meta.Window> ();
diff --git a/src/Widgets/WindowOverview.vala b/src/Widgets/WindowOverview.vala
index 9a31aab..55b00d9 100644
--- a/src/Widgets/WindowOverview.vala
+++ b/src/Widgets/WindowOverview.vala
@@ -37,7 +37,7 @@ namespace Gala
 
 		public WindowManager wm { get; construct; }
 
-		Meta.Screen screen;
+		Meta.Display display;
 
 		ModalProxy modal_proxy;
 		bool ready;
@@ -52,10 +52,10 @@ namespace Gala
 
 		construct
 		{
-			screen = wm.get_screen ();
+			display = wm.get_display ();
 
-			screen.workspace_switched.connect (close);
-			screen.restacked.connect (restack_windows);
+			display.get_workspace_manager().workspace_switched.connect (close);
+			display.restacked.connect (restack_windows);
 
 			visible = false;
 			ready = true;
@@ -64,7 +64,7 @@ namespace Gala
 
 		~WindowOverview ()
 		{
-			screen.restacked.disconnect (restack_windows);
+			display.restacked.disconnect (restack_windows);
 		}
 
 		public override bool key_press_event (Clutter.KeyEvent event)
@@ -119,12 +119,12 @@ namespace Gala
 			var used_windows = new SList<Window> ();
 
 			workspaces = new List<Workspace> ();
-
+            var workspace_manager = display.get_workspace_manager();
 			if (all_windows) {
-				foreach (var workspace in screen.get_workspaces ())
+				foreach (var workspace in workspace_manager.get_workspaces ())
 					workspaces.append (workspace);
 			} else {
-				workspaces.append (screen.get_active_workspace ());
+				workspaces.append (workspace_manager.get_active_workspace ());
 			}
 
 			foreach (var workspace in workspaces) {
@@ -161,10 +161,10 @@ namespace Gala
 				workspace.window_removed.connect (remove_window);
 			}
 
-			screen.window_left_monitor.connect (window_left_monitor);
+			display.window_left_monitor.connect (window_left_monitor);
 
 			// sort windows by stacking order
-			var windows = screen.get_display ().sort_windows_by_stacking (used_windows);
+			var windows = display.sort_windows_by_stacking (used_windows);
 
 			grab_key_focus ();
 
@@ -173,8 +173,8 @@ namespace Gala
 
 			visible = true;
 
-			for (var i = 0; i < screen.get_n_monitors (); i++) {
-				var geometry = screen.get_monitor_geometry (i);
+			for (var i = 0; i < display.get_n_monitors (); i++) {
+				var geometry = display.get_monitor_geometry (i);
 
 				var container = new WindowCloneContainer (true);
 				container.padding_top = TOP_GAP;
@@ -211,10 +211,10 @@ namespace Gala
 			return (name != "expose-windows" && name != "expose-all-windows");
 		}
 
-		void restack_windows (Screen screen)
+		void restack_windows (Display display)
 		{
 			foreach (var child in get_children ())
-				((WindowCloneContainer) child).restack_windows (screen);
+				((WindowCloneContainer) child).restack_windows (display);
 		}
 
 		void window_left_monitor (int num, Window window)
@@ -260,14 +260,14 @@ namespace Gala
 
 		void thumb_selected (Window window)
 		{
-			if (window.get_workspace () == screen.get_active_workspace ()) {
-				window.activate (screen.get_display ().get_current_time ());
+			if (window.get_workspace () == display.get_workspace_manager().get_active_workspace ()) {
+				window.activate (display.get_current_time ());
 				close ();
 			} else {
 				close ();
 				//wait for the animation to finish before switching
 				Timeout.add (400, () => {
-					window.get_workspace ().activate_with_focus (window, screen.get_display ().get_current_time ());
+					window.get_workspace ().activate_with_focus (window, display.get_current_time ());
 					return false;
 				});
 			}
@@ -285,7 +285,7 @@ namespace Gala
 				workspace.window_added.disconnect (add_window);
 				workspace.window_removed.disconnect (remove_window);
 			}
-			screen.window_left_monitor.disconnect (window_left_monitor);
+			display.window_left_monitor.disconnect (window_left_monitor);
 
 			ready = false;
 
@@ -307,7 +307,7 @@ namespace Gala
 			ready = true;
 			visible = false;
 
-			foreach (var window in screen.get_active_workspace ().list_windows ())
+			foreach (var window in display.get_workspace_manager().get_active_workspace ().list_windows ())
 				if (window.showing_on_its_workspace ())
 					((Actor) window.get_compositor_private ()).show ();
 
diff --git a/src/Widgets/WindowSwitcher.vala b/src/Widgets/WindowSwitcher.vala
index f97ae56..647120b 100644
--- a/src/Widgets/WindowSwitcher.vala
+++ b/src/Widgets/WindowSwitcher.vala
@@ -104,7 +104,7 @@ namespace Gala
 			add_child (window_clones);
 			add_child (dock);
 
-			wm.get_screen ().monitors_changed.connect (update_actors);
+			Meta.MonitorManager.get().monitors_changed.connect (update_actors);
 
 			visible = false;
 		}
@@ -114,7 +114,7 @@ namespace Gala
 			if (monitor != null)
 				monitor.cancel ();
 
-			wm.get_screen ().monitors_changed.disconnect (update_actors);
+			Meta.MonitorManager.get().monitors_changed.disconnect (update_actors);
 		}
 
 		void load_dock_theme ()
@@ -134,8 +134,8 @@ namespace Gala
 		 */
 		void update_dock ()
 		{
-			var screen = wm.get_screen ();
-			var geometry = screen.get_monitor_geometry (screen.get_primary_monitor ());
+			var display = wm.get_display ();
+			var geometry = display.get_monitor_geometry (display.get_primary_monitor ());
 			var layout = (BoxLayout) dock.layout_manager;
 
 			var position = dock_settings.Position;
@@ -188,7 +188,7 @@ namespace Gala
 		void update_background ()
 		{
 			int width = 0, height = 0;
-			wm.get_screen ().get_size (out width, out height);
+			wm.get_display ().get_size (out width, out height);
 
 			background.set_size (width, height);
 		}
@@ -334,7 +334,7 @@ namespace Gala
 
 				// wait for the dimming to finish
 				Timeout.add (250, () => {
-					close (wm.get_screen ().get_display ().get_current_time ());
+					close (wm.get_display().get_current_time ());
 					return false;
 				});
 			} else
@@ -351,7 +351,7 @@ namespace Gala
 		void icon_removed (Actor actor)
 		{
 			if (dock.get_n_children () == 1) {
-				close (wm.get_screen ().get_display ().get_current_time ());
+				close (wm.get_display ().get_current_time ());
 				return;
 			}
 
@@ -376,11 +376,11 @@ namespace Gala
 
 		public override void key_focus_out ()
 		{
-			close (wm.get_screen ().get_display ().get_current_time ());
+			close (wm.get_display ().get_current_time ());
 		}
 
 		[CCode (instance_pos = -1)]
-		public void handle_switch_windows (Display display, Screen screen, Window? window,
+		public void handle_switch_windows (Display display, Window? window,
 			Clutter.KeyEvent event, KeyBinding binding)
 		{
 			var now = get_monotonic_time () / 1000;
@@ -395,7 +395,7 @@ namespace Gala
 
 			last_switch = now;
 
-			var workspace = screen.get_active_workspace ();
+			var workspace = display.get_workspace_manager().get_active_workspace ();
 			var binding_name = binding.get_name ();
 			var backward = binding_name.has_suffix ("-backward");
 
@@ -441,13 +441,13 @@ namespace Gala
 			grab_key_focus ();
 
 			if ((get_current_modifiers () & modifier_mask) == 0)
-				close (wm.get_screen ().get_display ().get_current_time ());
+				close (wm.get_display ().get_current_time ());
 		}
 
 		void close_cleanup ()
 		{
-			var screen = wm.get_screen ();
-			var workspace = screen.get_active_workspace ();
+			var display = wm.get_display ();
+			var workspace = display.get_workspace_manager().get_active_workspace ();
 
 			dock.destroy_all_children ();
 
@@ -458,7 +458,7 @@ namespace Gala
 			window_clones.destroy_all_children ();
 
 			// need to go through all the windows because of hidden dialogs
-			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (screen)) {
+			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (display)) {
 				if (actor.is_destroyed ())
 					continue;
 
@@ -623,8 +623,7 @@ namespace Gala
 		 */
 		bool collect_windows (Workspace workspace)
 		{
-			var screen = workspace.get_screen ();
-			var display = screen.get_display ();
+			var display = workspace.get_display ();
 
 			var windows = display.get_tab_list (TabList.NORMAL, workspace);
 			var current = display.get_tab_current (TabList.NORMAL, workspace);
@@ -637,7 +636,7 @@ namespace Gala
 				if (window.minimized)
 					window.unminimize ();
 				else
-					Utils.bell (screen);
+					Utils.bell (display);
 
 				window.activate (display.get_current_time ());
 
@@ -656,7 +655,7 @@ namespace Gala
 				current_window = (WindowIcon) dock.get_child_at_index (0);
 
 			// hide the others
-			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (screen)) {
+			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (display)) {
 				if (actor.is_destroyed ())
 					continue;
 
diff --git a/src/Widgets/WorkspaceClone.vala b/src/Widgets/WorkspaceClone.vala
index 4a53e87..f162c78 100644
--- a/src/Widgets/WorkspaceClone.vala
+++ b/src/Widgets/WorkspaceClone.vala
@@ -25,15 +25,15 @@ namespace Gala
 	 */
 	class FramedBackground : BackgroundManager
 	{
-		public FramedBackground (Screen screen)
+		public FramedBackground (Display display)
 		{
-			Object (screen: screen, monitor_index: screen.get_primary_monitor (), control_position: false);
+			Object (display: display, monitor_index: display.get_primary_monitor (), control_position: false);
 		}
 
 		construct
 		{
-			var primary = screen.get_primary_monitor ();
-			var monitor_geom = screen.get_monitor_geometry (primary);
+			var primary = display.get_primary_monitor ();
+			var monitor_geom = display.get_monitor_geometry (primary);
 
 			var effect = new ShadowEffect (40, 5);
 			effect.css_class = "workspace";
@@ -137,10 +137,10 @@ namespace Gala
 		{
 			opened = false;
 
-			unowned Screen screen = workspace.get_screen ();
-			var monitor_geometry = screen.get_monitor_geometry (screen.get_primary_monitor ());
+			unowned Display display = workspace.get_display ();
+			var monitor_geometry = display.get_monitor_geometry (display.get_primary_monitor ());
 
-			background = new FramedBackground (workspace.get_screen ());
+			background = new FramedBackground (workspace.get_display ());
 			background.reactive = true;
 			background.button_press_event.connect (() => {
 				selected (true);
@@ -150,12 +150,12 @@ namespace Gala
 			window_container = new WindowCloneContainer ();
 			window_container.window_selected.connect ((w) => { window_selected (w); });
 			window_container.set_size (monitor_geometry.width, monitor_geometry.height);
-			screen.restacked.connect (window_container.restack_windows);
+			display.restacked.connect (window_container.restack_windows);
 
 			icon_group = new IconGroup (workspace);
 			icon_group.selected.connect (() => {
-				if (workspace == screen.get_active_workspace ())
-					Utils.bell (screen);
+				if (workspace == display.get_workspace_manager().get_active_workspace ())
+					Utils.bell (display);
 				else
 					selected (false);
 			});
@@ -181,8 +181,8 @@ namespace Gala
 				}
 			});
 
-			screen.window_entered_monitor.connect (window_entered_monitor);
-			screen.window_left_monitor.connect (window_left_monitor);
+			display.window_entered_monitor.connect (window_entered_monitor);
+			display.window_left_monitor.connect (window_left_monitor);
 			workspace.window_added.connect (add_window);
 			workspace.window_removed.connect (remove_window);
 
@@ -194,7 +194,7 @@ namespace Gala
 			foreach (var window in windows) {
 				if (window.window_type == WindowType.NORMAL
 					&& !window.on_all_workspaces
-					&& window.get_monitor () == screen.get_primary_monitor ()) {
+					&& window.get_monitor () == display.get_primary_monitor ()) {
 					window_container.add_window (window);
 					icon_group.add_window (window, true);
 				}
@@ -206,12 +206,12 @@ namespace Gala
 
 		~WorkspaceClone ()
 		{
-			unowned Screen screen = workspace.get_screen ();
+			unowned Display display = workspace.get_display ();
 
-			screen.restacked.disconnect (window_container.restack_windows);
+			display.restacked.disconnect (window_container.restack_windows);
 
-			screen.window_entered_monitor.disconnect (window_entered_monitor);
-			screen.window_left_monitor.disconnect (window_left_monitor);
+			display.window_entered_monitor.disconnect (window_entered_monitor);
+			display.window_left_monitor.disconnect (window_left_monitor);
 			workspace.window_added.disconnect (add_window);
 			workspace.window_removed.disconnect (remove_window);
 
@@ -230,7 +230,7 @@ namespace Gala
 			if (window.window_type != WindowType.NORMAL
 				|| window.get_workspace () != workspace
 				|| window.on_all_workspaces
-				|| window.get_monitor () != window.get_screen ().get_primary_monitor ())
+				|| window.get_monitor () != window.get_display ().get_primary_monitor ())
 				return;
 
 			foreach (var child in window_container.get_children ())
@@ -250,14 +250,14 @@ namespace Gala
 			icon_group.remove_window (window, opened);
 		}
 
-		void window_entered_monitor (Screen screen, int monitor, Window window)
+		void window_entered_monitor (Display display, int monitor, Window window)
 		{
 			add_window (window);
 		}
 
-		void window_left_monitor (Screen screen, int monitor, Window window)
+		void window_left_monitor (Display display, int monitor, Window window)
 		{
-			if (monitor == screen.get_primary_monitor ())
+			if (monitor == display.get_primary_monitor ())
 				remove_window (window);
 		}
 
@@ -295,13 +295,12 @@ namespace Gala
 				return;
 
 			opened = true;
-
-			var screen = workspace.get_screen ();
-			var display = screen.get_display ();
+;
+			var display = workspace.get_display ();
 
 			var scale_factor = InternalUtils.get_ui_scaling_factor ();
 
-			var monitor = screen.get_monitor_geometry (screen.get_primary_monitor ());
+			var monitor = display.get_monitor_geometry (display.get_primary_monitor ());
 			var scale = (float)(monitor.height - TOP_OFFSET * scale_factor - BOTTOM_OFFSET * scale_factor) / monitor.height;
 			var pivotY = TOP_OFFSET * scale_factor / (monitor.height - monitor.height * scale);
 
@@ -330,7 +329,7 @@ namespace Gala
 
 			icon_group.redraw ();
 
-			window_container.open (screen.get_active_workspace () == workspace ? display.get_focus_window () : null);
+			window_container.open (display.get_workspace_manager().get_active_workspace () == workspace ? display.get_focus_window () : null);
 		}
 
 		/**
diff --git a/src/WindowListener.vala b/src/WindowListener.vala
index 13e2d94..af85d47 100644
--- a/src/WindowListener.vala
+++ b/src/WindowListener.vala
@@ -29,14 +29,14 @@ namespace Gala
 	{
 		static WindowListener? instance = null;
 
-		public static void init (Screen screen)
+		public static void init (Display display)
 		{
 			if (instance != null)
 				return;
 
 			instance = new WindowListener ();
 
-			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (screen)) {
+			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (display)) {
 				if (actor.is_destroyed ())
 					continue;
 
@@ -45,7 +45,7 @@ namespace Gala
 					instance.monitor_window (window);
 			}
 
-			screen.get_display ().window_created.connect ((window) => {
+			display.window_created.connect ((window) => {
 				if (window.window_type == WindowType.NORMAL)
 					instance.monitor_window (window);
 			});
diff --git a/src/WindowManager.vala b/src/WindowManager.vala
index a8900c5..40d4079 100644
--- a/src/WindowManager.vala
+++ b/src/WindowManager.vala
@@ -87,11 +87,6 @@ namespace Gala
 				license = "GPLv3", description = "A nice elementary window manager"};
 
 			Prefs.set_ignore_request_hide_titlebar (true);
-			Prefs.override_preference_schema ("dynamic-workspaces", Config.SCHEMA + ".behavior");
-			Prefs.override_preference_schema ("attach-modal-dialogs", Config.SCHEMA + ".appearance");
-			Prefs.override_preference_schema ("button-layout", Config.SCHEMA + ".appearance");
-			Prefs.override_preference_schema ("edge-tiling", Config.SCHEMA + ".behavior");
-			Prefs.override_preference_schema ("enable-animations", Config.SCHEMA + ".animations");
 		}
 
 		public override void start ()
@@ -99,7 +94,7 @@ namespace Gala
 			Util.later_add (LaterType.BEFORE_REDRAW, show_stage);
 
 #if HAS_MUTTER322
-			get_screen ().get_display ().gl_video_memory_purged.connect (() => {
+			get_display ().gl_video_memory_purged.connect (() => {
 				Meta.Background.refresh_all ();
 				SystemBackground.refresh ();
 			});
@@ -129,13 +124,12 @@ namespace Gala
 
 		bool show_stage ()
 		{
-			var screen = get_screen ();
-			var display = screen.get_display ();
+			var display = get_display ();
 
 			DBus.init (this);
 			DBusAccelerator.init (this);
 			MediaFeedback.init ();
-			WindowListener.init (screen);
+			WindowListener.init (display);
 			KeyboardManager.init (display);
 
 			// Due to a bug which enables access to the stage when using multiple monitors
@@ -150,7 +144,7 @@ namespace Gala
 				warning (e.message);
 			}
 
-			stage = Compositor.get_stage_for_screen (screen) as Clutter.Stage;
+			stage = Compositor.get_stage_for_display (display) as Clutter.Stage;
 
 			var color = BackgroundSettings.get_default ().primary_color;
 			stage.background_color = Clutter.Color.from_string (color);
@@ -167,7 +161,7 @@ namespace Gala
 			 * +-- top window group
 			 */
 
-			var system_background = new SystemBackground (screen);
+			var system_background = new SystemBackground (display);
 			system_background.add_constraint (new Clutter.BindConstraint (stage,
 				Clutter.BindCoordinate.ALL, 0));
 			stage.insert_child_below (system_background, null);
@@ -176,15 +170,15 @@ namespace Gala
 			ui_group.reactive = true;
 			stage.add_child (ui_group);
 
-			window_group = Compositor.get_window_group_for_screen (screen);
+			window_group = Compositor.get_window_group_for_display (display);
 			stage.remove_child (window_group);
 			ui_group.add_child (window_group);
 
-			background_group = new BackgroundContainer (screen);
+			background_group = new BackgroundContainer (display);
 			window_group.add_child (background_group);
 			window_group.set_child_below_sibling (background_group, null);
 
-			top_window_group = Compositor.get_top_window_group_for_screen (screen);
+			top_window_group = Compositor.get_top_window_group_for_display (display);
 			stage.remove_child (top_window_group);
 			ui_group.add_child (top_window_group);
 
@@ -239,7 +233,8 @@ namespace Gala
 
 			/*hot corner, getting enum values from GraniteServicesSettings did not work, so we use GSettings directly*/
 			configure_hotcorners ();
-			screen.monitors_changed.connect (configure_hotcorners);
+			var monitor_manager = Meta.MonitorManager.get();
+			monitor_manager.monitors_changed.connect (configure_hotcorners);
 
 			BehaviorSettings.get_default ().schema.changed.connect (configure_hotcorners);
 
@@ -310,7 +305,7 @@ namespace Gala
 
 		void configure_hotcorners ()
 		{
-			var geometry = get_screen ().get_monitor_geometry (get_screen ().get_primary_monitor ());
+			var geometry = get_display ().get_monitor_geometry (get_display ().get_primary_monitor ());
 
 			add_hotcorner (geometry.x, geometry.y, "hotcorner-topleft");
 			add_hotcorner (geometry.x + geometry.width - 1, geometry.y, "hotcorner-topright");
@@ -322,7 +317,7 @@ namespace Gala
 
 		void add_hotcorner (float x, float y, string key)
 		{
-			unowned Clutter.Actor? stage = Compositor.get_stage_for_screen (get_screen ());
+			unowned Clutter.Actor? stage = Compositor.get_stage_for_display (get_display ());
 			return_if_fail (stage != null);
 
 			var action = (ActionType) BehaviorSettings.get_default ().schema.get_enum (key);
@@ -357,24 +352,25 @@ namespace Gala
 		}
 
 		[CCode (instance_pos = -1)]
-		void handle_cycle_workspaces (Meta.Display display, Meta.Screen screen, Meta.Window? window,
+		void handle_cycle_workspaces (Meta.Display display, Meta.Window? window,
 			Clutter.KeyEvent event, Meta.KeyBinding binding)
 		{
+		    var workspace_manager = display.get_workspace_manager();
 			var direction = (binding.get_name () == "cycle-workspaces-next" ? 1 : -1);
-			var index = screen.get_active_workspace_index () + direction;
+			var index = workspace_manager.get_active_workspace_index () + direction;
 
 			int dynamic_offset = Prefs.get_dynamic_workspaces () ? 1 : 0;
 
 			if (index < 0)
-				index = screen.get_n_workspaces () - 1 - dynamic_offset;
-			else if (index > screen.get_n_workspaces () - 1 - dynamic_offset)
+				index = workspace_manager.get_n_workspaces () - 1 - dynamic_offset;
+			else if (index > workspace_manager.get_n_workspaces () - 1 - dynamic_offset)
 				index = 0;
 
-			screen.get_workspace_by_index (index).activate (display.get_current_time ());
+			workspace_manager.get_workspace_by_index (index).activate (display.get_current_time ());
 		}
 
 		[CCode (instance_pos = -1)]
-		void handle_move_to_workspace (Meta.Display display, Meta.Screen screen, Meta.Window? window,
+		void handle_move_to_workspace (Meta.Display display, Meta.Window? window,
 			Clutter.KeyEvent event, Meta.KeyBinding binding)
 		{
 			if (window == null)
@@ -385,20 +381,21 @@ namespace Gala
 		}
 
 		[CCode (instance_pos = -1)]
-		void handle_move_to_workspace_end (Meta.Display display, Meta.Screen screen, Meta.Window? window,
+		void handle_move_to_workspace_end (Meta.Display display, Meta.Window? window,
 			Clutter.KeyEvent event, Meta.KeyBinding binding)
 		{
 			if (window == null)
 				return;
 
-			var index = (binding.get_name () == "move-to-workspace-first" ? 0 : screen.get_n_workspaces () - 1);
-			var workspace = screen.get_workspace_by_index (index);
+            var workspace_manager = display.get_workspace_manager();
+			var index = (binding.get_name () == "move-to-workspace-first" ? 0 : workspace_manager.get_n_workspaces () - 1);
+			var workspace = workspace_manager.get_workspace_by_index (index);
 			window.change_workspace (workspace);
 			workspace.activate_with_focus (window, display.get_current_time ());
 		}
 
 		[CCode (instance_pos = -1)]
-		void handle_switch_to_workspace (Meta.Display display, Meta.Screen screen, Meta.Window? window,
+		void handle_switch_to_workspace (Meta.Display display, Meta.Window? window,
 			Clutter.KeyEvent event, Meta.KeyBinding binding)
 		{
 			var direction = (binding.get_name () == "switch-to-workspace-left" ? MotionDirection.LEFT : MotionDirection.RIGHT);
@@ -406,11 +403,12 @@ namespace Gala
 		}
 
 		[CCode (instance_pos = -1)]
-		void handle_switch_to_workspace_end (Meta.Display display, Meta.Screen screen, Meta.Window? window,
+		void handle_switch_to_workspace_end (Meta.Display display, Meta.Window? window,
 			Clutter.KeyEvent event, Meta.KeyBinding binding)
 		{
-			var index = (binding.get_name () == "switch-to-workspace-first" ? 0 : screen.n_workspaces - 1);
-			screen.get_workspace_by_index (index).activate (display.get_current_time ());
+		    var workspace_manager = display.get_workspace_manager();
+			var index = (binding.get_name () == "switch-to-workspace-first" ? 0 : workspace_manager.n_workspaces - 1);
+			workspace_manager.get_workspace_by_index (index).activate (display.get_current_time ());
 		}
 
 		/**
@@ -418,9 +416,9 @@ namespace Gala
 		 */
 		public void switch_to_next_workspace (MotionDirection direction)
 		{
-			var screen = get_screen ();
-			var display = screen.get_display ();
-			var active_workspace = screen.get_active_workspace ();
+			var display = get_display ();
+			var workspace_manager = display.get_workspace_manager();
+			var active_workspace = workspace_manager.get_active_workspace ();
 			var neighbor = active_workspace.get_neighbor (direction);
 
 			if (neighbor != active_workspace) {
@@ -451,12 +449,12 @@ namespace Gala
 
 		void update_input_area ()
 		{
-			var screen = get_screen ();
+			var display = get_display ();
 
 			if (screensaver != null) {
 				try {
 					if (screensaver.get_active ()) {
-						InternalUtils.set_input_area (screen, InputArea.NONE);
+						InternalUtils.set_input_area (display, InputArea.NONE);
 						return;
 					}
 				} catch (Error e) {
@@ -468,9 +466,9 @@ namespace Gala
 			}
 
 			if (is_modal ())
-				InternalUtils.set_input_area (screen, InputArea.FULLSCREEN);
+				InternalUtils.set_input_area (display, InputArea.FULLSCREEN);
 			else
-				InternalUtils.set_input_area (screen, InputArea.DEFAULT);
+				InternalUtils.set_input_area (display, InputArea.DEFAULT);
 		}
 
 		void show_bottom_stack_window (Meta.Window bottom_window)
@@ -550,7 +548,7 @@ namespace Gala
 		{
 			var list = new Gee.ArrayList<uint32> ();
 
-			foreach (var workspace in get_screen ().get_workspaces ()) {
+			foreach (var workspace in get_display().get_workspace_manager().get_workspaces ()) {
 				foreach (var window in workspace.list_windows ())
 					list.add ((uint32)window.get_xwindow ());
 			}
@@ -566,15 +564,14 @@ namespace Gala
 			if (window == null)
 				return;
 
-			var screen = get_screen ();
-			var display = screen.get_display ();
-
-			var active = screen.get_active_workspace ();
+			var display = get_display ();
+            var workspace_manager = display.get_workspace_manager();
+			var active = workspace_manager.get_active_workspace ();
 			var next = active.get_neighbor (direction);
 
 			//dont allow empty workspaces to be created by moving, if we have dynamic workspaces
-			if (Prefs.get_dynamic_workspaces () && Utils.get_n_windows (active) == 1 && next.index () ==  screen.n_workspaces - 1) {
-				Utils.bell (screen);
+			if (Prefs.get_dynamic_workspaces () && Utils.get_n_windows (active) == 1 && next.index () ==  workspace_manager.get_n_workspaces() - 1) {
+				Utils.bell (display);
 				return;
 			}
 
@@ -599,13 +596,13 @@ namespace Gala
 			if (modal_stack.size >= 2)
 				return proxy;
 
-			var screen = get_screen ();
-			var time = screen.get_display ().get_current_time ();
+			var display = get_display ();
+			var time = display.get_current_time ();
 
 			update_input_area ();
 			begin_modal (0, time);
 
-			Meta.Util.disable_unredirect_for_screen (screen);
+			Meta.disable_unredirect_for_display (display);
 
 			return proxy;
 		}
@@ -625,10 +622,10 @@ namespace Gala
 
 			update_input_area ();
 
-			var screen = get_screen ();
-			end_modal (screen.get_display ().get_current_time ());
+			var display = get_display ();
+			end_modal (display.get_current_time ());
 
-			Meta.Util.enable_unredirect_for_screen (screen);
+			Meta.enable_unredirect_for_display (display);
 		}
 
 		/**
@@ -670,8 +667,7 @@ namespace Gala
 		 */
 		public void perform_action (ActionType type)
 		{
-			var screen = get_screen ();
-			var display = screen.get_display ();
+			var display = get_display ();
 			var current = display.get_focus_window ();
 
 			switch (type) {
@@ -798,7 +794,8 @@ namespace Gala
 					}
 					break;
 				case ActionType.SWITCH_TO_WORKSPACE_LAST:
-					var workspace = screen.get_workspace_by_index (screen.get_n_workspaces () - 1);
+				    var workspace_manager = display.get_workspace_manager ();
+					var workspace = workspace_manager.get_workspace_by_index (workspace_manager.get_n_workspaces () - 1);
 					workspace.activate (display.get_current_time ());
 					break;
 				default:
@@ -924,9 +921,9 @@ namespace Gala
 			// if that's not available.
 			if (!Prefs.get_dynamic_workspaces ())
 				return;
-
-			unowned Meta.Screen screen = get_screen ();
-			var time = screen.get_display ().get_current_time ();
+            var display = get_display ();
+            var workspace_manager = display.get_workspace_manager ();
+			var time = display.get_current_time ();
 			unowned Meta.Workspace win_ws = window.get_workspace ();
 
 			if (which_change == Meta.SizeChange.FULLSCREEN) {
@@ -938,7 +935,7 @@ namespace Gala
 				var new_ws_index = old_ws_index + 1;
 				InternalUtils.insert_workspace_with_window (new_ws_index, window);
 
-				var new_ws_obj = screen.get_workspace_by_index (new_ws_index);
+				var new_ws_obj = workspace_manager.get_workspace_by_index (new_ws_index);
 				window.change_workspace (new_ws_obj);
 				new_ws_obj.activate_with_focus (window, time);
 
@@ -947,8 +944,8 @@ namespace Gala
 				var old_ws_index = ws_assoc.get (window);
 				var new_ws_index = win_ws.index ();
 
-				if (new_ws_index != old_ws_index && old_ws_index < screen.get_n_workspaces ()) {
-					var old_ws_obj = screen.get_workspace_by_index (old_ws_index);
+				if (new_ws_index != old_ws_index && old_ws_index < workspace_manager.get_n_workspaces ()) {
+					var old_ws_obj = workspace_manager.get_workspace_by_index (old_ws_index);
 					window.change_workspace (old_ws_obj);
 					old_ws_obj.activate_with_focus (window, time);
 				}
@@ -1003,7 +1000,7 @@ namespace Gala
 			minimizing.add (actor);
 
 			int width, height;
-			get_screen ().get_size (out width, out height);
+			get_display ().get_size (out width, out height);
 
 			Rectangle icon = {};
 			if (actor.get_meta_window ().get_icon_geometry (out icon)) {
@@ -1555,17 +1552,18 @@ namespace Gala
 			}
 
 			float screen_width, screen_height;
-			var screen = get_screen ();
-			var primary = screen.get_primary_monitor ();
+			var display = get_display ();
+		    var workspace_manager = display.get_workspace_manager();
+			var primary = display.get_primary_monitor ();
 			var move_primary_only = InternalUtils.workspaces_only_on_primary ();
-			var monitor_geom = screen.get_monitor_geometry (primary);
+			var monitor_geom = display.get_monitor_geometry (primary);
 			var clone_offset_x = move_primary_only ? monitor_geom.x : 0.0f;
 			var clone_offset_y = move_primary_only ? monitor_geom.y : 0.0f;
 
-			screen.get_size (out screen_width, out screen_height);
+			display.get_size (out screen_width, out screen_height);
 
-			unowned Meta.Workspace workspace_from = screen.get_workspace_by_index (from);
-			unowned Meta.Workspace workspace_to = screen.get_workspace_by_index (to);
+			unowned Meta.Workspace workspace_from = workspace_manager.get_workspace_by_index (from);
+			unowned Meta.Workspace workspace_to = workspace_manager.get_workspace_by_index (to);
 
 			var main_container = new Clutter.Actor ();
 			var static_windows = new Clutter.Actor ();
@@ -1620,7 +1618,7 @@ namespace Gala
 			var docks = new List<WindowActor> ();
 
 			// collect all windows and put them in the appropriate containers
-			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (screen)) {
+			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (display)) {
 				if (actor.is_destroyed ())
 					continue;
 
@@ -1754,8 +1752,9 @@ namespace Gala
 			if (windows == null || parents == null)
 				return;
 
-			var screen = get_screen ();
-			var active_workspace = screen.get_active_workspace ();
+			var display = get_display ();
+			var workspace_manager = display.get_workspace_manager ();
+			var active_workspace = workspace_manager.get_active_workspace ();
 
 			for (var i = 0; i < windows.length (); i++) {
 				var actor = windows.nth_data (i);
diff --git a/src/WorkspaceManager.vala b/src/WorkspaceManager.vala
index 08e0769..0b77a1d 100644
--- a/src/WorkspaceManager.vala
+++ b/src/WorkspaceManager.vala
@@ -47,27 +47,27 @@ namespace Gala
 
 		construct
 		{
-			unowned Screen screen = wm.get_screen ();
-
+			unowned Display display = wm.get_display ();
+			var workspace_manager = display.get_workspace_manager ();
 			workspaces_marked_removed = new Gee.LinkedList<Workspace> ();
 
 			if (Prefs.get_dynamic_workspaces ())
-				screen.override_workspace_layout (ScreenCorner.TOPLEFT, false, 1, -1);
+				workspace_manager.override_workspace_layout (DisplayCorner.TOPLEFT, false, 1, -1);
 
-			for (var i = 0; i < screen.get_n_workspaces (); i++)
-				workspace_added (screen, i);
+			for (var i = 0; i < workspace_manager.get_n_workspaces (); i++)
+				workspace_added (workspace_manager, i);
 
 			Prefs.add_listener (prefs_listener);
 
-			screen.workspace_switched.connect_after (workspace_switched);
-			screen.workspace_added.connect (workspace_added);
-			screen.workspace_removed.connect_after (workspace_removed);
-			screen.window_entered_monitor.connect (window_entered_monitor);
-			screen.window_left_monitor.connect (window_left_monitor);
+			workspace_manager.workspace_switched.connect_after (workspace_switched);
+			workspace_manager.workspace_added.connect (workspace_added);
+			workspace_manager.workspace_removed.connect_after (workspace_removed);
+			display.window_entered_monitor.connect (window_entered_monitor);
+			display.window_left_monitor.connect (window_left_monitor);
 
 			// make sure the last workspace has no windows on it
 			if (Prefs.get_dynamic_workspaces ()
-				&& Utils.get_n_windows (screen.get_workspace_by_index (screen.get_n_workspaces () - 1)) > 0)
+				&& Utils.get_n_windows (workspace_manager.get_workspace_by_index (workspace_manager.get_n_workspaces () - 1)) > 0)
 				append_workspace ();
 
 			// There are some empty workspace at startup
@@ -76,20 +76,20 @@ namespace Gala
 
 		~WorkspaceManager ()
 		{
-			unowned Screen screen = wm.get_screen ();
-
+			unowned Display display = wm.get_display ();
+			var workspace_manager = display.get_workspace_manager ();
 			Prefs.remove_listener (prefs_listener);
 
-			screen.workspace_added.disconnect (workspace_added);
-			screen.workspace_switched.disconnect (workspace_switched);
-			screen.workspace_removed.disconnect (workspace_removed);
-			screen.window_entered_monitor.disconnect (window_entered_monitor);
-			screen.window_left_monitor.disconnect (window_left_monitor);
+			workspace_manager.workspace_added.disconnect (workspace_added);
+			workspace_manager.workspace_switched.disconnect (workspace_switched);
+			workspace_manager.workspace_removed.disconnect (workspace_removed);
+			display.window_entered_monitor.disconnect (window_entered_monitor);
+			display.window_left_monitor.disconnect (window_left_monitor);
 		}
 
-		void workspace_added (Screen screen, int index)
+		void workspace_added (Meta.WorkspaceManager workspaceManager, int index)
 		{
-			var workspace = screen.get_workspace_by_index (index);
+			var workspace = workspaceManager.get_workspace_by_index (index);
 			if (workspace == null)
 				return;
 
@@ -97,9 +97,9 @@ namespace Gala
 			workspace.window_removed.connect (window_removed);
 		}
 
-		void workspace_removed (Screen screen, int index)
+		void workspace_removed (Meta.WorkspaceManager workspaceManager, int index)
 		{
-			unowned List<Workspace> existing_workspaces = screen.get_workspaces ();
+			unowned List<Workspace> existing_workspaces = workspaceManager.get_workspaces ();
 
 			var it = workspaces_marked_removed.iterator ();
 			while (it.next ()) {
@@ -108,15 +108,15 @@ namespace Gala
 			}
 		}
 
-		void workspace_switched (Screen screen, int from, int to, MotionDirection direction)
+		void workspace_switched (Meta.WorkspaceManager workspaceManager, int from, int to, MotionDirection direction)
 		{
 			if (!Prefs.get_dynamic_workspaces ())
 				return;
 
 			// remove empty workspaces after we switched away from them unless it's the last one
-			var prev_workspace = screen.get_workspace_by_index (from);
+			var prev_workspace = workspaceManager.get_workspace_by_index (from);
 			if (Utils.get_n_windows (prev_workspace) < 1
-				&& from != screen.get_n_workspaces () - 1) {
+				&& from !=  workspaceManager.get_n_workspaces () - 1) {
 				remove_workspace (prev_workspace);
 			}
 		}
@@ -127,12 +127,12 @@ namespace Gala
 				|| window.on_all_workspaces)
 				return;
 
-			unowned Screen screen = workspace.get_screen ();
+			unowned Display display = workspace.get_display ();
 
 			if ((window.window_type == WindowType.NORMAL
 				|| window.window_type == WindowType.DIALOG
 				|| window.window_type == WindowType.MODAL_DIALOG)
-				&& workspace.index () == screen.get_n_workspaces () - 1)
+				&& workspace.index () == display.get_workspace_manager().get_n_workspaces () - 1)
 				append_workspace ();
 		}
 
@@ -141,60 +141,62 @@ namespace Gala
 			if (workspace == null || !Prefs.get_dynamic_workspaces () || window.on_all_workspaces)
 				return;
 
-			unowned Screen screen = workspace.get_screen ();
+			unowned Display display = workspace.get_display ();
 
 			if (window.window_type != WindowType.NORMAL
 				&& window.window_type != WindowType.DIALOG
 				&& window.window_type != WindowType.MODAL_DIALOG)
 				return;
 
-			var index = screen.get_workspaces ().index (workspace);
+            var workspace_manager = display.get_workspace_manager();
+			var index = workspace_manager.get_workspaces ().index (workspace);
 			// has already been removed
 			if (index < 0)
 				return;
 
-			var is_active_workspace = workspace == screen.get_active_workspace ();
+			var is_active_workspace = workspace == workspace_manager.get_active_workspace ();
 
 			// remove it right away if it was the active workspace and it's not the very last
 			// or we are in modal-mode
 			if ((!is_active_workspace || wm.is_modal ())
 				&& remove_freeze_count < 1
 				&& Utils.get_n_windows (workspace) < 1
-				&& index != screen.get_n_workspaces () - 1) {
+				&& index != workspace_manager.get_n_workspaces () - 1) {
 				remove_workspace (workspace);
 			}
 		}
 
-		void window_entered_monitor (Screen screen, int monitor, Window window)
+		void window_entered_monitor (Display display, int monitor, Window window)
 		{
 			if (InternalUtils.workspaces_only_on_primary ()
-				&& monitor == screen.get_primary_monitor ())
+				&& monitor == display.get_primary_monitor ())
 				window_added (window.get_workspace (), window);
 		}
 
-		void window_left_monitor (Screen screen, int monitor, Window window)
+		void window_left_monitor (Display display, int monitor, Window window)
 		{
 			if (InternalUtils.workspaces_only_on_primary ()
-				&& monitor == screen.get_primary_monitor ())
+				&& monitor == display.get_primary_monitor ())
 				window_removed (window.get_workspace (), window);
 		}
 
 		void prefs_listener (Meta.Preference pref)
 		{
-			unowned Screen screen = wm.get_screen ();
+			unowned Display display = wm.get_display ();
+			var workspace_manager = display.get_workspace_manager ();
 
 			if (pref == Preference.DYNAMIC_WORKSPACES && Prefs.get_dynamic_workspaces ()) {
 				// if the last workspace has a window, we need to append a new workspace
-				if (Utils.get_n_windows (screen.get_workspace_by_index (screen.get_n_workspaces () - 1)) > 0)
+				if (Utils.get_n_windows (workspace_manager.get_workspace_by_index (workspace_manager.get_n_workspaces () - 1)) > 0)
 					append_workspace ();
 			}
 		}
 
 		void append_workspace ()
 		{
-			unowned Screen screen = wm.get_screen ();
+			unowned Display display = wm.get_display ();
 
-			screen.append_new_workspace (false, screen.get_display ().get_current_time ());
+			display.get_workspace_manager().append_new_workspace (false, display.get_current_time ());
 		}
 
 		/**
@@ -204,11 +206,11 @@ namespace Gala
 		 */
 		void remove_workspace (Workspace workspace)
 		{
-			unowned Screen screen = workspace.get_screen ();
+			unowned Display display = workspace.get_display ();
 
-			var time = screen.get_display ().get_current_time ();
+			var time = display.get_current_time ();
 
-			if (workspace == screen.get_active_workspace ()) {
+			if (workspace == display.get_workspace_manager().get_active_workspace ()) {
 				Workspace? next = null;
 
 				next = workspace.get_neighbor (MotionDirection.LEFT);
@@ -230,7 +232,7 @@ namespace Gala
 
 			workspaces_marked_removed.add (workspace);
 
-			screen.remove_workspace (workspace, time);
+			display.get_workspace_manager().remove_workspace (workspace, time);
 		}
 
 		/**
@@ -261,10 +263,11 @@ namespace Gala
 			if (!Prefs.get_dynamic_workspaces ())
 				return;
 
-			var screen = wm.get_screen ();
-			var last_index = screen.get_n_workspaces () - 1;
+			var display = wm.get_display ();
+			var workspace_manager = display.get_workspace_manager ();
+			var last_index = workspace_manager.get_n_workspaces () - 1;
 
-			foreach (var workspace in screen.get_workspaces ()) {
+			foreach (var workspace in display.get_workspace_manager().get_workspaces ()) {
 				if (Utils.get_n_windows (workspace) < 1
 					&& workspace.index () != last_index) {
 					remove_workspace (workspace);
diff --git a/src/meson.build b/src/meson.build
index ef6200b..2620542 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -46,4 +46,4 @@ gala_bin = executable(
 	include_directories: config_inc_dir,
 	install_rpath: mutter_typelib_dir,
 	install: true,
-)
+)
\ No newline at end of file
diff --git a/vapi/libmutter-3.deps b/vapi/libmutter-3.deps
new file mode 120000
index 0000000..efe5ad1
--- /dev/null
+++ b/vapi/libmutter-3.deps
@@ -0,0 +1 @@
+libmutter-2.deps
\ No newline at end of file
diff --git a/vapi/libmutter-3.vapi b/vapi/libmutter-3.vapi
new file mode 120000
index 0000000..22cc238
--- /dev/null
+++ b/vapi/libmutter-3.vapi
@@ -0,0 +1 @@
+libmutter-2.vapi
\ No newline at end of file
diff --git a/vapi/libmutter.vapi b/vapi/libmutter.vapi
index 165ce1f..b51cc34 100644
--- a/vapi/libmutter.vapi
+++ b/vapi/libmutter.vapi
@@ -93,6 +93,10 @@ namespace Meta {
 		public static void set_ignore_request_hide_titlebar (bool whether);
 		[CCode (cheader_filename = "meta/prefs.h")]
 		public static void set_num_workspaces (int n_workspaces);
+#if HAS_MUTTER330
+		[CCode (cheader_filename = "meta/prefs.h")]
+		public static void set_show_fallback_app_menu (bool whether);
+#endif
 	}
 	namespace Util {
 		[CCode (cheader_filename = "meta/main.h", cname = "meta_add_verbose_topic")]
@@ -101,6 +105,10 @@ namespace Meta {
 		public static void bug (string format, ...);
 		[CCode (cheader_filename = "meta/main.h", cname = "meta_debug_spew_real")]
 		public static void debug_spew_real (string format, ...);
+#if HAS_MUTTER330
+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_empty_stage_input_region")]
+		public static void empty_stage_input_region (Meta.Display display);
+#else
 		[CCode (cheader_filename = "meta/main.h", cname = "meta_disable_unredirect_for_screen")]
 		public static void disable_unredirect_for_screen (Meta.Screen screen);
 		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_empty_stage_input_region")]
@@ -113,6 +121,7 @@ namespace Meta {
 		public static int error_trap_pop_with_return (Meta.Display display);
 		[CCode (cheader_filename = "meta/main.h", cname = "meta_error_trap_push")]
 		public static void error_trap_push (Meta.Display display);
+#endif
 		[CCode (cheader_filename = "meta/main.h", cname = "meta_external_binding_name_for_action")]
 		public static string external_binding_name_for_action (uint keybinding_action);
 		[CCode (cheader_filename = "meta/main.h", cname = "meta_fatal")]
@@ -124,7 +133,11 @@ namespace Meta {
 		[CCode (cheader_filename = "meta/main.h", cname = "meta_get_locale_direction")]
 		public static Meta.LocaleDirection get_locale_direction ();
 		[CCode (cheader_filename = "meta/main.h", cname = "meta_get_overlay_window")]
+#if HAS_MUTTER330
+		public static X.Window get_overlay_window (Meta.Display display);
+#else
 		public static X.Window get_overlay_window (Meta.Screen screen);
+#endif
 		[CCode (cheader_filename = "meta/main.h", cname = "meta_gravity_to_string")]
 		public static unowned string gravity_to_string (int gravity);
 		[CCode (cheader_filename = "meta/main.h", cname = "meta_is_debugging")]
@@ -148,7 +161,11 @@ namespace Meta {
 		[CCode (cheader_filename = "meta/main.h", cname = "meta_remove_verbose_topic")]
 		public static void remove_verbose_topic (Meta.DebugTopic topic);
 		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_set_stage_input_region")]
+#if HAS_MUTTER330
+		public static void set_stage_input_region (Meta.Display display, X.XserverRegion region);
+#else
 		public static void set_stage_input_region (Meta.Screen screen, X.XserverRegion region);
+#endif
 		[CCode (cheader_filename = "meta/main.h", cname = "meta_show_dialog")]
 		public static GLib.Pid show_dialog (string type, string message, string? timeout = null, string? display = null, string? ok_text = null, string? cancel_text = null, string? icon_name = null, int transient_for = 0, GLib.SList<string>? columns = null, GLib.SList<string>? entries = null);
 		[CCode (cheader_filename = "meta/main.h", cname = "meta_topic_real")]
@@ -161,6 +178,16 @@ namespace Meta {
 		public static void verbose_real (string format, ...);
 		[CCode (cheader_filename = "meta/main.h", cname = "meta_warning")]
 		public static void warning (string format, ...);
+#if HAS_MUTTER330
+		[CCode (cheader_filename = "meta/main.h", cname = "meta_x11_error_trap_pop")]
+		public static void x11_error_trap_pop (Meta.X11Display x11_display);
+		[CCode (cheader_filename = "meta/main.h", cname = "meta_x11_error_trap_pop_with_return")]
+		public static int x11_error_trap_pop_with_return (Meta.X11Display x11_display);
+		[CCode (cheader_filename = "meta/main.h", cname = "meta_x11_error_trap_push")]
+		public static void x11_error_trap_push (Meta.X11Display x11_display);
+		[CCode (cheader_filename = "meta/main.h", cname = "meta_x11_init_gdk_display")]
+		public static bool x11_init_gdk_display () throws GLib.Error;
+#endif
 	}
 	[CCode (cheader_filename = "meta/main.h", type_id = "meta_backend_get_type ()")]
 #if HAS_MUTTER322
@@ -175,6 +202,9 @@ namespace Meta {
 #if HAS_MUTTER324
 		public unowned Meta.Dnd get_dnd ();
 #endif
+#if HAS_MUTTER330
+		public unowned Meta.RemoteAccessController get_remote_access_controller ();
+#endif
 #if HAS_MUTTER326
 		public unowned Meta.Settings get_settings ();
 #endif
@@ -187,24 +217,39 @@ namespace Meta {
 		public signal void keymap_changed ();
 		public signal void keymap_layout_group_changed (uint object);
 		public signal void last_device_changed (int object);
+#if HAS_MUTTER330
+		public signal void lid_is_closed_changed (bool object);
+#endif
 	}
-	[CCode (cheader_filename = "meta/meta-background.h", type_id = "meta_background_get_type ()")]
+	[CCode (cheader_filename = "meta/display.h,meta/meta-background.h", type_id = "meta_background_get_type ()")]
 	public class Background : GLib.Object {
 		[CCode (has_construct_function = false)]
+#if HAS_MUTTER330
+		public Background (Meta.Display display);
+#else
 		public Background (Meta.Screen screen);
+#endif
 		public static void refresh_all ();
 		public void set_blend (GLib.File file1, GLib.File file2, double blend_factor, GDesktop.BackgroundStyle style);
 		public void set_color (Clutter.Color color);
 		public void set_file (GLib.File file, GDesktop.BackgroundStyle style);
 		public void set_gradient (GDesktop.BackgroundShading shading_direction, Clutter.Color color, Clutter.Color second_color);
 		[NoAccessorMethod]
+#if HAS_MUTTER330
+		public Meta.Display meta_display { owned get; construct; }
+#else
 		public Meta.Screen meta_screen { owned get; construct; }
+#endif
 		public signal void changed ();
 	}
-	[CCode (cheader_filename = "meta/meta-background-actor.h", type_id = "meta_background_actor_get_type ()")]
+	[CCode (cheader_filename = "meta/display.h,meta/meta-background-actor.h", type_id = "meta_background_actor_get_type ()")]
 	public class BackgroundActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false, type = "ClutterActor*")]
+#if HAS_MUTTER330
+		public BackgroundActor (Meta.Display display, int monitor);
+#else
 		public BackgroundActor (Meta.Screen screen, int monitor);
+#endif
 		public void set_background (Meta.Background background);
 #if HAS_MUTTER326
 		public void set_gradient (bool enabled, int height, double tone_start);
@@ -224,7 +269,11 @@ namespace Meta {
 		public double gradient_max_darkness { get; set; }
 #endif
 		[NoAccessorMethod]
+#if HAS_MUTTER330
+		public Meta.Display meta_display { owned get; construct; }
+#else
 		public Meta.Screen meta_screen { owned get; construct; }
+#endif
 		[NoAccessorMethod]
 		public int monitor { get; construct; }
 		[NoAccessorMethod]
@@ -295,6 +344,21 @@ namespace Meta {
 		public void add_window (Meta.Window window);
 		public void destroy ();
 		public bool filter_keybinding (Meta.KeyBinding binding);
+#if HAS_MUTTER330
+		public void flash_display (Meta.Display display);
+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_focus_stage_window")]
+		public static void focus_stage_window (Meta.Display display, uint32 timestamp);
+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_feedback_group_for_display")]
+		public static unowned Clutter.Actor get_feedback_group_for_display (Meta.Display display);
+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_stage_for_display")]
+		public static unowned Clutter.Actor? get_stage_for_display (Meta.Display display);
+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_top_window_group_for_display")]
+		public static unowned Clutter.Actor? get_top_window_group_for_display (Meta.Display display);
+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_window_actors")]
+		public static unowned GLib.List<weak Meta.WindowActor>? get_window_actors (Meta.Display display);
+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_window_group_for_display")]
+		public static unowned Clutter.Actor? get_window_group_for_display (Meta.Display display);
+#else
 		public void flash_screen (Meta.Screen screen);
 		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_focus_stage_window")]
 		public static void focus_stage_window (Meta.Screen screen, uint32 timestamp);
@@ -308,6 +372,7 @@ namespace Meta {
 		public static unowned GLib.List<weak Meta.WindowActor>? get_window_actors (Meta.Screen screen);
 		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_window_group_for_screen")]
 		public static unowned Clutter.Actor? get_window_group_for_screen (Meta.Screen screen);
+#endif
 		public void hide_tile_preview ();
 		public void hide_window (Meta.Window window, Meta.CompEffect effect);
 		public void manage ();
@@ -337,7 +402,11 @@ namespace Meta {
 	public class CursorTracker : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected CursorTracker ();
+#if HAS_MUTTER330
+		public static unowned Meta.CursorTracker get_for_display (Meta.Display display);
+#else
 		public static unowned Meta.CursorTracker get_for_screen (Meta.Screen screen);
+#endif
 		public void get_hot (out int x, out int y);
 		public void get_pointer (out int x, out int y, out Clutter.ModifierType mods);
 		public unowned Cogl.Texture get_sprite ();
@@ -357,55 +426,113 @@ namespace Meta {
 		protected Display ();
 		public void add_ignored_crossing_serial (ulong serial);
 		public uint add_keybinding (string name, GLib.Settings settings, Meta.KeyBindingFlags flags, owned Meta.KeyHandlerFunc handler);
+#if HAS_MUTTER330
+		public bool begin_grab_op (Meta.Window window, Meta.GrabOp op, bool pointer_already_grabbed, bool frame_action, int button, ulong modmask, uint32 timestamp, int root_x, int root_y);
+#else
 		public bool begin_grab_op (Meta.Screen screen, Meta.Window window, Meta.GrabOp op, bool pointer_already_grabbed, bool frame_action, int button, ulong modmask, uint32 timestamp, int root_x, int root_y);
+#endif
 		public void clear_mouse_mode ();
+#if HAS_MUTTER330
+		public void close (uint32 timestamp);
+#endif
 		public void end_grab_op (uint32 timestamp);
+#if HAS_MUTTER330
+		public void focus_default_window (uint32 timestamp);
+#else
 		public void focus_the_no_focus_window (Meta.Screen screen, uint32 timestamp);
+#endif
 		public void freeze_keyboard (uint32 timestamp);
 		public unowned Meta.Compositor get_compositor ();
+#if HAS_MUTTER330
+		public int get_current_monitor ();
+#endif
 		public uint32 get_current_time ();
 		public uint32 get_current_time_roundtrip ();
+#if !HAS_MUTTER330
 		public int get_damage_event_base ();
+#endif
 		public unowned Meta.Window get_focus_window ();
 		public Meta.GrabOp get_grab_op ();
 		public uint get_keybinding_action (uint keycode, ulong mask);
 		public uint32 get_last_user_time ();
+#if HAS_MUTTER330
+		public Meta.Rectangle get_monitor_geometry (int monitor);
+		public bool get_monitor_in_fullscreen (int monitor);
+		public int get_monitor_index_for_rect (Meta.Rectangle rect);
+		public int get_monitor_neighbor_index (int which_monitor, Meta.DisplayDirection dir);
+		public int get_n_monitors ();
+#endif
 #if HAS_MUTTER322
 		public string get_pad_action_label (Clutter.InputDevice pad, Meta.PadActionType action_type, uint action_number);
 #endif
+#if HAS_MUTTER330
+		public int get_primary_monitor ();
+		public void get_size (out int width, out int height);
+		public unowned GLib.SList<void*> get_startup_sequences ();
+#else
 		public int get_shape_event_base ();
+#endif
 		public unowned Meta.Window get_tab_current (Meta.TabList type, Meta.Workspace workspace);
 		public GLib.List<weak Meta.Window> get_tab_list (Meta.TabList type, Meta.Workspace? workspace);
 		public unowned Meta.Window get_tab_next (Meta.TabList type, Meta.Workspace workspace, Meta.Window? window, bool backward);
+#if HAS_MUTTER330
+		public unowned Meta.WorkspaceManager get_workspace_manager ();
+		public unowned Meta.X11Display get_x11_display ();
+#else
 		public unowned X.Display get_xdisplay ();
 		public int get_xinput_opcode ();
+#endif
 		public uint grab_accelerator (string accelerator);
+#if !HAS_MUTTER330
 		public bool has_shape ();
+#endif
 		public bool is_pointer_emulating_sequence (Clutter.EventSequence? sequence);
+#if !HAS_MUTTER330
 		public unowned Meta.Group lookup_group (X.Window group_leader);
+#endif
 		public bool remove_keybinding (string name);
 #if HAS_MUTTER322
 		public void request_pad_osd (Clutter.InputDevice pad, bool edition_mode);
 #endif
+#if HAS_MUTTER330
+		public void set_cursor (Meta.Cursor cursor);
+#else
 		public void set_input_focus_window (Meta.Window window, bool focus_frame, uint32 timestamp);
+#endif
 		public GLib.SList<weak Meta.Window> sort_windows_by_stacking (GLib.SList<Meta.Window> windows);
 		public bool supports_extended_barriers ();
 		public void unfreeze_keyboard (uint32 timestamp);
 		public bool ungrab_accelerator (uint action_id);
 		public void ungrab_keyboard (uint32 timestamp);
+#if !HAS_MUTTER330
 		public void unmanage_screen (Meta.Screen screen, uint32 timestamp);
+#endif
 		public bool xserver_time_is_before (uint32 time1, uint32 time2);
+#if !HAS_MUTTER330
 		public bool xwindow_is_a_no_focus_window (X.Window xwindow);
+#endif
 		public signal void accelerator_activated (uint object, uint p0, uint p1);
+#if HAS_MUTTER330
+		public signal void cursor_updated ();
+#endif
 #if HAS_MUTTER322
 		public signal void gl_video_memory_purged ();
 #endif
+#if HAS_MUTTER330
+		public signal void grab_op_begin (Meta.Display object, Meta.Window p0, Meta.GrabOp p1);
+		public signal void grab_op_end (Meta.Display object, Meta.Window p0, Meta.GrabOp p1);
+		public signal void in_fullscreen_changed ();
+#else
 		public signal void grab_op_begin (Meta.Screen object, Meta.Window p0, Meta.GrabOp p1);
 		public signal void grab_op_end (Meta.Screen object, Meta.Window p0, Meta.GrabOp p1);
+#endif
 		public signal bool modifiers_accelerator_activated ();
 		public signal void overlay_key ();
 #if HAS_MUTTER324
 		public signal void pad_mode_switch (Clutter.InputDevice object, uint p0, uint p1);
+#endif
+#if HAS_MUTTER330
+		public signal void restacked ();
 #endif
 		public signal bool restart ();
 #if HAS_MUTTER324
@@ -416,9 +543,22 @@ namespace Meta {
 #endif
 		public signal bool show_resize_popup (bool object, Meta.Rectangle p0, int p1, int p2);
 		public signal bool show_restart_message (string? message);
+#if HAS_MUTTER330
+		public signal void showing_desktop_changed ();
+		public signal void startup_sequence_changed (void* object);
+#endif
 		public signal void window_created (Meta.Window object);
 		public signal void window_demands_attention (Meta.Window object);
+#if HAS_MUTTER330
+		public signal void window_entered_monitor (int object, Meta.Window p0);
+		public signal void window_left_monitor (int object, Meta.Window p0);
+#endif
 		public signal void window_marked_urgent (Meta.Window object);
+#if HAS_MUTTER330
+		public signal void workareas_changed ();
+		public signal void x11_display_closing ();
+		public signal void x11_display_opened ();
+#endif
 	}
 #if HAS_MUTTER324
 	[CCode (cheader_filename = "meta/meta-dnd.h", type_id = "meta_dnd_get_type ()")]
@@ -504,6 +644,8 @@ namespace Meta {
 #if HAS_MUTTER324 && !HAS_MUTTER326
 		public signal void lid_is_closed_changed ();
 #endif
+        public signal void monitors_changed ();
+		public signal void workareas_changed ();
 	}
 	[CCode (cheader_filename = "meta/meta-plugin.h", type_id = "meta_plugin_get_type ()")]
 	public abstract class Plugin : GLib.Object {
@@ -524,7 +666,11 @@ namespace Meta {
 		public void destroy_completed (Meta.WindowActor actor);
 		public void end_modal (uint32 timestamp);
 		public unowned Meta.PluginInfo? get_info ();
+#if HAS_MUTTER330
+		public unowned Meta.Display get_display ();
+#else
 		public unowned Meta.Screen get_screen ();
+#endif
 		[NoWrapper]
 		public virtual void hide_tile_preview ();
 		[NoWrapper]
@@ -566,6 +712,21 @@ namespace Meta {
 		[NoWrapper]
 		public virtual bool xevent_filter (X.Event event);
 	}
+#if HAS_MUTTER330
+	[CCode (cheader_filename = "meta/main.h", type_id = "meta_remote_access_controller_get_type ()")]
+	public class RemoteAccessController : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected RemoteAccessController ();
+		public signal void new_handle (Meta.RemoteAccessHandle object);
+	}
+	[CCode (cheader_filename = "meta/main.h", type_id = "meta_remote_access_handle_get_type ()")]
+	public class RemoteAccessHandle : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected RemoteAccessHandle ();
+		public virtual void stop ();
+		public signal void stopped ();
+	}
+#else
 	[CCode (cheader_filename = "meta/screen.h", type_id = "meta_screen_get_type ()")]
 	public class Screen : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -589,7 +750,6 @@ namespace Meta {
 		public int get_screen_number ();
 		public void get_size (out int width, out int height);
 		public unowned Meta.Workspace? get_workspace_by_index (int index);
-		public unowned GLib.List<Meta.Workspace> get_workspaces ();
 		public X.Window get_xroot ();
 		public void override_workspace_layout (Meta.ScreenCorner starting_corner, bool vertical_layout, int n_rows, int n_columns);
 		public void remove_workspace (Meta.Workspace workspace, uint32 timestamp);
@@ -607,6 +767,7 @@ namespace Meta {
 		public signal void workspace_removed (int object);
 		public signal void workspace_switched (int object, int p0, Meta.MotionDirection p1);
 	}
+#endif
 #if HAS_MUTTER326
 	[CCode (cheader_filename = "meta/meta-settings.h", has_type_id = false)]
 	[Compact]
@@ -650,7 +811,11 @@ namespace Meta {
 	public class Stage : Clutter.Stage, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false)]
 		protected Stage ();
+#if HAS_MUTTER330
+		public static bool is_focused (Meta.Display display);
+#else
 		public static bool is_focused (Meta.Screen screen);
+#endif
 	}
 #endif
 	[CCode (cheader_filename = "meta/theme.h", has_type_id = false)]
@@ -720,7 +885,9 @@ namespace Meta {
 #if HAS_MUTTER328
 		public unowned string get_sandboxed_app_id ();
 #endif
+#if !HAS_MUTTER330
 		public unowned Meta.Screen get_screen ();
+#endif
 		public uint get_stable_sequence ();
 		public unowned string get_startup_id ();
 		public unowned Meta.Window? get_tile_match ();
@@ -824,6 +991,9 @@ namespace Meta {
 		public signal void focused ();
 		public signal void position_changed ();
 		public signal void raised ();
+#if HAS_MUTTER330
+		public signal void shown ();
+#endif
 		public signal void size_changed ();
 		public signal void unmanaged ();
 		public signal void workspace_changed ();
@@ -874,7 +1044,11 @@ namespace Meta {
 		public void activate (uint32 timestamp);
 		public void activate_with_focus (Meta.Window focus_this, uint32 timestamp);
 		public unowned Meta.Workspace get_neighbor (Meta.MotionDirection direction);
+#if HAS_MUTTER330
+		public unowned Meta.Display get_display ();
+#else
 		public unowned Meta.Screen get_screen ();
+#endif
 		public Meta.Rectangle get_work_area_all_monitors ();
 		public Meta.Rectangle get_work_area_for_monitor (int which_monitor);
 		public int index ();
@@ -887,6 +1061,40 @@ namespace Meta {
 		public signal void window_added (Meta.Window object);
 		public signal void window_removed (Meta.Window object);
 	}
+#if HAS_MUTTER330
+	[CCode (cheader_filename = "meta/main.h", type_id = "meta_workspace_manager_get_type ()")]
+	public class WorkspaceManager : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected WorkspaceManager ();
+		public unowned Meta.Workspace append_new_workspace (bool activate, uint32 timestamp);
+		public unowned Meta.Workspace get_active_workspace ();
+		public int get_active_workspace_index ();
+		public int get_n_workspaces ();
+		public unowned GLib.List<Meta.Workspace> get_workspaces ();
+		public unowned Meta.Workspace get_workspace_by_index (int index);
+		public void override_workspace_layout (Meta.DisplayCorner starting_corner, bool vertical_layout, int n_rows, int n_columns);
+		public void remove_workspace (Meta.Workspace workspace, uint32 timestamp);
+		public int n_workspaces { get; }
+		public signal void active_workspace_changed ();
+		public signal void showing_desktop_changed ();
+		public signal void workspace_added (int object);
+		public signal void workspace_removed (int object);
+		public signal void workspace_switched (int object, int p0, Meta.MotionDirection p1);
+	}
+	[CCode (cheader_filename = "meta/main.h", type_id = "meta_x11_display_get_type ()")]
+	public class X11Display : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected X11Display ();
+		public void focus_the_no_focus_window (uint32 timestamp);
+		public int get_damage_event_base ();
+		public int get_screen_number ();
+		public int get_shape_event_base ();
+		public bool has_shape ();
+		public void set_cm_selection ();
+		public void set_input_focus_window (Meta.Window window, bool focus_frame, uint32 timestamp);
+		public bool xwindow_is_a_no_focus_window (X.Window xwindow);
+	}
+#endif
 #if HAS_MUTTER326
 	[CCode (cheader_filename = "meta/main.h", type_cname = "MetaInhibitShortcutsDialogInterface", type_id = "meta_inhibit_shortcuts_dialog_get_type ()")]
 	public interface InhibitShortcutsDialog : GLib.Object {
@@ -1080,6 +1288,22 @@ namespace Meta {
 		HORIZONTAL,
 		VERTICAL
 	}
+#if HAS_MUTTER330
+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DISPLAY_", type_id = "meta_display_corner_get_type ()")]
+	public enum DisplayCorner {
+		TOPLEFT,
+		TOPRIGHT,
+		BOTTOMLEFT,
+		BOTTOMRIGHT
+	}
+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DISPLAY_", type_id = "meta_display_direction_get_type ()")]
+	public enum DisplayDirection {
+		UP,
+		DOWN,
+		LEFT,
+		RIGHT
+	}
+#endif
 	[CCode (cheader_filename = "meta/boxes.h", cprefix = "META_EDGE_", type_id = "meta_edge_type_get_type ()")]
 	public enum EdgeType {
 		WINDOW,
@@ -1362,6 +1586,7 @@ namespace Meta {
 		[CCode (cheader_filename = "meta/main.h")]
 		public unowned string to_string ();
 	}
+#if !HAS_MUTTER330
 	[CCode (cheader_filename = "meta/screen.h", cprefix = "META_SCREEN_", type_id = "meta_screen_corner_get_type ()")]
 	public enum ScreenCorner {
 		TOPLEFT,
@@ -1376,6 +1601,7 @@ namespace Meta {
 		LEFT,
 		RIGHT
 	}
+#endif
 	[CCode (cheader_filename = "meta/meta-enum-types.h", cprefix = "META_SHADOW_MODE_", type_id = "meta_shadow_mode_get_type ()")]
 	public enum ShadowMode {
 		AUTO,
@@ -1469,12 +1695,21 @@ namespace Meta {
 	}
 	[CCode (cheader_filename = "meta/meta-idle-monitor.h", instance_pos = 2.9)]
 	public delegate void IdleMonitorWatchFunc (Meta.IdleMonitor monitor, uint watch_id);
+#if HAS_MUTTER330
+	[CCode (cheader_filename = "meta/prefs.h", instance_pos = 4.9)]
+	public delegate void KeyHandlerFunc (Meta.Display display, Meta.Window? window, Clutter.KeyEvent? event, Meta.KeyBinding binding);
+#else
 	[CCode (cheader_filename = "meta/prefs.h", instance_pos = 5.9)]
 	public delegate void KeyHandlerFunc (Meta.Display display, Meta.Screen screen, Meta.Window? window, Clutter.KeyEvent? event, Meta.KeyBinding binding);
+#endif
 	[CCode (cheader_filename = "meta/prefs.h", instance_pos = 1.9)]
 	public delegate void PrefsChangedFunc (Meta.Preference pref);
 	[CCode (cheader_filename = "meta/window.h", instance_pos = 1.9)]
 	public delegate bool WindowForeachFunc (Meta.Window window);
+#if HAS_MUTTER330
+	[CCode (cheader_filename = "meta/main.h", cname = "META_CURRENT_TIME")]
+	public const int CURRENT_TIME;
+#endif
 	[CCode (cheader_filename = "meta/main.h", cname = "META_DEFAULT_ICON_NAME")]
 	public const string DEFAULT_ICON_NAME;
 	[CCode (cheader_filename = "meta/main.h", cname = "META_ICON_HEIGHT")]
@@ -1509,6 +1744,12 @@ namespace Meta {
 	public static bool activate_session ();
  	[CCode (cheader_filename = "meta/main.h")]
 	public static void clutter_init ();
+#if HAS_MUTTER330
+	[CCode (cheader_filename = "meta/main.h")]
+	public static void disable_unredirect_for_display (Meta.Display display);
+	[CCode (cheader_filename = "meta/main.h")]
+	public static void enable_unredirect_for_display (Meta.Display display);
+#endif
 	[CCode (cheader_filename = "meta/main.h")]
 	public static void exit (Meta.ExitCode code);
 	[CCode (cheader_filename = "meta/main.h")]
diff --git a/vapi/mutter-clutter-3.deps b/vapi/mutter-clutter-3.deps
new file mode 100644
index 0000000..687b763
--- /dev/null
+++ b/vapi/mutter-clutter-3.deps
@@ -0,0 +1,5 @@
+atk
+cairo
+pango
+json-glib-1.0
+mutter-cogl-3
diff --git a/vapi/mutter-clutter-3.vapi b/vapi/mutter-clutter-3.vapi
new file mode 120000
index 0000000..cb676dc
--- /dev/null
+++ b/vapi/mutter-clutter-3.vapi
@@ -0,0 +1 @@
+mutter-clutter-2.vapi
\ No newline at end of file
diff --git a/vapi/mutter-cogl-3.deps b/vapi/mutter-cogl-3.deps
new file mode 120000
index 0000000..c6bf5df
--- /dev/null
+++ b/vapi/mutter-cogl-3.deps
@@ -0,0 +1 @@
+mutter-cogl-2.deps
\ No newline at end of file
diff --git a/vapi/mutter-cogl-3.vapi b/vapi/mutter-cogl-3.vapi
new file mode 120000
index 0000000..6cf832e
--- /dev/null
+++ b/vapi/mutter-cogl-3.vapi
@@ -0,0 +1 @@
+mutter-cogl-2.vapi
\ No newline at end of file
diff --git a/vapi/mutter-cogl-pango-3.vapi b/vapi/mutter-cogl-pango-3.vapi
new file mode 100644
index 0000000..e69de29
diff --git a/vapi/mutter-cogl-path-3.vapi b/vapi/mutter-cogl-path-3.vapi
new file mode 100644
index 0000000..e69de29
diff --git a/vapi/xfixes-4.0.vapi b/vapi/xfixes-4.0.vapi
index 3cbcfc7..67866ce 100644
--- a/vapi/xfixes-4.0.vapi
+++ b/vapi/xfixes-4.0.vapi
@@ -5,9 +5,17 @@
 namespace X {
 	namespace Fixes {
 		[CCode (cheader_filename = "X11/extensions/Xfixes.h", cname = "XFixesCreateRegion")]
+#if HAS_MUTTER330
+		public static X.XserverRegion create_region (Meta.X11Display display, [CCode (array_length = true)] X.Xrectangle[] rectangles);
+#else
 		public static X.XserverRegion create_region (X.Display display, [CCode (array_length = true)] X.Xrectangle[] rectangles);
+#endif
 		[CCode (cheader_filename = "X11/extensions/Xfixes.h", cname = "XFixesDestroyRegion")]
-		public static void destroy_region (X.Display display, X.XserverRegion region);
+#if HAS_MUTTER330
+		public static void destroy_region (Meta.X11Display display, X.XserverRegion region);
+#else
+	public static void destroy_region (X.Display display, X.XserverRegion region);
+#endif
 	}
 	[SimpleType]
 	[CCode (cheader_filename = "X11/extensions/Xfixes.h", cname = "XserverRegion", has_type_id = false)]

Places

File 0001-port-to-mutter330.patch of Package gala

Places