OpenFileName improvements

Author: Decimation

SmartImage 3/App/Integration.cs

@@ -323,26 +323,29 @@ public static string[] OpenFile(OFN flags = 0)
 		unsafe {
 			const int ss = 4096;
 
-			var p1 = stackalloc sbyte[ss];
-			var p2 = stackalloc sbyte[ss];
+			Memory<sbyte> p1 = new sbyte[ss];
+			Memory<sbyte> p2 = new sbyte[ss];
 
-			var ofn = new OPENFILENAME()
+			var p1p = p1.Pin();
+			var p2p = p2.Pin();
+
+			var ofn = new OPENFILENAME
 			{
 				lStructSize = Marshal.SizeOf<OPENFILENAME>(),
 				lpstrFilter = "All Files\0*.*\0\0",
 				// lpstrFile       = new string(p1),
 				// lpstrFileTitle  = new string(p2),
-				lpstrFile      = (nint) p1,
-				lpstrFileTitle = new string(p2),
+				lpstrFile      = (nint) p1p.Pointer,
+				lpstrFileTitle = (nint) p2p.Pointer,
 
 				lpstrInitialDir = Environment.GetFolderPath(Environment.SpecialFolder.CommonPictures),
 				lpstrTitle      = "Pick an image",
-				Flags           = (int) flags
+				Flags           = (int) flags,
+				// ofn.nMaxFile      = ofn.lpstrFile.Length;
+				nMaxFile      = ss,
+				nMaxFileTitle = ss
 			};
 
-			// ofn.nMaxFile      = ofn.lpstrFile.Length;
-			ofn.nMaxFile      = ss;
-			ofn.nMaxFileTitle = ss;
 			// ofn.nMaxFileTitle = ofn.lpstrFileTitle.Length;
 
 			bool ok = Native.GetOpenFileName(ref ofn);
@@ -353,15 +356,15 @@ public static string[] OpenFile(OFN flags = 0)
 				goto ret;
 			}
 
-			var pd = Marshal.PtrToStringAuto((nint) p1);
+			var pd = Marshal.PtrToStringAuto((nint) p1p.Pointer);
 
 			if (!(flags.HasFlag(OFN.OFN_ALLOWMULTISELECT)) /*!Directory.Exists(pd)&&File.Exists(pd)*/) {
 				files.Add(pd);
 				goto ret;
 			}
 
 			var ofs  = (ofn.nFileOffset * 2);
-			var ptr1 = ((byte*) p1 + ofs);
+			var ptr1 = (((byte*) p1p.Pointer) + ofs);
 
 			while (true) {
 
@@ -382,9 +385,10 @@ public static string[] OpenFile(OFN flags = 0)
 			}
 
 			ret:
+			p1p.Dispose();
+			p2p.Dispose();
 			return files.ToArray();
 
 		}
 	}
-
 }

SmartImage 3/Mode/Shell/ShellMode.Handlers.cs

@@ -54,7 +54,9 @@ private async void Input_TextChanging(TextChangingEventArgs tc)
 
 		Application.MainLoop.Invoke(() => Task.Delay(TimeSpan.FromSeconds(1)));
 
-		if (SearchQuery.IsValidSourceType(text.ToString())) {
+		var sourceType = SearchQuery.IsValidSourceType(text.ToString());
+
+		if (sourceType) {
 			var ok = await SetQuery(text);
 			Btn_Run.Enabled = ok;
 			Debug.WriteLine($"{nameof(Input_TextChanging)} :: ok");
@@ -133,10 +135,18 @@ private void Queue_Clicked()
 
 		var cpy = Queue.ToList();
 
+		var tf = new TextField()
+		{
+
+			Width  = Dim.Fill(),
+			Height = 3,
+		};
+
 		var lv = new ListView(cpy)
 		{
 			Width  = Dim.Fill(),
-			Height = Dim.Fill()
+			Height = Dim.Fill(),
+			Y      =Pos.Bottom(tf)
 		};
 
 		var btnRm = new Button("Remove")
@@ -153,7 +163,7 @@ private void Queue_Clicked()
 		btnRm.Clicked += () =>
 		{
 			var cpy2 = lv.Source.ToList();
-			if (cpy2.Count < lv.SelectedItem && lv.SelectedItem >= 0) {
+			if (lv.SelectedItem < cpy2.Count && lv.SelectedItem >= 0) {
 				var i = (string) cpy2[lv.SelectedItem];
 				Debug.WriteLine($"{i}");
 				cpy.Remove(i);
@@ -164,8 +174,19 @@ private void Queue_Clicked()
 			}
 		};
 
-		d.Add(lv);
+		var btnRmAll = new Button("Clear")
+			{ };
+
+		btnRmAll.Clicked += () =>
+		{
+			lv.Source = new ListWrapper(Enumerable.Empty<string>().ToList());
+			Queue.Clear();
+			lv.SetFocus();
+		};
+
+		d.Add(tf,lv);
 		d.AddButton(btnRm);
+		d.AddButton(btnRmAll);
 
 		Application.Run(d);
 	}
@@ -191,9 +212,16 @@ private void Browse_Clicked()
 			flags |= OFN.OFN_ALLOWMULTISELECT;
 		}
 
-		flags |= OFN.OFN_EXPLORER | OFN.OFN_FILEMUSTEXIST;
+		flags |= OFN.OFN_EXPLORER | OFN.OFN_FILEMUSTEXIST | OFN.OFN_LONGNAMES | OFN.OFN_PATHMUSTEXIST;
+		string[]? files;
 
-		var files = Integration.OpenFile(flags);
+		try {
+			files = Integration.OpenFile(flags);
+		}
+		catch (Exception e) {
+			Debug.WriteLine($"{e.Message}");
+			return;
+		}
 
 		if (QueueMode) {
 			foreach (string fs in files) {