Merge lp:~gala-dev/gala/window-left-monitor into lp:gala

[Tom Beckmann]

Adds watches for window_left_monitor where we use clones. This makes sure that for example windows that are displayed on all workspaces will correctly be removed when they are closed, preventing meta_window_appears_focused crashes.

[Rico Tzschichholz (ricotz)]

You can't use "window.located_on_workspace (workspace)" which is not available in mutter 3.4/3.6

Therefore use:
  return (window->on_all_workspaces && window->screen == workspace->screen) ||
    (window->workspace == workspace);

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

I know I backported it from 3.8 to 3.4 which wasn't the best idea since I have no plans to maintain a patched 3.6 package too.

[lp:~gala-dev/gala/window-left-monitor]

326. By Tom Beckmann on 2013-05-11

dont use meta_window_located_on_workspace where it's not available

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'src/Widgets/WindowOverview.vala'
--- src/Widgets/WindowOverview.vala	2013-03-27 16:52:39 +0000
+++ src/Widgets/WindowOverview.vala	2013-05-11 13:05:28 +0000
@@ -565,6 +565,8 @@
 				workspace.window_added.connect (add_window);
 				workspace.window_removed.connect (remove_window);
 			}
+
+			screen.window_left_monitor.connect (window_left_monitor);
 			
 #if HAS_MUTTER38
 			plugin.wallpaper.
@@ -601,6 +603,22 @@
 			
 			calculate_places (get_children ());
 		}
+
+		void window_left_monitor (int num, Window window)
+		{
+			// see if that's happened on one of our workspaces
+			foreach (var workspace in workspaces) {
+#if HAS_MUTTER38
+				if (window.located_on_workspace (workspace)) {
+#else
+				if (window.get_workspace () == workspace || 
+					(window.is_on_all_workspaces () && window.get_screen () == workspace.get_screen ()) {
+#endif
+					remove_window (window);
+					return;
+				}
+			}
+		}
 		
 		void add_window (Window window)
 		{
@@ -681,6 +699,7 @@
 				workspace.window_added.disconnect (add_window);
 				workspace.window_removed.disconnect (remove_window);
 			}
+			screen.window_left_monitor.disconnect (window_left_monitor);
 			
 			ready = false;
 			

=== modified file 'src/Widgets/WindowSwitcher.vala'
--- src/Widgets/WindowSwitcher.vala	2013-04-28 09:30:41 +0000
+++ src/Widgets/WindowSwitcher.vala	2013-05-11 13:05:28 +0000
@@ -132,10 +132,7 @@
 			closing = true;
 
 			var screen = plugin.get_screen ();
-			
 			var workspace = screen.get_active_workspace ();
-			workspace.window_added.disconnect (add_window);
-			workspace.window_removed.disconnect (remove_window);
 			
 			if (dock_window != null)
 				dock_window.opacity = 0;
@@ -186,6 +183,10 @@
 					if (window.get_workspace () == workspace.index ())
 						window.show ();
 				}
+
+				workspace.window_added.disconnect (add_window);
+				workspace.window_removed.disconnect (remove_window);
+				screen.window_left_monitor.disconnect (window_left_monitor);
 			});
 		}
 		
@@ -278,6 +279,20 @@
 				i++;
 			}
 		}
+
+		void window_left_monitor (int num, Meta.Window window)
+		{
+			// see if that's happened on our workspace
+			var workspace = plugin.get_screen ().get_active_workspace ();
+#if HAS_MUTTER38
+			if (window.located_on_workspace (workspace)) {
+#else
+			if (window.get_workspace () == workspace || 
+				(window.is_on_all_workspaces () && window.get_screen () == workspace.get_screen ()) {
+#endif
+				remove_window (window);
+			}
+		}
 		
 		void add_window (Meta.Window window)
 		{
@@ -423,6 +438,7 @@
 			
 			workspace.window_added.connect (add_window);
 			workspace.window_removed.connect (remove_window);
+			screen.window_left_monitor.connect (window_left_monitor);
 			
 			//grab the windows to be switched
 			var layout = dock.layout_manager as BoxLayout;

=== modified file 'src/Widgets/WorkspaceThumb.vala'
--- src/Widgets/WorkspaceThumb.vala	2013-03-29 17:45:46 +0000
+++ src/Widgets/WorkspaceThumb.vala	2013-05-11 13:05:28 +0000
@@ -78,6 +78,7 @@
 			
 			workspace.window_added.connect (handle_window_added);
 			workspace.window_removed.connect (handle_window_removed);
+			screen.window_left_monitor.connect (window_left_monitor);
 			
 			reactive = true;
 			
@@ -259,6 +260,7 @@
 			screen.workspace_switched.disconnect (handle_workspace_switched);
 			screen.workspace_added.disconnect (workspace_added);
 			screen.monitors_changed.disconnect (resize);
+			screen.window_left_monitor.disconnect (window_left_monitor);
 		}
 		
 		void close_workspace (Clutter.Actor actor)
@@ -329,6 +331,17 @@
 			check_last_workspace ();
 		}
 		
+		void window_left_monitor (int num, Meta.Window window)
+		{
+#if HAS_MUTTER38
+			if (window.located_on_workspace (workspace))
+#else
+			if (window.get_workspace () == workspace || 
+				(window.is_on_all_workspaces () && window.get_screen () == workspace.get_screen ())
+#endif
+				handle_window_removed (window);
+		}
+
 		void update_windows ()
 		{
 			windows.remove_all_children ();