[f-spot: 1/41] stub enough of a managed ImageView so it builds

[Stephane Delcroix <sdelcroix src gnome org>]

commit 612859c311e19573072af5569704f2ae9dd2a519
Author: Stephane Delcroix <stephane delcroix org>
Date:   Sat Jun 6 10:08:23 2009 +0200

    stub enough of a managed ImageView so it builds

 src/FullScreenView.cs          |    4 +-
 src/Makefile.am                |    1 +
 src/TagCommands.cs             |    2 +-
 src/Widgets/ImageView.cs       |  392 ++++++++++------------------------------
 src/Widgets/NativeImageView.cs |  340 ++++++++++++++++++++++++++++++++++
 src/Widgets/PointerMode.cs     |   17 ++
 6 files changed, 458 insertions(+), 298 deletions(-)
---
diff --git a/src/FullScreenView.cs b/src/FullScreenView.cs
index b2b8fd3..983d9a3 100644
--- a/src/FullScreenView.cs
+++ b/src/FullScreenView.cs
@@ -99,7 +99,7 @@ namespace FSpot {
 				this.Add (notebook);
 				view.Show ();
 				view.MotionNotifyEvent += HandleViewMotion;
-				view.PointerMode = ImageView.PointerModeType.Scroll;
+				view.PointerMode = PointerMode.Scroll;
 				
 				scroll.ScrolledWindow.Add (view);
 
@@ -190,7 +190,7 @@ namespace FSpot {
 		
 		private void ShowCursor () 
 		{
-			view.PointerMode = ImageView.PointerModeType.Scroll;
+			view.PointerMode = PointerMode.Scroll;
 			this.GdkWindow.Cursor = null;
 		}
 		
diff --git a/src/Makefile.am b/src/Makefile.am
index 7afa0b7..acb1395 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -84,6 +84,7 @@ WIDGETS_CSDISTFILES =				\
 	$(srcdir)/Widgets/ImageView.cs		\
 	$(srcdir)/Widgets/MenuButton.cs		\
 	$(srcdir)/Widgets/OpenWithMenu.cs	\
+	$(srcdir)/Widgets/PointerMode.cs	\
 	$(srcdir)/Widgets/Rating.cs		\
 	$(srcdir)/Widgets/SaneTreeView.cs	\
 	$(srcdir)/Widgets/ScrolledView.cs
diff --git a/src/TagCommands.cs b/src/TagCommands.cs
index d7fab11..c2a9cb5 100644
--- a/src/TagCommands.cs
+++ b/src/TagCommands.cs
@@ -414,7 +414,7 @@ public class TagCommands {
 			}
 		}
 
-		private void HandleSelectionChanged ()
+		private void HandleSelectionChanged (object sender, EventArgs e)
 		{
 			int x, y, width, height;
 			Gdk.Pixbuf tmp = null;
diff --git a/src/Widgets/ImageView.cs b/src/Widgets/ImageView.cs
index 3236dd8..059a9af 100644
--- a/src/Widgets/ImageView.cs
+++ b/src/Widgets/ImageView.cs
@@ -2,339 +2,141 @@
 // FSpot.Widgets.ImageView.cs
 //
 // Author(s):
-//	Ettore Perazzoli
-//	Larry Ewing  <lewing novell com>
-//	Stephane Delcrxoi  <stephane delcroix org>
+//	Stephane Delcroix  <stephane delcroix org>
 //
-// This is free software. See COPYING for details
+// This is free software. See COPYING for details.
 //
 
-using Gdk;
-using Gtk;
 using System;
-using System.Collections;
-using System.Runtime.InteropServices;
-
-namespace FSpot.Widgets {
-public class ImageView : Layout {
-	private Cms.Transform transform;
-
-	public static double ZOOM_FACTOR = 1.1;
-
-	protected const double MAX_ZOOM = 10.0;
-
-	protected double min_zoom = 0.1;
-	protected double MIN_ZOOM {
-		get {
-			return min_zoom;
-		}
-	}
-
-	[DllImport ("libfspot")]
-	static extern IntPtr f_image_view_new ();
-
-	[DllImport ("libgobject-2.0-0.dll")]
-	static extern uint g_signal_connect_data (IntPtr obj, String name, SelectionChangedDelegate cb, int key, IntPtr p, int flags);
-
-	SelectionChangedDelegate selection_holder;
-	SelectionChangedDelegate zoom_holder;
-
-	public ImageView () : base (null, null)
-	{
-		Raw = f_image_view_new ();
 
-		g_signal_connect_data (Raw, "selection_changed", 
-				       selection_holder = new SelectionChangedDelegate (SelectionChangedCallback), 0,
-				       IntPtr.Zero, 0);
-
-		g_signal_connect_data (Raw, "zoom_changed", 
-				       zoom_holder = new SelectionChangedDelegate (ZoomChangedCallback), 0,
-				       IntPtr.Zero, 0);
-	}
+using Gtk;
+using Gdk;
 
-	protected override void OnDestroyed ()
+namespace FSpot.Widgets
+{
+	public class ImageView : Layout
 	{
-		if (selection_holder != null)
-			selection_holder = null;
+		public static double ZOOM_FACTOR = 1.1;
 
-		if (zoom_holder != null)
-			zoom_holder = null;
-	}
-
-	public enum PointerModeType {
-		None,
-		Select,
-		Scroll
-	}
-
-	[DllImport ("libfspot")]
-	static extern PointerModeType f_image_view_get_pointer_mode  (IntPtr image_view);
-	[DllImport ("libfspot")]
-	static extern void f_image_view_set_pointer_mode (IntPtr image_view, PointerModeType mode);
-
-	public PointerModeType PointerMode {
-		get {
-			return f_image_view_get_pointer_mode (Handle);
-		}
-		set {
-			f_image_view_set_pointer_mode (Handle, value);
+		protected double max_zoom = 10.0;
+		protected double MAX_ZOOM {
+			get { return max_zoom; }
 		}
-	}
-
-
-	[DllImport ("libfspot")]
-	static extern void f_image_view_set_selection_xy_ratio  (IntPtr image_view, double selection_xy_ratio);
-	[DllImport ("libfspot")]
-	static extern double f_image_view_get_selection_xy_ratio (IntPtr image_view);
 
-	double delayed_ratio = -2;
-	public double SelectionXyRatio {
-		get { return f_image_view_get_selection_xy_ratio (Handle); }
-		set { 
-			if (Pixbuf != null) 
-				f_image_view_set_selection_xy_ratio (Handle, value);
-			else
-				delayed_ratio = value;
+		protected double min_zoom = 0.1;
+		protected double MIN_ZOOM {
+			get { return min_zoom; }
 		}
-	}
-
 
-	[DllImport ("libfspot")]
-	static extern bool f_image_view_get_selection (IntPtr image_view,
-						       out int x_return, out int y_return,
-						       out int width_return, out int height_return);
-
-	// FIXME property?  Kinda sucky.
-	public bool GetSelection (out int x, out int y, out int width, out int height)
-	{
-		return f_image_view_get_selection (Handle, out x, out y, out width, out height);
-	}
-
-	
-	[DllImport ("libfspot")]
-	static extern void f_image_view_unset_selection (IntPtr image_view);
-
-	public void UnsetSelection ()
-	{
-		f_image_view_unset_selection (Handle);
-	}
-
-	[DllImport ("libfspoteog")]
-	static extern void image_view_set_transparent_color (IntPtr view, out Gdk.Color color);
-
-	public void SetTransparentColor (Gdk.Color color)
-	{
-		image_view_set_transparent_color (Handle, out color);
-	} 
-
-	public void SetTransparentColor (string color) //format "#000000"
-	{
-		SetTransparentColor (new Gdk.Color (
-				Byte.Parse (color.Substring (1,2), System.Globalization.NumberStyles.AllowHexSpecifier),
-				Byte.Parse (color.Substring (3,2), System.Globalization.NumberStyles.AllowHexSpecifier),
-				Byte.Parse (color.Substring (5,2), System.Globalization.NumberStyles.AllowHexSpecifier)
-		));
-	}
-
-	[DllImport ("libfspoteog")]
-	static extern void image_view_set_check_size (IntPtr view, int size);
-
-	public void SetCheckSize (int size)
-	{
-		image_view_set_check_size (Handle, size);
-	}
-
-	[DllImport ("libfspoteog")]
-	static extern void image_view_set_pixbuf (IntPtr view, IntPtr pixbuf);
-	[DllImport ("libfspoteog")]
-	static extern IntPtr image_view_get_pixbuf (IntPtr view);
-
-	public Pixbuf Pixbuf {
-		get {
-			IntPtr raw_pixbuf = image_view_get_pixbuf (Handle);
-			if (raw_pixbuf == IntPtr.Zero)
-				return null;
-
-			Pixbuf result = (Gdk.Pixbuf) GLib.Object.GetObject (raw_pixbuf, true);
-			return result;
-		}
-		set {
-			if (value == null)
-				image_view_set_pixbuf (Handle, IntPtr.Zero);
-			else {
-				image_view_set_pixbuf (Handle, value.Handle);
-				if (delayed_ratio != -2) {
-					SelectionXyRatio = delayed_ratio;
-					delayed_ratio = -2;
-				}
-			}
+		public ImageView () : base (null, null)
+		{
 		}
-	}
 
-	[DllImport ("libfspoteog")]
-	static extern void image_view_set_zoom (IntPtr view, double zoomx, double zoomy,
-						bool have_anchor, int anchorx, int anchory);
-
-	public void SetZoom (double zoom_x, double zoom_y)
-	{
-		double old_zoom_x, old_zoom_y;
-
-		GetZoom (out old_zoom_x, out old_zoom_y);
-		if (System.Math.Abs (old_zoom_y - zoom_y) > System.Double.Epsilon
-		    || System.Math.Abs (old_zoom_x - zoom_x) > System.Double.Epsilon) {
-			//System.Console.WriteLine ("{0} {1} zooming", zoom_x, zoom_y);
-			image_view_set_zoom (Handle, zoom_x, zoom_y, false, 0, 0);
+		public Pixbuf Pixbuf {
+			get { throw new NotImplementedException ();} 
+			set { throw new NotImplementedException ();} 
 		}
-	}
-
-	public void SetZoom (double zoom_x, double zoom_y, int anchor_x, int anchor_y)
-	{
-		image_view_set_zoom (Handle, zoom_x, zoom_y, true, anchor_x, anchor_y);
-	}
-
-	[DllImport ("libfspoteog")]
-	static extern void image_view_get_zoom (IntPtr view, out double zoomx, out double zoomy);
-
-	public void GetZoom (out double zoomx, out double zoomy)
-	{
-		image_view_get_zoom (Handle, out zoomx, out zoomy);
-	}
-
-	[DllImport ("libfspoteog")]
-	static extern void image_view_get_offsets_and_size (IntPtr view,
-							    out int xofs_return, out int yofs_return,
-							    out int scaled_width, out int scaled_height);
-
-	public void GetOffsets (out int x_offset, out int y_offset, out int scaled_width, out int scaled_height)
-	{
-		image_view_get_offsets_and_size (Handle,
-						 out x_offset, out y_offset, out scaled_width, out scaled_height);
-	}
-
-	[DllImport ("libfspot")]
-	static extern void f_image_view_window_coords_to_image (IntPtr view,
-								int window_x, int window_y,
-								out int image_x, out int image_y);
-
-	public Gdk.Point WindowCoordsToImage (Gdk.Point win)
-	{
-		Gdk.Point img;
-
-		f_image_view_window_coords_to_image (Handle, win.X, win.Y, out img.X, out img.Y);
-		return img;
-	}
 
+		public int CheckSize {
+			get { throw new NotImplementedException ();} 
+			set { throw new NotImplementedException ();} 
+		}
 
-	public Gdk.Rectangle ImageCoordsToWindow (Gdk.Rectangle image)
-	{
-		int x, y;
-		int width, height;
+		public PointerMode PointerMode {
+			get { throw new NotImplementedException ();} 
+			set { throw new NotImplementedException ();} 
+		}
 
-		if (this.Pixbuf == null)
-			return Gdk.Rectangle.Zero;
-		
-		this.GetOffsets (out x, out y, out width, out height);
+		public double SelectionXyRatio {
+			get { throw new NotImplementedException ();} 
+			set { throw new NotImplementedException ();} 
+		}
 
-		Gdk.Rectangle win = Gdk.Rectangle.Zero;
-		win.X = (int) Math.Floor (image.X * (double) (width - 1) / (this.Pixbuf.Width - 1) + 0.5) + x;
-		win.Y = (int) Math.Floor (image.Y * (double) (height - 1) / (this.Pixbuf.Height - 1) + 0.5) + y;
-		win.Width = (int) Math.Floor ((image.X + image.Width) * (double) (width - 1) / (this.Pixbuf.Width - 1) + 0.5) - win.X + x;
-		win.Height = (int) Math.Floor ((image.Y + image.Height) * (double) (height - 1) / (this.Pixbuf.Height - 1) + 0.5) - win.Y + y;
+		public Cms.Transform Transform {
+			get { throw new NotImplementedException ();} 
+			set { throw new NotImplementedException ();} 
+		}
 
-		return win;
-	}
+		public Gdk.InterpType Interpolation {
+			get { throw new NotImplementedException ();} 
+			set { throw new NotImplementedException ();} 
+		}
 
-	[DllImport ("libfspoteog")]
-	static extern void image_view_set_display_brightness (IntPtr view, float display_brightness);
 
-	public double DisplayBrightness
-	{
-		set {
-			image_view_set_display_brightness (Handle, (float) value);
+		public void GetZoom (out double zoomx, out double zoomy)
+		{
+			throw new NotImplementedException ();	
 		}
-	}
 
-	[DllImport ("libfspoteog")]
-	static extern void image_view_set_interp_type (IntPtr view, Gdk.InterpType interpolation);
-	
-	[DllImport ("libfspoteog")]
-	static extern Gdk.InterpType image_view_get_interp_type (IntPtr view);
-
-	public Gdk.InterpType Interpolation 
-	{
-		set {
-			image_view_set_interp_type (Handle, value);
+		public void SetZoom (double zoom_x, double zoom_y)
+		{
+			throw new NotImplementedException ();	
 		}
-		get {
-			return image_view_get_interp_type (Handle);
+		
+		public void SetTransparentColor (Gdk.Color color)
+		{
+			throw new NotImplementedException ();
+		} 
+
+		public void SetTransparentColor (string color) //format "#000000"
+		{
+			SetTransparentColor (new Gdk.Color (
+					Byte.Parse (color.Substring (1,2), System.Globalization.NumberStyles.AllowHexSpecifier),
+					Byte.Parse (color.Substring (3,2), System.Globalization.NumberStyles.AllowHexSpecifier),
+					Byte.Parse (color.Substring (5,2), System.Globalization.NumberStyles.AllowHexSpecifier)
+			));
 		}
-	}
-
 
-	[DllImport ("libfspoteog")]
-	static extern void image_view_set_display_contrast (IntPtr view, float display_contrast);
+		[Obsolete ("use the CheckSize Property instead")]
+		public void SetCheckSize (int size)
+		{
+			CheckSize = size;
+		}
 
-	public double DisplayContrast
-	{
-		set {
-			image_view_set_display_contrast (Handle, (float) value);
+		public Gdk.Point WindowCoordsToImage (Point win)
+		{
+			throw new NotImplementedException ();
 		}
-	}
 
-	[DllImport ("libfspoteog")]
-	static extern void image_view_set_display_transform (IntPtr view, HandleRef transform);
+		public Gdk.Rectangle ImageCoordsToWindow (Gdk.Rectangle image)
+		{
+			int x, y;
+			int width, height;
 	
-	[DllImport ("libfspoteog")]
-	static extern void image_view_update_min_zoom (IntPtr view);
-	protected void UpdateMinZoom ()
-	{
-		if (Pixbuf != null) {
-			min_zoom = Math.Min (1.0,
-					Math.Min ((double)Allocation.Width / (double)Pixbuf.Width,
-					(double)Allocation.Height / (double)Pixbuf.Height));
-
-		} else {
-			min_zoom = 0.1;
+			if (this.Pixbuf == null)
+				return Gdk.Rectangle.Zero;
+
+			throw new NotImplementedException ();
+			
+//			this.GetOffsets (out x, out y, out width, out height);
+//	
+//			Gdk.Rectangle win = Gdk.Rectangle.Zero;
+//			win.X = (int) Math.Floor (image.X * (double) (width - 1) / (this.Pixbuf.Width - 1) + 0.5) + x;
+//			win.Y = (int) Math.Floor (image.Y * (double) (height - 1) / (this.Pixbuf.Height - 1) + 0.5) + y;
+//			win.Width = (int) Math.Floor ((image.X + image.Width) * (double) (width - 1) / (this.Pixbuf.Width - 1) + 0.5) - win.X + x;
+//			win.Height = (int) Math.Floor ((image.Y + image.Height) * (double) (height - 1) / (this.Pixbuf.Height - 1) + 0.5) - win.Y + y;
+//	
+//			return win;
 		}
 
-		image_view_update_min_zoom (Handle);
-		
-		// Since this affects the zoom_scale we should alert it
-		if (ZoomChanged != null)
-			ZoomChanged (this, System.EventArgs.Empty);
-	}
-
-	public Cms.Transform Transform {
-		set {
-			this.transform = value;
-			if (value != null)
-				image_view_set_display_transform (Handle, transform.Handle);
-			else 
-				image_view_set_display_transform (Handle, new HandleRef (value, IntPtr.Zero));
+		public bool GetSelection (out int x, out int y, out int width, out int height)
+		{
+			throw new NotImplementedException ();	
 		}
-		get {
-			return transform;
+
+		public void UnsetSelection () 
+		{
+			throw new NotImplementedException ();
 		}
-	}
 
-	private delegate void SelectionChangedDelegate (IntPtr obj, IntPtr data);
-	private static void SelectionChangedCallback (IntPtr raw, IntPtr unused_data)
-	{
-		ImageView view = GLib.Object.GetObject (raw, false) as ImageView;
+		protected void UpdateMinZoom ()
+		{
+			throw new NotImplementedException ();	
+		}
 
-		if (view.SelectionChanged != null)
-			view.SelectionChanged ();
-	}
-	public delegate void SelectionChangedHandler ();
-	public event SelectionChangedHandler SelectionChanged;
 
-	private static void ZoomChangedCallback (IntPtr raw, IntPtr unused_data)
-	{
-		ImageView view = GLib.Object.GetObject (raw, false) as ImageView;
+		public event EventHandler ZoomChanged;
+		public event EventHandler SelectionChanged;
 
-		if (view.ZoomChanged != null)
-			view.ZoomChanged (view, System.EventArgs.Empty);
 	}
-	public event EventHandler ZoomChanged;
-}
 }
diff --git a/src/Widgets/NativeImageView.cs b/src/Widgets/NativeImageView.cs
new file mode 100644
index 0000000..3236dd8
--- /dev/null
+++ b/src/Widgets/NativeImageView.cs
@@ -0,0 +1,340 @@
+//
+// FSpot.Widgets.ImageView.cs
+//
+// Author(s):
+//	Ettore Perazzoli
+//	Larry Ewing  <lewing novell com>
+//	Stephane Delcrxoi  <stephane delcroix org>
+//
+// This is free software. See COPYING for details
+//
+
+using Gdk;
+using Gtk;
+using System;
+using System.Collections;
+using System.Runtime.InteropServices;
+
+namespace FSpot.Widgets {
+public class ImageView : Layout {
+	private Cms.Transform transform;
+
+	public static double ZOOM_FACTOR = 1.1;
+
+	protected const double MAX_ZOOM = 10.0;
+
+	protected double min_zoom = 0.1;
+	protected double MIN_ZOOM {
+		get {
+			return min_zoom;
+		}
+	}
+
+	[DllImport ("libfspot")]
+	static extern IntPtr f_image_view_new ();
+
+	[DllImport ("libgobject-2.0-0.dll")]
+	static extern uint g_signal_connect_data (IntPtr obj, String name, SelectionChangedDelegate cb, int key, IntPtr p, int flags);
+
+	SelectionChangedDelegate selection_holder;
+	SelectionChangedDelegate zoom_holder;
+
+	public ImageView () : base (null, null)
+	{
+		Raw = f_image_view_new ();
+
+		g_signal_connect_data (Raw, "selection_changed", 
+				       selection_holder = new SelectionChangedDelegate (SelectionChangedCallback), 0,
+				       IntPtr.Zero, 0);
+
+		g_signal_connect_data (Raw, "zoom_changed", 
+				       zoom_holder = new SelectionChangedDelegate (ZoomChangedCallback), 0,
+				       IntPtr.Zero, 0);
+	}
+
+	protected override void OnDestroyed ()
+	{
+		if (selection_holder != null)
+			selection_holder = null;
+
+		if (zoom_holder != null)
+			zoom_holder = null;
+	}
+
+	public enum PointerModeType {
+		None,
+		Select,
+		Scroll
+	}
+
+	[DllImport ("libfspot")]
+	static extern PointerModeType f_image_view_get_pointer_mode  (IntPtr image_view);
+	[DllImport ("libfspot")]
+	static extern void f_image_view_set_pointer_mode (IntPtr image_view, PointerModeType mode);
+
+	public PointerModeType PointerMode {
+		get {
+			return f_image_view_get_pointer_mode (Handle);
+		}
+		set {
+			f_image_view_set_pointer_mode (Handle, value);
+		}
+	}
+
+
+	[DllImport ("libfspot")]
+	static extern void f_image_view_set_selection_xy_ratio  (IntPtr image_view, double selection_xy_ratio);
+	[DllImport ("libfspot")]
+	static extern double f_image_view_get_selection_xy_ratio (IntPtr image_view);
+
+	double delayed_ratio = -2;
+	public double SelectionXyRatio {
+		get { return f_image_view_get_selection_xy_ratio (Handle); }
+		set { 
+			if (Pixbuf != null) 
+				f_image_view_set_selection_xy_ratio (Handle, value);
+			else
+				delayed_ratio = value;
+		}
+	}
+
+
+	[DllImport ("libfspot")]
+	static extern bool f_image_view_get_selection (IntPtr image_view,
+						       out int x_return, out int y_return,
+						       out int width_return, out int height_return);
+
+	// FIXME property?  Kinda sucky.
+	public bool GetSelection (out int x, out int y, out int width, out int height)
+	{
+		return f_image_view_get_selection (Handle, out x, out y, out width, out height);
+	}
+
+	
+	[DllImport ("libfspot")]
+	static extern void f_image_view_unset_selection (IntPtr image_view);
+
+	public void UnsetSelection ()
+	{
+		f_image_view_unset_selection (Handle);
+	}
+
+	[DllImport ("libfspoteog")]
+	static extern void image_view_set_transparent_color (IntPtr view, out Gdk.Color color);
+
+	public void SetTransparentColor (Gdk.Color color)
+	{
+		image_view_set_transparent_color (Handle, out color);
+	} 
+
+	public void SetTransparentColor (string color) //format "#000000"
+	{
+		SetTransparentColor (new Gdk.Color (
+				Byte.Parse (color.Substring (1,2), System.Globalization.NumberStyles.AllowHexSpecifier),
+				Byte.Parse (color.Substring (3,2), System.Globalization.NumberStyles.AllowHexSpecifier),
+				Byte.Parse (color.Substring (5,2), System.Globalization.NumberStyles.AllowHexSpecifier)
+		));
+	}
+
+	[DllImport ("libfspoteog")]
+	static extern void image_view_set_check_size (IntPtr view, int size);
+
+	public void SetCheckSize (int size)
+	{
+		image_view_set_check_size (Handle, size);
+	}
+
+	[DllImport ("libfspoteog")]
+	static extern void image_view_set_pixbuf (IntPtr view, IntPtr pixbuf);
+	[DllImport ("libfspoteog")]
+	static extern IntPtr image_view_get_pixbuf (IntPtr view);
+
+	public Pixbuf Pixbuf {
+		get {
+			IntPtr raw_pixbuf = image_view_get_pixbuf (Handle);
+			if (raw_pixbuf == IntPtr.Zero)
+				return null;
+
+			Pixbuf result = (Gdk.Pixbuf) GLib.Object.GetObject (raw_pixbuf, true);
+			return result;
+		}
+		set {
+			if (value == null)
+				image_view_set_pixbuf (Handle, IntPtr.Zero);
+			else {
+				image_view_set_pixbuf (Handle, value.Handle);
+				if (delayed_ratio != -2) {
+					SelectionXyRatio = delayed_ratio;
+					delayed_ratio = -2;
+				}
+			}
+		}
+	}
+
+	[DllImport ("libfspoteog")]
+	static extern void image_view_set_zoom (IntPtr view, double zoomx, double zoomy,
+						bool have_anchor, int anchorx, int anchory);
+
+	public void SetZoom (double zoom_x, double zoom_y)
+	{
+		double old_zoom_x, old_zoom_y;
+
+		GetZoom (out old_zoom_x, out old_zoom_y);
+		if (System.Math.Abs (old_zoom_y - zoom_y) > System.Double.Epsilon
+		    || System.Math.Abs (old_zoom_x - zoom_x) > System.Double.Epsilon) {
+			//System.Console.WriteLine ("{0} {1} zooming", zoom_x, zoom_y);
+			image_view_set_zoom (Handle, zoom_x, zoom_y, false, 0, 0);
+		}
+	}
+
+	public void SetZoom (double zoom_x, double zoom_y, int anchor_x, int anchor_y)
+	{
+		image_view_set_zoom (Handle, zoom_x, zoom_y, true, anchor_x, anchor_y);
+	}
+
+	[DllImport ("libfspoteog")]
+	static extern void image_view_get_zoom (IntPtr view, out double zoomx, out double zoomy);
+
+	public void GetZoom (out double zoomx, out double zoomy)
+	{
+		image_view_get_zoom (Handle, out zoomx, out zoomy);
+	}
+
+	[DllImport ("libfspoteog")]
+	static extern void image_view_get_offsets_and_size (IntPtr view,
+							    out int xofs_return, out int yofs_return,
+							    out int scaled_width, out int scaled_height);
+
+	public void GetOffsets (out int x_offset, out int y_offset, out int scaled_width, out int scaled_height)
+	{
+		image_view_get_offsets_and_size (Handle,
+						 out x_offset, out y_offset, out scaled_width, out scaled_height);
+	}
+
+	[DllImport ("libfspot")]
+	static extern void f_image_view_window_coords_to_image (IntPtr view,
+								int window_x, int window_y,
+								out int image_x, out int image_y);
+
+	public Gdk.Point WindowCoordsToImage (Gdk.Point win)
+	{
+		Gdk.Point img;
+
+		f_image_view_window_coords_to_image (Handle, win.X, win.Y, out img.X, out img.Y);
+		return img;
+	}
+
+
+	public Gdk.Rectangle ImageCoordsToWindow (Gdk.Rectangle image)
+	{
+		int x, y;
+		int width, height;
+
+		if (this.Pixbuf == null)
+			return Gdk.Rectangle.Zero;
+		
+		this.GetOffsets (out x, out y, out width, out height);
+
+		Gdk.Rectangle win = Gdk.Rectangle.Zero;
+		win.X = (int) Math.Floor (image.X * (double) (width - 1) / (this.Pixbuf.Width - 1) + 0.5) + x;
+		win.Y = (int) Math.Floor (image.Y * (double) (height - 1) / (this.Pixbuf.Height - 1) + 0.5) + y;
+		win.Width = (int) Math.Floor ((image.X + image.Width) * (double) (width - 1) / (this.Pixbuf.Width - 1) + 0.5) - win.X + x;
+		win.Height = (int) Math.Floor ((image.Y + image.Height) * (double) (height - 1) / (this.Pixbuf.Height - 1) + 0.5) - win.Y + y;
+
+		return win;
+	}
+
+	[DllImport ("libfspoteog")]
+	static extern void image_view_set_display_brightness (IntPtr view, float display_brightness);
+
+	public double DisplayBrightness
+	{
+		set {
+			image_view_set_display_brightness (Handle, (float) value);
+		}
+	}
+
+	[DllImport ("libfspoteog")]
+	static extern void image_view_set_interp_type (IntPtr view, Gdk.InterpType interpolation);
+	
+	[DllImport ("libfspoteog")]
+	static extern Gdk.InterpType image_view_get_interp_type (IntPtr view);
+
+	public Gdk.InterpType Interpolation 
+	{
+		set {
+			image_view_set_interp_type (Handle, value);
+		}
+		get {
+			return image_view_get_interp_type (Handle);
+		}
+	}
+
+
+	[DllImport ("libfspoteog")]
+	static extern void image_view_set_display_contrast (IntPtr view, float display_contrast);
+
+	public double DisplayContrast
+	{
+		set {
+			image_view_set_display_contrast (Handle, (float) value);
+		}
+	}
+
+	[DllImport ("libfspoteog")]
+	static extern void image_view_set_display_transform (IntPtr view, HandleRef transform);
+	
+	[DllImport ("libfspoteog")]
+	static extern void image_view_update_min_zoom (IntPtr view);
+	protected void UpdateMinZoom ()
+	{
+		if (Pixbuf != null) {
+			min_zoom = Math.Min (1.0,
+					Math.Min ((double)Allocation.Width / (double)Pixbuf.Width,
+					(double)Allocation.Height / (double)Pixbuf.Height));
+
+		} else {
+			min_zoom = 0.1;
+		}
+
+		image_view_update_min_zoom (Handle);
+		
+		// Since this affects the zoom_scale we should alert it
+		if (ZoomChanged != null)
+			ZoomChanged (this, System.EventArgs.Empty);
+	}
+
+	public Cms.Transform Transform {
+		set {
+			this.transform = value;
+			if (value != null)
+				image_view_set_display_transform (Handle, transform.Handle);
+			else 
+				image_view_set_display_transform (Handle, new HandleRef (value, IntPtr.Zero));
+		}
+		get {
+			return transform;
+		}
+	}
+
+	private delegate void SelectionChangedDelegate (IntPtr obj, IntPtr data);
+	private static void SelectionChangedCallback (IntPtr raw, IntPtr unused_data)
+	{
+		ImageView view = GLib.Object.GetObject (raw, false) as ImageView;
+
+		if (view.SelectionChanged != null)
+			view.SelectionChanged ();
+	}
+	public delegate void SelectionChangedHandler ();
+	public event SelectionChangedHandler SelectionChanged;
+
+	private static void ZoomChangedCallback (IntPtr raw, IntPtr unused_data)
+	{
+		ImageView view = GLib.Object.GetObject (raw, false) as ImageView;
+
+		if (view.ZoomChanged != null)
+			view.ZoomChanged (view, System.EventArgs.Empty);
+	}
+	public event EventHandler ZoomChanged;
+}
+}
diff --git a/src/Widgets/PointerMode.cs b/src/Widgets/PointerMode.cs
new file mode 100644
index 0000000..c769234
--- /dev/null
+++ b/src/Widgets/PointerMode.cs
@@ -0,0 +1,17 @@
+//
+// FSpot.Widgets.PointerMode.cs
+//
+// Author(s)
+//	Stephane Delcroix  <stephane delcroix org>
+//
+// This is free software. See COPYING for details.
+//
+
+namespace FSpot.Widgets
+{
+	public enum PointerMode {
+		None,
+		Select,
+		Scroll
+	}
+}