Merge lp:~shippo/plank/fix-1248689 into lp:~shippo/plank/test

[Peter Feichtinger]

[Peter Feichtinger (shippo)]

review: Approve

=== modified file 'lib/Items/ApplicationDockItem.vala'
--- lib/Items/ApplicationDockItem.vala	2017-02-09 12:53:29 +0000
+++ lib/Items/ApplicationDockItem.vala	2017-03-14 17:22:36 +0000
@@ -276,27 +276,45 @@
 			app_window_removed ();
 		}
 		
-		void update_indicator ()
+		public void update_indicator ()
 		{
-			//FIXME Do not be silly if the application is running
-			//  we must indicate it, same goes for the opposite.
-			
-			var is_running = is_running ();
-			
-			if (!is_running) {
+			switch (get_window_count ()) {
+			case 0:
 				if (Indicator != IndicatorState.NONE)
 					Indicator = IndicatorState.NONE;
-				return;
-			}
-			
-			var window_count = App.get_windows ().length ();
-			
-			if (window_count <= 1) {
+				break;
+			case 1:
 				if (Indicator != IndicatorState.SINGLE)
 					Indicator = IndicatorState.SINGLE;
-			} else {
+				break;
+			default:
 				if (Indicator != IndicatorState.SINGLE_PLUS)
 					Indicator = IndicatorState.SINGLE_PLUS;
+				break;
+			}
+		}
+		
+		uint get_window_count () {
+			if (App == null)
+				return 0;
+			
+			if (get_dock ().prefs.CurrentWorkspaceOnly) {
+				unowned Wnck.Workspace? active_workspace = Wnck.Screen.get_default ().get_active_workspace ();
+				return WindowControl.count_windows_on_workspace (App, active_workspace);
+			} else {
+				return App.get_windows ().length ();
+			}
+		}
+		
+		GLib.List<unowned Bamf.View>? get_windows () {
+			if (App == null)
+				return null;
+			
+			if (get_dock ().prefs.CurrentWorkspaceOnly) {
+				unowned Wnck.Workspace? active_workspace = Wnck.Screen.get_default ().get_active_workspace ();
+				return WindowControl.get_windows_on_workspace (App, active_workspace);
+			} else {
+				return App.get_windows ();
 			}
 		}
 		
@@ -321,13 +339,13 @@
 		{
 			if (!is_window ())
 				if (button == PopupButton.MIDDLE
-					|| (button == PopupButton.LEFT && (App == null || App.get_windows ().length () == 0
-					|| (mod & Gdk.ModifierType.CONTROL_MASK) == Gdk.ModifierType.CONTROL_MASK))) {
+					|| (button == PopupButton.LEFT && (get_window_count () == 0
+						|| (mod & Gdk.ModifierType.CONTROL_MASK) == Gdk.ModifierType.CONTROL_MASK))) {
 					launch ();
 					return AnimationType.BOUNCE;
 				}
 			
-			if (button == PopupButton.LEFT && App != null && App.get_windows ().length () > 0) {
+			if (button == PopupButton.LEFT && get_window_count () > 0) {
 				WindowControl.smart_focus (App, event_time);
 				return AnimationType.DARKEN;
 			}
@@ -340,7 +358,7 @@
 		 */
 		protected override AnimationType on_scrolled (Gdk.ScrollDirection direction, Gdk.ModifierType mod, uint32 event_time)
 		{
-			if (App == null || App.get_windows ().length () == 0)
+			if (get_window_count () == 0)
 				return AnimationType.NONE;
 			
 			if (GLib.get_monotonic_time () - LastScrolled < ITEM_SCROLL_DURATION * 1000)
@@ -348,10 +366,14 @@
 			
 			LastScrolled = GLib.get_monotonic_time ();
 			
+			unowned Wnck.Workspace? active_workspace = null;
+			if (get_dock ().prefs.CurrentWorkspaceOnly)
+				active_workspace = Wnck.Screen.get_default ().get_active_workspace ();
+			
 			if (direction == Gdk.ScrollDirection.UP || direction == Gdk.ScrollDirection.LEFT)
-				WindowControl.focus_previous (App, event_time);
+				WindowControl.focus_previous (App, event_time, active_workspace);
 			else
-				WindowControl.focus_next (App, event_time);
+				WindowControl.focus_next (App, event_time, active_workspace);
 			
 			return AnimationType.DARKEN;
 		}
@@ -397,9 +419,7 @@
 		{
 			var items = new Gee.ArrayList<Gtk.MenuItem> ();
 			
-			GLib.List<unowned Bamf.View>? windows = null;
-			if (App != null)
-				windows = App.get_windows ();
+			GLib.List<unowned Bamf.View>? windows = get_windows ();
 			
 			var window_count = 0U;
 			if (windows != null)

=== modified file 'lib/Items/DefaultApplicationDockItemProvider.vala'
--- lib/Items/DefaultApplicationDockItemProvider.vala	2016-02-22 10:55:51 +0000
+++ lib/Items/DefaultApplicationDockItemProvider.vala	2017-03-14 17:22:36 +0000
@@ -68,6 +68,10 @@
 					unowned TransientDockItem? transient = (item as TransientDockItem);
 					item.IsAttached = (transient == null || transient.App == null || active_workspace == null
 						|| WindowControl.has_window_on_workspace (transient.App, active_workspace));
+					
+					unowned ApplicationDockItem? app = (item as ApplicationDockItem);
+					if (item.IsAttached && app != null)
+						app.update_indicator ();
 				}
 			} else {
 				foreach (var item in internal_elements)

=== modified file 'lib/Services/WindowControl.vala'
--- lib/Services/WindowControl.vala	2016-11-05 19:48:09 +0000
+++ lib/Services/WindowControl.vala	2017-03-14 17:22:36 +0000
@@ -171,6 +171,20 @@
 			return false;
 		}
 		
+		static bool is_on_workspace (Wnck.Window? window, Wnck.Workspace workspace) {
+			if (window == null)
+				return false;
+			
+			var is_virtual = workspace.is_virtual ();
+			
+			if (!is_virtual && window.is_on_workspace (workspace))
+				return true;
+			else if (is_virtual && window.is_in_viewport (workspace))
+				return true;
+			
+			return false;
+		}
+		
 		public static bool has_window_on_workspace (Bamf.Application app, Wnck.Workspace workspace)
 		{
 			Wnck.Screen.get_default ();
@@ -178,23 +192,48 @@
 			
 			warn_if_fail (xids != null);
 			
-			var is_virtual = workspace.is_virtual ();
-			
-			for (var i = 0; xids != null && i < xids.length; i++) {
-				unowned Wnck.Window window = Wnck.Window.@get (xids.index (i));
-				if (window == null)
-					continue;
-				
-				if (!is_virtual) {
-					if (window.is_on_workspace (workspace))
-						return true;
-				} else {
-					if (window.is_in_viewport (workspace))
-						return true;
+			for (var i = 0; xids != null && i < xids.length; i++) {
+				unowned Wnck.Window window = Wnck.Window.@get (xids.index (i));
+				if (is_on_workspace (window, workspace))
+					return true;
+			}
+			
+			return false;
+		}
+		
+		public static int count_windows_on_workspace (Bamf.Application app, Wnck.Workspace workspace)
+		{
+			Wnck.Screen.get_default ();
+			Array<uint32>? xids = app.get_xids ();
+			
+			warn_if_fail (xids != null);
+			
+			int count = 0;
+			
+			for (var i = 0; xids != null && i < xids.length; i++) {
+				unowned Wnck.Window window = Wnck.Window.@get (xids.index (i));
+				if (is_on_workspace (window, workspace))
+					count++;
+			}
+			
+			return count;
+		}
+		
+		public static GLib.List<unowned Bamf.View> get_windows_on_workspace (Bamf.Application app, Wnck.Workspace workspace)
+		{
+			Wnck.Screen.get_default ();
+			GLib.List<unowned Bamf.View> windows = app.get_windows ();
+			
+			var result = new GLib.List<unowned Bamf.View> ();
+			foreach (var view in windows) {
+				if (view is Bamf.Window) {
+					unowned Wnck.Window window = Wnck.Window.@get ((view as Bamf.Window).get_xid ());
+					if (is_on_workspace (window, workspace))
+						result.append (view);
 				}
 			}
 			
-			return false;
+			return result;
 		}
 		
 		public static void update_icon_regions (Bamf.Application app, Gdk.Rectangle rect)
@@ -262,7 +301,7 @@
 			return i;
 		}
 		
-		public static void focus_previous (Bamf.Application app, uint32 event_time)
+		public static void focus_previous (Bamf.Application app, uint32 event_time, Wnck.Workspace? workspace = null)
 		{
 			Wnck.Screen.get_default ();
 			Array<uint32>? xids = app.get_xids ();
@@ -278,10 +317,22 @@
 			if (i < 0)
 				i = (int) xids.length - 1;
 			
+			// Look for window on workspace if specified
+			if (workspace != null) {
+				var start = i;
+				do {
+					unowned Wnck.Window window = Wnck.Window.@get (xids.index (i));
+					if (is_on_workspace (window, workspace))
+						break;
+					
+					i = (i == 0 ? (int) xids.length - 1 : i - 1);
+				} while (i != start);
+			}
+			
 			focus_window_by_xid (xids.index (i), event_time);
 		}
 		
-		public static void focus_next (Bamf.Application app, uint32 event_time)
+		public static void focus_next (Bamf.Application app, uint32 event_time, Wnck.Workspace? workspace = null)
 		{
 			Wnck.Screen.get_default ();
 			Array<uint32>? xids = app.get_xids ();
@@ -297,6 +348,18 @@
 			if (i == xids.length)
 				i = 0;
 			
+			// Look for window on workspace if specified
+			if (workspace != null) {
+				var start = i;
+				do {
+					unowned Wnck.Window window = Wnck.Window.@get (xids.index (i));
+					if (is_on_workspace (window, workspace))
+						break;
+					
+					i = (i + 1) % (int) xids.length;
+				} while (i != start);
+			}
+			
 			focus_window_by_xid (xids.index (i), event_time);
 		}
 		

=== modified file 'lib/libplank.symbols'
--- lib/libplank.symbols	2017-02-09 12:53:29 +0000
+++ lib/libplank.symbols	2017-03-14 17:22:36 +0000
@@ -57,6 +57,7 @@
 plank_application_dock_item_set_urgent
 plank_application_dock_item_unity_reset
 plank_application_dock_item_unity_update
+plank_application_dock_item_update_indicator
 plank_check_version
 plank_color_add_hue
 plank_color_brighten_val