multiple fixes again

1. implement IDisposable
2. workaround the `selected entries are pinned to top` issue
3. use SetDataObject instead of SetText (support non-plain-text clip format)
4. use `Search` instead of `SecondToEndSearch` due to behavior change of plugin api

Author: liberize

ClipboardMonitor.cs

@@ -48,6 +48,13 @@ public static IDataObject GetDataObject() {
                 return LoopCall(() => System.Windows.Forms.Clipboard.GetDataObject());
             }
 
+            public static bool SetDataObject(object data) {
+                return LoopCall(() => {
+                    System.Windows.Forms.Clipboard.SetDataObject(data);
+                    return true;
+                });
+            }
+
             public static bool SetText(string text) {
                 return LoopCall(() => {
                     System.Windows.Forms.Clipboard.SetText(text);
@@ -60,6 +67,7 @@ class ClipboardWatcher : Form
         {
             // static instance of this form
             private static ClipboardWatcher mInstance;
+            private static Thread mThread;
 
             // needed to dispose this form
             static IntPtr nextClipboardViewer;
@@ -74,27 +82,31 @@ public static void Start()
                 if (mInstance != null)
                     return;
 
-                Thread t = new Thread(new ParameterizedThreadStart(x =>
+                mThread = new Thread(new ParameterizedThreadStart(x =>
                 {
                     Application.Run(new ClipboardWatcher());
                 }));
-                t.SetApartmentState(ApartmentState.STA); // give the [STAThread] attribute
-                t.IsBackground = true;
-                t.Start();
+                mThread.SetApartmentState(ApartmentState.STA); // give the [STAThread] attribute
+                mThread.IsBackground = true;
+                mThread.Start();
             }
 
             // stop listening (dispose form)
             public static void Stop()
             {
+                if (mInstance == null)
+                    return;
+
                 mInstance.Invoke(new MethodInvoker(() =>
                 {
                     ChangeClipboardChain(mInstance.Handle, nextClipboardViewer);
                 }));
                 mInstance.Invoke(new MethodInvoker(mInstance.Close));
-
                 mInstance.Dispose();
-
                 mInstance = null;
+
+                mThread.Join();
+                mThread = null;
             }
 
             // on load: (hide this window)

Main.cs

@@ -8,35 +8,47 @@
 
 namespace Flow.Launcher.Plugin.ClipboardHistory
 {
-    public class ClipboardHistory : IPlugin
+    public class ClipboardHistory : IPlugin, IDisposable
     {
-        private const int MaxDataCount = 5000;
-        //private readonly KeyboardSimulator keyboardSimulator = new KeyboardSimulator(new InputSimulator());
+        private const int MaxDataCount = 1000;
         private readonly InputSimulator inputSimulator = new InputSimulator();
         private PluginInitContext context;
-        LinkedList<string> dataList = new LinkedList<string>();
+        private int currentScore = 1;
+        LinkedList<ClipboardData> dataList = new LinkedList<ClipboardData>();
 
+        public struct ClipboardData : IEquatable<ClipboardData> {
+            public object data;
+            public string text;
+            public string displayText;
+            public int score;
+
+            public override bool Equals(object obj) => obj is ClipboardData && Equals((ClipboardData)obj);
+            public bool Equals(ClipboardData other) => text.Equals(other.text);
+            public override int GetHashCode() => text.GetHashCode();
+        }
+        
         public List<Result> Query(Query query)
         {
             var results = new List<Result>();
-            IEnumerable<string> displayData;
+            IEnumerable<ClipboardData> displayData;
 
-            if (query.Terms.Length == 0)
+            if (query.Search.Trim().Length == 0)
             {
                 displayData = dataList;
             }
             else
             {
-                displayData = dataList.Where(i => i.ToLower().Contains(query.SecondToEndSearch.ToLower()));
+                displayData = dataList.Where(i => i.text.ToLower().Contains(query.Search.ToLower()));
             }
 
             results.AddRange(displayData.Select(o => new Result
             {
-                Title = o.Trim().Replace("\r\n", " ").Replace('\n', ' '),
+                Title = o.displayText,
                 IcoPath = "Images\\clipboard.png",
+                Score = o.score,
                 Action = c =>
                 {
-                    if (!ClipboardMonitor.ClipboardWrapper.SetText(o))
+                    if (!ClipboardMonitor.ClipboardWrapper.SetDataObject(o.data))
                         return false;
 
                     Task.Delay(50).ContinueWith(t => inputSimulator.Keyboard.ModifiedKeyStroke(VirtualKeyCode.CONTROL, VirtualKeyCode.VK_V));
@@ -62,12 +74,18 @@ void ClipboardMonitor_OnClipboardChange(ClipboardFormat format, object data)
             {
                 if (data != null && !string.IsNullOrEmpty(data.ToString().Trim()))
                 {
-                    LinkedListNode<string> node = dataList.Find(data.ToString());
+                    ClipboardData obj = new ClipboardData { };
+                    obj.data = data;
+                    obj.text = data.ToString();
+                    obj.displayText = obj.text.Trim().Replace("\r\n", " ").Replace('\n', ' ');
+                    obj.score = currentScore++ * 1000;
+
+                    LinkedListNode<ClipboardData> node = dataList.Find(obj);
                     if (node != null)
                     {
                         dataList.Remove(node);
                     }
-                    dataList.AddFirst(data.ToString());
+                    dataList.AddFirst(obj);
 
                     if (dataList.Count > MaxDataCount)
                     {
@@ -76,5 +94,9 @@ void ClipboardMonitor_OnClipboardChange(ClipboardFormat format, object data)
                 }
             }
         }
+
+        public void Dispose() {
+            ClipboardMonitor.Stop();
+        }
     }
 }