DataObject/Clipboard enhancements

- Switches out BinarySerializer to DataContractSerializer for GetObject/SetObject - Support [DataContract] types for GetObject/SetObject (in addition to Serializable) - Add GetObject() override that takes desired type - GetObject() returns object for known format types for String, Bitmap, Color (mac) - Wpf/WinForms: GetData() returns byte data for more types - Wpf: Prevent crash getting data for FileContents, and return MemoryStream[] with GetObject()
picoe · Jul 31, 2023 · e425a21 · e425a21
1 parent a7b303d
commit e425a21
Show file tree

Hide file tree

Showing 14 changed files with 669 additions and 110 deletions.
diff --git a/lib/monomac b/lib/monomac
diff --git a/src/Eto.Gtk/Forms/ClipboardHandler.cs b/src/Eto.Gtk/Forms/ClipboardHandler.cs
@@ -177,15 +177,34 @@ public bool Contains(string type)
 
 		public bool TrySetObject(object value, string type) => false;
 
-		public bool TryGetObject(string type, out object value)
+		public bool TryGetObject(string type, Type objectType, out object value)
 		{
+			if (objectType == null || objectType == typeof(string))
+			{
+				if (DataObjectHandler.string_types.Contains(type, StringComparer.OrdinalIgnoreCase))
+				{
+					value = GetString(type);
+					if (value != null)
+						return true;
+				}
+			}
+			if (objectType == null || objectType == typeof(Bitmap))
+			{
+				if (DataObjectHandler.image_types.Contains(type, StringComparer.OrdinalIgnoreCase))
+				{
+					value = new Bitmap(GetData(type));
+					return true;
+				}
+			}
+
 			value = null;
 			return false;
 		}
 
 		public void SetObject(object value, string type) => Widget.SetObject(value, type);
-
 		public T GetObject<T>(string type) => Widget.GetObject<T>(type);
+		public object GetObject(string type, Type objectType) => Widget.GetObject(type, objectType);
+		public object GetObject(string type) => Widget.GetObject(type);
 
 		public string[] Types
 		{

diff --git a/src/Eto.Gtk/Forms/DataObjectHandler.cs b/src/Eto.Gtk/Forms/DataObjectHandler.cs
@@ -211,15 +211,37 @@ public bool Contains(params string[] types)
 
 		public bool TrySetObject(object value, string type) => false;
 
-		public bool TryGetObject(string type, out object value)
+		internal static string[] string_types = { "UTF8_STRING", "TEXT", "STRING", "text/html", "text/plain" };
+		internal static string[] image_types = { "image/pixbuf", "image/png", "image/tiff", "image/bmp", "image/jpeg" };
+
+		public bool TryGetObject(string type, Type objectType, out object value)
 		{
+			if (objectType == null || objectType == typeof(string))
+			{
+				if (string_types.Contains(type, StringComparer.OrdinalIgnoreCase))
+				{
+					value = GetString(type);
+					if (value != null)
+						return true;
+				}
+			}
+			if (objectType == null || objectType == typeof(Bitmap))
+			{
+				if (image_types.Contains(type, StringComparer.OrdinalIgnoreCase))
+				{
+					value = new Bitmap(GetData(type));
+					return true;
+				}
+			}
 			value = null;
 			return false;
 		}
 
 		public void SetObject(object value, string type) => Widget.SetObject(value, type);
 
 		public T GetObject<T>(string type) => Widget.GetObject<T>(type);
+		public object GetObject(string type, Type objectType) => Widget.GetObject(type, objectType);
+		public object GetObject(string type) => Widget.GetObject(type);
 
 		public string[] Types
 		{

diff --git a/src/Eto.Mac/Forms/DataObjectHandler.cs b/src/Eto.Mac/Forms/DataObjectHandler.cs
@@ -195,12 +195,37 @@ public bool Contains(string type)
 			return Control.GetAvailableTypeFromArray(new[] { type }) != null;
 		}
 
-		public bool TryGetObject(string type, out object value)
+		public bool TryGetObject(string type, Type objectType, out object value)
 		{
-			if (type == NSPasteboard.NSPasteboardTypeColor)
+			if (objectType == null || objectType == typeof(Color))
 			{
-				value = NSColor.FromPasteboard(Control)?.ToEto();
-				return true;
+				if (type == NSPasteboard.NSPasteboardTypeColor)
+				{
+					value = NSColor.FromPasteboard(Control)?.ToEto();
+					return true;
+				}
+			}
+			if (objectType == null || objectType == typeof(string))
+			{
+				if (type == NSPasteboard.NSPasteboardTypeString
+					|| type == NSPasteboard.NSPasteboardTypeTabularText
+					|| type == NSPasteboard.NSPasteboardTypeUrl
+					|| type == NSPasteboard.NSPasteboardTypeFileUrl
+					|| type == NSPasteboard.NSPasteboardTypeRTF
+					|| type == NSPasteboard.NSPasteboardTypeHTML)
+				{
+					value = GetString(type);
+					return true;
+				}
+			}
+			if (objectType == null || objectType == typeof(Bitmap))
+			{
+				if (type == NSPasteboard.NSPasteboardTypeTIFF
+					|| type == NSPasteboard.NSPasteboardTypePNG)
+				{
+					value = new Bitmap(new MemoryStream(GetData(type)));
+					return true;
+				}
 			}
 			value = null;
 			return false;
@@ -219,5 +244,7 @@ public bool TrySetObject(object value, string type)
 		public void SetObject(object value, string type) => Widget.SetObject(value, type);
 
 		public T GetObject<T>(string type) => Widget.GetObject<T>(type);
+		public object GetObject(string type, Type objectType) => Widget.GetObject(type, objectType);
+		public object GetObject(string type) => Widget.GetObject(type);
 	}
 }
