Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2048 from BDisp/clipboard-get-fix

Browse Source 
Fixes #2047. Tests are failing locally after merging #2046
This commit is contained in:
Tig Kindel
2022-09-18 16:50:27 -07:00
committed by GitHub
parent 578e56341d d542548595
commit 558b2b793f
5 changed files with 108 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Terminal.Gui/Core/Clipboard/Clipboard.cs
View File

@@ -15,7 +15,7 @@ namespace Terminal.Gui {
get {
try {
if (IsSupported) {
return Application.Driver.Clipboard.GetClipboardData ();
return contents = ustring.Make (Application.Driver.Clipboard.GetClipboardData ());
} else {
return contents;
}

2
Terminal.Gui/Core/View.cs
View File

@@ -2722,7 +2722,7 @@ namespace Terminal.Gui {
/// <returns>The text formatter size more the <see cref="TextFormatter.HotKeySpecifier"/> length.</returns>
public Size GetBoundsTextFormatterSize ()
{
if (TextFormatter.Text == null)
if (ustring.IsNullOrEmpty (TextFormatter.Text))
return Bounds.Size;
return new Size (frame.Size.Width + GetHotKeySpecifierLength (),

4
Terminal.Gui/Views/TextField.cs
View File

@@ -666,7 +666,7 @@ namespace Terminal.Gui {
historyText.Redo ();
//if (Clipboard.Contents == null)
//if (ustring.IsNullOrEmpty (Clipboard.Contents))
// return true;
//var clip = TextModel.ToRunes (Clipboard.Contents);
//if (clip == null)
@@ -1217,7 +1217,7 @@ namespace Terminal.Gui {
/// </summary>
public virtual void Paste ()
{
if (ReadOnly || Clipboard.Contents == null) {
if (ReadOnly || ustring.IsNullOrEmpty (Clipboard.Contents)) {
return;
}

2
UnitTests/ApplicationTests.cs
View File

@@ -1318,7 +1318,7 @@ namespace Terminal.Gui.Core {
if (myi == 0) {
// let the timeouts run for a bit
Thread.Sleep (5000);
Thread.Sleep (10000);
// then tell the application to quit
Application.MainLoop.Invoke (() => Application.RequestStop ());

210
UnitTests/ClipboardTests.cs
View File

@@ -53,23 +53,21 @@ namespace Terminal.Gui.Core {
[AutoInitShutdown]
public void TrySetClipboardData_Sets_The_OS_Clipboard ()
{
lock (Clipboard.Contents) {
var clipText = "Trying to set the OS clipboard.";
if (Clipboard.IsSupported) {
Assert.True (Clipboard.TrySetClipboardData (clipText));
} else {
Assert.False (Clipboard.TrySetClipboardData (clipText));
}
var clipText = "Trying to set the OS clipboard.";
if (Clipboard.IsSupported) {
Assert.True (Clipboard.TrySetClipboardData (clipText));
} else {
Assert.False (Clipboard.TrySetClipboardData (clipText));
}
Application.Iteration += () => Application.RequestStop ();
Application.Iteration += () => Application.RequestStop ();
Application.Run ();
Application.Run ();
if (Clipboard.IsSupported) {
Assert.Equal (clipText, Clipboard.Contents);
} else {
Assert.NotEqual (clipText, Clipboard.Contents);
}
if (Clipboard.IsSupported) {
Assert.Equal (clipText, Clipboard.Contents);
} else {
Assert.NotEqual (clipText, Clipboard.Contents);
}
}
@@ -81,112 +79,110 @@ namespace Terminal.Gui.Core {
var exit = false;
var getClipText = "";
lock (Clipboard.Contents) {
Application.Iteration += () => {
if (RuntimeInformation.IsOSPlatform (OSPlatform.Windows)) {
// using (Process clipExe = new Process {
// StartInfo = new ProcessStartInfo {
// RedirectStandardInput = true,
// FileName = "clip"
// }
// }) {
// clipExe.Start ();
// clipExe.StandardInput.Write (clipText);
// clipExe.StandardInput.Close ();
// var result = clipExe.WaitForExit (500);
// if (result) {
// clipExe.WaitForExit ();
// }
// }
Application.Iteration += () => {
if (RuntimeInformation.IsOSPlatform (OSPlatform.Windows)) {
// using (Process clipExe = new Process {
// StartInfo = new ProcessStartInfo {
// RedirectStandardInput = true,
// FileName = "clip"
// }
// }) {
// clipExe.Start ();
// clipExe.StandardInput.Write (clipText);
// clipExe.StandardInput.Close ();
// var result = clipExe.WaitForExit (500);
// if (result) {
// clipExe.WaitForExit ();
// }
// }
using (Process pwsh = new Process {
StartInfo = new ProcessStartInfo {
FileName = "powershell",
Arguments = $"-command \"Set-Clipboard -Value \\\"{clipText}\\\"\""
}
}) {
pwsh.Start ();
pwsh.WaitForExit ();
using (Process pwsh = new Process {
StartInfo = new ProcessStartInfo {
FileName = "powershell",
Arguments = $"-command \"Set-Clipboard -Value \\\"{clipText}\\\"\""
}
getClipText = Clipboard.Contents.ToString ();
}) {
pwsh.Start ();
pwsh.WaitForExit ();
}
getClipText = Clipboard.Contents.ToString ();
} else if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX)) {
using (Process copy = new Process {
StartInfo = new ProcessStartInfo {
RedirectStandardInput = true,
FileName = "pbcopy"
}
}) {
copy.Start ();
copy.StandardInput.Write (clipText);
copy.StandardInput.Close ();
copy.WaitForExit ();
} else if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX)) {
using (Process copy = new Process {
StartInfo = new ProcessStartInfo {
RedirectStandardInput = true,
FileName = "pbcopy"
}
getClipText = Clipboard.Contents.ToString ();
}) {
copy.Start ();
copy.StandardInput.Write (clipText);
copy.StandardInput.Close ();
copy.WaitForExit ();
}
getClipText = Clipboard.Contents.ToString ();
} else if (RuntimeInformation.IsOSPlatform (OSPlatform.Linux)) {
if (Is_WSL_Platform ()) {
try {
using (Process bash = new Process {
StartInfo = new ProcessStartInfo {
FileName = "powershell.exe",
Arguments = $"-noprofile -command \"Set-Clipboard -Value \\\"{clipText}\\\"\""
}
}) {
bash.Start ();
bash.WaitForExit ();
} else if (RuntimeInformation.IsOSPlatform (OSPlatform.Linux)) {
if (Is_WSL_Platform ()) {
try {
using (Process bash = new Process {
StartInfo = new ProcessStartInfo {
FileName = "powershell.exe",
Arguments = $"-noprofile -command \"Set-Clipboard -Value \\\"{clipText}\\\"\""
}
}) {
bash.Start ();
bash.WaitForExit ();
}
//using (Process clipExe = new Process {
// StartInfo = new ProcessStartInfo {
// RedirectStandardInput = true,
// FileName = "clip.exe"
// }
//}) {
// clipExe.Start ();
// clipExe.StandardInput.Write (clipText);
// clipExe.StandardInput.Close ();
// clipExe.WaitForExit ();
// //var result = clipExe.WaitForExit (500);
// //if (result) {
// // clipExe.WaitForExit ();
// //}
//}
} catch {
exit = true;
}
if (!exit) {
getClipText = Clipboard.Contents.ToString ();
}
Application.RequestStop ();
return;
}
if (exit = xclipExists () == false) {
// xclip doesn't exist then exit.
Application.RequestStop ();
return;
}
using (Process bash = new Process {
StartInfo = new ProcessStartInfo {
FileName = "bash",
Arguments = $"-c \"xclip -sel clip -i\"",
RedirectStandardInput = true,
}
}) {
bash.Start ();
bash.StandardInput.Write (clipText);
bash.StandardInput.Close ();
bash.WaitForExit ();
//using (Process clipExe = new Process {
// StartInfo = new ProcessStartInfo {
// RedirectStandardInput = true,
// FileName = "clip.exe"
// }
//}) {
// clipExe.Start ();
// clipExe.StandardInput.Write (clipText);
// clipExe.StandardInput.Close ();
// clipExe.WaitForExit ();
// //var result = clipExe.WaitForExit (500);
// //if (result) {
// // clipExe.WaitForExit ();
// //}
//}
} catch {
exit = true;
}
if (!exit) {
getClipText = Clipboard.Contents.ToString ();
}
Application.RequestStop ();
return;
}
if (exit = xclipExists () == false) {
// xclip doesn't exist then exit.
Application.RequestStop ();
return;
}
Application.RequestStop ();
};
}
using (Process bash = new Process {
StartInfo = new ProcessStartInfo {
FileName = "bash",
Arguments = $"-c \"xclip -sel clip -i\"",
RedirectStandardInput = true,
}
}) {
bash.Start ();
bash.StandardInput.Write (clipText);
bash.StandardInput.Close ();
bash.WaitForExit ();
}
if (!exit) {
getClipText = Clipboard.Contents.ToString ();
}
}
Application.RequestStop ();
};
Application.Run ();