Merge lp:~jassmith/do/docky-multimon into lp:do

[Jason Smith]

[Jason Smith (jassmith)]

Fixes the following issues

- Docky does not notice when monitors are disabled/enabled
- Docky "disappears" when switch monitors for a couple seconds
- Docky does not notice when monitor resolution changes

Additionally this branch prevents Docky from tearing itself apart and putting itself back together just to switch monitors. Instead now it switches live only disposing and rebuilding buffer surfaces.

[Alex Launi (alexlauni)]

Looks rad, fixes some important bugs.

review: Approve

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-03-11 04:55:37 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-03-11 06:03:30 +0000
@@ -200,7 +200,6 @@
 			this.window = window;
 			
 			SetSize ();
-			SetSizeRequest (Width, Height);
 			
 			PositionProvider = new ItemPositionProvider (this);
 			
@@ -240,17 +239,23 @@
 			
 			Width = geo.Width;
 			Height = 300;
+			
+			SetSizeRequest (Width, Height);
 		}
 
 		void RegisterEvents ()
 		{
 			DockServices.ItemsService.DockItemsChanged += OnDockItemsChanged;
 			DockServices.ItemsService.ItemNeedsUpdate += HandleItemNeedsUpdate;
+			
+			DockPreferences.MonitorChanged += HandleMonitorChanged; 
 			DockPreferences.IconSizeChanged += HandleIconSizeChanged; 
 			
 			DockServices.PainterService.PainterShowRequest += HandlePainterShowRequest;
 			DockServices.PainterService.PainterHideRequest += HandlePainterHideRequest;
 
+			Screen.SizeChanged += HandleSizeChanged; 
+			
 			PopupMenu.Hidden += OnDockItemMenuHidden;
 			PopupMenu.Shown += OnDockItemMenuShown;
 
@@ -269,11 +274,15 @@
 		{
 			DockServices.ItemsService.DockItemsChanged -= OnDockItemsChanged;
 			DockServices.ItemsService.ItemNeedsUpdate -= HandleItemNeedsUpdate;
+			
+			DockPreferences.MonitorChanged -= HandleMonitorChanged;
 			DockPreferences.IconSizeChanged -= HandleIconSizeChanged; 
 			
 			DockServices.PainterService.PainterShowRequest -= HandlePainterShowRequest;
 			DockServices.PainterService.PainterHideRequest -= HandlePainterHideRequest;
 
+			Screen.SizeChanged -= HandleSizeChanged;
+			
 			PopupMenu.Hidden -= OnDockItemMenuHidden;
 			PopupMenu.Shown -= OnDockItemMenuShown;
 			
@@ -310,6 +319,26 @@
 			AnimatedDraw ();
 		}
 
+		void HandleMonitorChanged()
+		{
+			Reconfigure ();
+		}
+		
+		void HandleSizeChanged(object sender, EventArgs e)
+		{
+			Reconfigure ();
+		}
+		
+		void Reconfigure ()
+		{
+			SetSize ();
+			ResetBuffers ();
+			PositionProvider.ForceUpdate ();
+			SetParentInputMask ();
+			SetIconRegions ();
+			window.DelaySetStruts ();
+		}
+		
 		void HandleUniverseInitialized(object sender, EventArgs e)
 		{
 			GLib.Timeout.Add (2000, delegate {

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs	2009-03-04 22:02:10 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs	2009-03-11 06:03:30 +0000
@@ -663,5 +663,30 @@
 		{
 			RenderData.ForceFullRender = true;
 		}
+		
+		void ResetBuffers()
+		{
+			if (backbuffer != null) {
+				backbuffer.Destroy ();
+				backbuffer = null;
+			}
+			
+			if (dock_icon_buffer != null) {
+				dock_icon_buffer.Destroy ();
+				dock_icon_buffer = null;
+			}
+			
+			if (input_area_buffer != null) {
+				input_area_buffer.Destroy ();
+				input_area_buffer = null;
+			}
+			
+			foreach (Surface sr in painter_surfaces.Values) {
+				sr.Destroy ();
+			}
+			painter_surfaces.Clear ();
+			
+			RequestFullRender ();
+		}
 	}
 }

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs	2009-03-05 05:00:17 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs	2009-03-11 06:03:30 +0000
@@ -131,15 +131,8 @@
 
 		void HandleMonitorChanged()
 		{
-			Remove (dock_area);
-			dock_area.Dispose ();
-			
 			// bring us back down to "minimum" size
 			Resize (1, 1);
-			
-			dock_area = new DockArea (this);
-			Add (dock_area);
-			ShowAll ();
 			DelaySetStruts ();
 		}
 		

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/ItemPositionProvider.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/ItemPositionProvider.cs	2009-03-10 04:07:15 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/ItemPositionProvider.cs	2009-03-11 06:03:30 +0000
@@ -106,14 +106,12 @@
 
 		void HandleDockItemsChanged(IEnumerable<AbstractDockItem> items)
 		{
-			static_positions.Clear ();
-			MinimumDockArea = CalculateMinimumArea ();
+			ForceUpdate ();
 		}
 		
 		void HandleIconSizeChanged ()
 		{
-			static_positions.Clear ();
-			MinimumDockArea = CalculateMinimumArea ();
+			ForceUpdate ();
 		}
 
 		Rectangle CalculateMinimumArea ()
@@ -137,6 +135,12 @@
 			return rect;
 		}
 		
+		public void ForceUpdate ()
+		{
+			static_positions.Clear ();
+			MinimumDockArea = CalculateMinimumArea ();
+		}
+		
 		public Rectangle DockArea (double zoomByEntryTime, Gdk.Point cursor)
 		{
 			Cairo.PointD startPosition, endPosition;