Merge lp:~psybers/docky/scale into lp:docky

[Thiago Teixeira]

[Thiago Teixeira (tvst)]

Any chance this will make it into trunk?

[Jason Smith (jassmith)]

Needs more development

review: Disapprove

[Robert Dyer (psybers)]

I wrote it, and even I think it shouldnt be merged. :-)

The basics are there, but we definitely have to figure out how the user interaction works!

review: Needs Fixing

[lp:~psybers/docky/scale]

284. By Robert Dyer on 2009-11-02

merge trunk

285. By Robert Dyer on 2009-11-02

clean some

Unmerged revisions

285. By Robert Dyer on 2009-11-02

clean some

284. By Robert Dyer on 2009-11-02

merge trunk

283. By Robert Dyer on 2009-10-20

merge trunk

282. By Robert Dyer on 2009-10-18

stop the scale timer on clicks/scroll

281. By Robert Dyer on 2009-10-18

add scale plugin invoke over dbus after 2s hover on a window group

=== modified file 'Docky.Windowing/Xlib/Xlib.cs'
--- Docky.Windowing/Xlib/Xlib.cs	2009-09-03 05:09:05 +0000
+++ Docky.Windowing/Xlib/Xlib.cs	2009-11-02 02:31:14 +0000
@@ -81,6 +81,9 @@
         static extern IntPtr gdk_x11_display_get_xdisplay (IntPtr display);
 		
 		[DllImport (libGdkX11)]
+		public static extern IntPtr gdk_x11_get_default_root_xwindow ();
+		
+		[DllImport (libGdkX11)]
 		static extern void gdk_x11_window_set_user_time (IntPtr window, uint timestamp);
 
 		[DllImport (libX11)]

=== modified file 'Docky/Docky/Interface/DockWindow.cs'
--- Docky/Docky/Interface/DockWindow.cs	2009-11-02 01:35:55 +0000
+++ Docky/Docky/Interface/DockWindow.cs	2009-11-02 02:31:14 +0000
@@ -288,9 +288,47 @@
 				hoveredItem = value;
 				SetHoveredAcceptsDrop ();
 				OnHoveredItemChanged (last);
+				
+				if (hover_timer != 0)
+					GLib.Source.Remove (hover_timer);
+				
+				// if we hover for 2 seconds, this will attempt to tell the
+				// Compiz Scale plugin to scale the window group
+				hover_timer = GLib.Timeout.Add (2000, delegate {
+					ShowCompizScale ();
+						
+					return false;
+				});
 			}
 		}
 		
+		void ShowCompizScale ()
+		{
+			if (compizProxy == null || hoveredItem == null || !(hoveredItem is WnckDockItem))
+				return;
+			
+			Wnck.Window window = (hoveredItem as WnckDockItem).Windows.FirstOrDefault ();
+			
+			// there has to be at least 1 window
+			if (window != null)
+				try {
+					compizProxy.activate (
+						"root", (int) Xlib.Xlib.gdk_x11_get_default_root_xwindow (),
+						"window", (int)window.Xid
+					);
+				} catch {}
+		}
+		
+		// the timer for activating the Scale plugin
+		uint hover_timer;
+		ICompizScaleProxy compizProxy;
+		
+		[NDesk.DBus.Interface ("org.freedesktop.compiz")]
+		interface ICompizScaleProxy
+		{
+			void activate (string screen, int screenId, string window, int windowId);
+		}
+		
 		internal AbstractDockItem ClosestItem {
 			get {
 				return Items
@@ -513,6 +551,10 @@
 			
 			Realized += HandleRealized;
 			Docky.Controller.ThemeChanged += DockyControllerThemeChanged;
+			
+			try {
+				compizProxy = NDesk.DBus.Bus.Session.GetObject<ICompizScaleProxy> ("org.freedesktop.compiz", new NDesk.DBus.ObjectPath ("/org/freedesktop/compiz/scale/allscreens/initiate_group_key"));
+			} catch {}
 		}
 
 
@@ -751,6 +793,9 @@
 		
 		protected override bool OnButtonPressEvent (EventButton evnt)
 		{
+			if (hover_timer != 0)
+				GLib.Source.Remove (hover_timer);
+			
 			if (InternalDragActive || ConfigurationMode)
 				return base.OnButtonPressEvent (evnt);
 			
@@ -813,6 +858,9 @@
 
 		protected override bool OnScrollEvent (EventScroll evnt)
 		{
+			if (hover_timer != 0)
+				GLib.Source.Remove (hover_timer);
+			
 			if (InternalDragActive || ConfigurationMode)
 				return base.OnScrollEvent (evnt);
 			
@@ -841,6 +889,7 @@
 			if (HoveredItem != null && ExternalDragActive) {
 				if (DragTracker.DragData != null && HoveredItem.CanAcceptDrop (DragTracker.DragData)) {
 					HoveredAcceptsDrop = true;
+					ShowCompizScale ();
 				}
 			}
 		}