diff --git a/src/Eto.Mac/Forms/MemoryDataObjectHandler.cs b/src/Eto.Mac/Forms/MemoryDataObjectHandler.cs
@@ -193,20 +193,48 @@ public bool TrySetObject(object value, string type)
 			return false;
 		}
 
-		public bool TryGetObject(string type, out object value)
+		public bool TryGetObject(string type, Type objectType, out object value)
 		{
-			var colorItem = GetDataItem<ColorItem>(type);
-			if (colorItem != null)
+			if (objectType == null || objectType == typeof(Color))
 			{
-				value = colorItem.Value.ToEto();
-				return true;
+				var colorItem = GetDataItem<ColorItem>(type);
+				if (colorItem != null)
+				{
+					value = colorItem.Value.ToEto();
+					return true;
+				}
+			}
+			if (objectType == null || objectType == typeof(string))
+			{
+				if (type == NSPasteboard.NSPasteboardTypeString
+					|| type == NSPasteboard.NSPasteboardTypeTabularText
+					|| type == NSPasteboard.NSPasteboardTypeUrl
+					|| type == NSPasteboard.NSPasteboardTypeFileUrl
+					|| type == NSPasteboard.NSPasteboardTypeRTF
+					|| type == NSPasteboard.NSPasteboardTypeHTML)
+				{
+					value = GetString(type);
+					return true;
+				}
+			}
+			if (objectType == null || objectType == typeof(Bitmap))
+			{
+				if (type == NSPasteboard.NSPasteboardTypeTIFF
+					|| type == NSPasteboard.NSPasteboardTypePNG)
+				{
+					value = new Bitmap(new MemoryStream(GetData(type)));
+					return true;
+				}
 			}
+
 			value = null;
 			return false;
 		}
 
 		public void SetObject(object value, string type) => Widget.SetObject(value, type);
 
 		public T GetObject<T>(string type) => Widget.GetObject<T>(type);
+		public object GetObject(string type, Type objectType) => Widget.GetObject(type, objectType);
+		public object GetObject(string type) => Widget.GetObject(type);
 	}
 }
diff --git a/src/Eto.WinForms/Win32.cs b/src/Eto.WinForms/Win32.cs
@@ -554,5 +554,14 @@ public enum SC : uint
 		{
 			CLOSE = 0xF060
 		}
+
+		[DllImport("kernel32.dll", CharSet = CharSet.Auto)]
+		public static extern IntPtr GlobalLock(IntPtr handle);
+
+		[DllImport("kernel32.dll", CharSet = CharSet.Auto)]
+		public static extern bool GlobalUnlock(IntPtr handle);
+
+		[DllImport("kernel32.dll", CharSet = CharSet.Auto)]
+		public static extern int GlobalSize(IntPtr handle);
 	}
 }
diff --git a/src/Eto.Wpf/Forms/ClipboardHandler.cs b/src/Eto.Wpf/Forms/ClipboardHandler.cs
@@ -8,6 +8,8 @@ public ClipboardHandler()
 			Control = new sw.DataObject();
 		}
 
+		public override sw.IDataObject ReadingDataObject => sw.Clipboard.GetDataObject();
+
 		public override string[] Types => sw.Clipboard.GetDataObject()?.GetFormats();
 
 		protected override void Update()